diff options
author | Tom Rini <tom.rini@gmail.com> | 2021-06-28 14:06:24 -0400 |
---|---|---|
committer | Yogesh Siraswar <yogeshs@ti.com> | 2021-08-19 09:45:24 +0000 |
commit | c3ce6cd08d4663fef493ff2d636e18b95fee7efb (patch) | |
tree | de4c13d4032de39d1ce512883f45f9c2a81cb64a | |
parent | d0b09833b44fa23cce86fd99dd8ca6631c61c476 (diff) | |
download | meta-ti-c3ce6cd08d4663fef493ff2d636e18b95fee7efb.tar.gz |
conf: Add extlinux.conf support on some 32bit platforms
To make use of the "generic distro boot" support in U-Boot, an
extlinux.conf file needs to be generated and reside in the extlinux
directory. The extlinux.conf file will be parsed by U-Boot and the
"append" line will be evaluated and expanded and used entirely as the
bootargs passed to the kernel. Our generated extlinux.conf states
that the kernel image and device trees live one level up (so the root
directory) from it, so populate that location with our kernel and device
trees.
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
-rw-r--r-- | conf/machine/include/omap-a15.inc | 11 | ||||
-rw-r--r-- | conf/machine/include/ti33x.inc | 11 | ||||
-rw-r--r-- | conf/machine/include/ti43x.inc | 11 |
3 files changed, 30 insertions, 3 deletions
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc index e491d2b5..c95b0ccc 100644 --- a/conf/machine/include/omap-a15.inc +++ b/conf/machine/include/omap-a15.inc | |||
@@ -19,6 +19,15 @@ UBOOT_ARCH = "arm" | |||
19 | UBOOT_ENTRYPOINT = "0x80008000" | 19 | UBOOT_ENTRYPOINT = "0x80008000" |
20 | UBOOT_LOADADDRESS = "0x80008000" | 20 | UBOOT_LOADADDRESS = "0x80008000" |
21 | 21 | ||
22 | # Generate an extlinux.conf file | ||
23 | UBOOT_EXTLINUX = "1" | ||
24 | UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" | ||
25 | UBOOT_EXTLINUX_BOOT_FILES = " \ | ||
26 | extlinux.conf;extlinux/extlinux.conf \ | ||
27 | ${KERNEL_IMAGETYPE} \ | ||
28 | ${KERNEL_DEVICETREE} \ | ||
29 | " | ||
30 | |||
22 | SPL_BINARY = "MLO" | 31 | SPL_BINARY = "MLO" |
23 | UBOOT_SUFFIX = "img" | 32 | UBOOT_SUFFIX = "img" |
24 | 33 | ||
@@ -40,5 +49,5 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne | |||
40 | 49 | ||
41 | IMAGE_FSTYPES += "tar.xz wic.xz" | 50 | IMAGE_FSTYPES += "tar.xz wic.xz" |
42 | WKS_FILE ?= "sdimage-2part.wks" | 51 | WKS_FILE ?= "sdimage-2part.wks" |
43 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" | 52 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" |
44 | do_image_wic[depends] += "u-boot:do_deploy" | 53 | do_image_wic[depends] += "u-boot:do_deploy" |
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc index 6dfda754..35e057d5 100644 --- a/conf/machine/include/ti33x.inc +++ b/conf/machine/include/ti33x.inc | |||
@@ -43,6 +43,15 @@ UBOOT_MACHINE = "am335x_evm_config" | |||
43 | UBOOT_ENTRYPOINT = "0x80008000" | 43 | UBOOT_ENTRYPOINT = "0x80008000" |
44 | UBOOT_LOADADDRESS = "0x80008000" | 44 | UBOOT_LOADADDRESS = "0x80008000" |
45 | 45 | ||
46 | # Generate an extlinux.conf file | ||
47 | UBOOT_EXTLINUX = "1" | ||
48 | UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" | ||
49 | UBOOT_EXTLINUX_BOOT_FILES = " \ | ||
50 | extlinux.conf;extlinux/extlinux.conf \ | ||
51 | ${KERNEL_IMAGETYPE} \ | ||
52 | ${KERNEL_DEVICETREE} \ | ||
53 | " | ||
54 | |||
46 | SPL_BINARY = "MLO" | 55 | SPL_BINARY = "MLO" |
47 | UBOOT_SUFFIX = "img" | 56 | UBOOT_SUFFIX = "img" |
48 | 57 | ||
@@ -61,5 +70,5 @@ TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x" | |||
61 | 70 | ||
62 | IMAGE_FSTYPES += "tar.xz wic.xz" | 71 | IMAGE_FSTYPES += "tar.xz wic.xz" |
63 | WKS_FILE ?= "sdimage-2part.wks" | 72 | WKS_FILE ?= "sdimage-2part.wks" |
64 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" | 73 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" |
65 | do_image_wic[depends] += "virtual/bootloader:do_deploy" | 74 | do_image_wic[depends] += "virtual/bootloader:do_deploy" |
diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc index b1a27f93..75b745b3 100644 --- a/conf/machine/include/ti43x.inc +++ b/conf/machine/include/ti43x.inc | |||
@@ -40,6 +40,15 @@ UBOOT_MACHINE = "am43xx_evm_config" | |||
40 | UBOOT_ENTRYPOINT = "0x80008000" | 40 | UBOOT_ENTRYPOINT = "0x80008000" |
41 | UBOOT_LOADADDRESS = "0x80008000" | 41 | UBOOT_LOADADDRESS = "0x80008000" |
42 | 42 | ||
43 | # Generate an extlinux.conf file | ||
44 | UBOOT_EXTLINUX = "1" | ||
45 | UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" | ||
46 | UBOOT_EXTLINUX_BOOT_FILES = " \ | ||
47 | extlinux.conf;extlinux/extlinux.conf \ | ||
48 | ${KERNEL_IMAGETYPE} \ | ||
49 | ${KERNEL_DEVICETREE} \ | ||
50 | " | ||
51 | |||
43 | SPL_BINARY = "MLO" | 52 | SPL_BINARY = "MLO" |
44 | UBOOT_SUFFIX = "img" | 53 | UBOOT_SUFFIX = "img" |
45 | 54 | ||
@@ -58,5 +67,5 @@ TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x" | |||
58 | 67 | ||
59 | IMAGE_FSTYPES += "tar.xz wic.xz" | 68 | IMAGE_FSTYPES += "tar.xz wic.xz" |
60 | WKS_FILE ?= "sdimage-2part.wks" | 69 | WKS_FILE ?= "sdimage-2part.wks" |
61 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" | 70 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" |
62 | do_image_wic[depends] += "u-boot:do_deploy" | 71 | do_image_wic[depends] += "u-boot:do_deploy" |