conf: Add extlinux.conf support on some 32bit platforms
PATCH v3 1/1 conf: Add extlinux.conf support on some 32bit platforms
In reply to a message not in the archiveTo 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.
---
Changes in v3:
- Merge in a number of other SoCs.
Changes in v2:
- Elaborate on how this feature works in the commit message.
--- conf/machine/include/omap-a15.inc | 11 ++++++++++- conf/machine/include/ti33x.inc | 11 ++++++++++- conf/machine/include/ti43x.inc | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-)
conf/machine/include/omap-a15.inc +10 -1
@@ -19,6 +19,15 @@ UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +# Generate an extlinux.conf file +UBOOT_EXTLINUX = "1" +UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" +UBOOT_EXTLINUX_BOOT_FILES = " \ + extlinux.conf;extlinux/extlinux.conf \ + ${KERNEL_IMAGETYPE} \ + ${KERNEL_DEVICETREE} \ +" + SPL_BINARY = "MLO" UBOOT_SUFFIX = "img"
@@ -40,5 +49,5 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne IMAGE_FSTYPES += "tar.xz wic.xz" WKS_FILE ?= "sdimage-2part.wks" -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" do_image_wic[depends] += "u-boot:do_deploy"
conf/machine/include/ti33x.inc +10 -1
@@ -43,6 +43,15 @@ UBOOT_MACHINE = "am335x_evm_config" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +# Generate an extlinux.conf file +UBOOT_EXTLINUX = "1" +UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" +UBOOT_EXTLINUX_BOOT_FILES = " \ + extlinux.conf;extlinux/extlinux.conf \ + ${KERNEL_IMAGETYPE} \ + ${KERNEL_DEVICETREE} \ +" + SPL_BINARY = "MLO" UBOOT_SUFFIX = "img"
@@ -61,5 +70,5 @@ TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x" IMAGE_FSTYPES += "tar.xz wic.xz" WKS_FILE ?= "sdimage-2part.wks" -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" do_image_wic[depends] += "virtual/bootloader:do_deploy"
conf/machine/include/ti43x.inc +10 -1
@@ -40,6 +40,15 @@ UBOOT_MACHINE = "am43xx_evm_config" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +# Generate an extlinux.conf file +UBOOT_EXTLINUX = "1" +UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" +UBOOT_EXTLINUX_BOOT_FILES = " \ + extlinux.conf;extlinux/extlinux.conf \ + ${KERNEL_IMAGETYPE} \ + ${KERNEL_DEVICETREE} \ +" + SPL_BINARY = "MLO" UBOOT_SUFFIX = "img"
@@ -58,5 +67,5 @@ TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x" IMAGE_FSTYPES += "tar.xz wic.xz" WKS_FILE ?= "sdimage-2part.wks" -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" do_image_wic[depends] += "u-boot:do_deploy"
Signature · 1 line
2.17.1
Quoted 10 lines · Tom Rini
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 <[email protected]>
Quoted 99 lines
---
Changes in v3:
- Merge in a number of other SoCs.
Changes in v2:
- Elaborate on how this feature works in the commit message.--- conf/machine/include/omap-a15.inc | 11 ++++++++++- conf/machine/include/ti33x.inc | 11 ++++++++++- conf/machine/include/ti43x.inc | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-)conf/machine/include/omap-a15.inc +10
-1@@ -19,6 +19,15 @@ UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +# Generate an extlinux.conf file +UBOOT_EXTLINUX = "1" +UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" +UBOOT_EXTLINUX_BOOT_FILES = " \ + extlinux.conf;extlinux/extlinux.conf \ + ${KERNEL_IMAGETYPE} \ + ${KERNEL_DEVICETREE} \ +" + SPL_BINARY = "MLO" UBOOT_SUFFIX = "img"@@ -40,5 +49,5 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne IMAGE_FSTYPES += "tar.xz wic.xz" WKS_FILE ?= "sdimage-2part.wks" -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" do_image_wic[depends] += "u-boot:do_deploy"conf/machine/include/ti33x.inc +10
-1@@ -43,6 +43,15 @@ UBOOT_MACHINE = "am335x_evm_config" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +# Generate an extlinux.conf file +UBOOT_EXTLINUX = "1" +UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" +UBOOT_EXTLINUX_BOOT_FILES = " \ + extlinux.conf;extlinux/extlinux.conf \ + ${KERNEL_IMAGETYPE} \ + ${KERNEL_DEVICETREE} \ +" + SPL_BINARY = "MLO" UBOOT_SUFFIX = "img"@@ -61,5 +70,5 @@ TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x" IMAGE_FSTYPES += "tar.xz wic.xz" WKS_FILE ?= "sdimage-2part.wks" -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" do_image_wic[depends] += "virtual/bootloader:do_deploy"conf/machine/include/ti43x.inc +10
-1@@ -40,6 +40,15 @@ UBOOT_MACHINE = "am43xx_evm_config" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +# Generate an extlinux.conf file +UBOOT_EXTLINUX = "1" +UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" +UBOOT_EXTLINUX_BOOT_FILES = " \ + extlinux.conf;extlinux/extlinux.conf \ + ${KERNEL_IMAGETYPE} \ + ${KERNEL_DEVICETREE} \ +" + SPL_BINARY = "MLO" UBOOT_SUFFIX = "img"@@ -58,5 +67,5 @@ TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x" IMAGE_FSTYPES += "tar.xz wic.xz" WKS_FILE ?= "sdimage-2part.wks" -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" do_image_wic[depends] += "u-boot:do_deploy"Signature · 1 line
2.17.1
Signature · 4 lines
Regards, Denys Dmytriyenko <[email protected]> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964