Skip to contentSkip to conversation

conf: am335x-evm: Add extlinux.conf support

PATCH In review Tom Rini 4 participants 5 messages Jun 12, 2021 – Jun 14, 2021 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Tom Rini

author
#1 lore raw

PATCH v2 1/1 conf: am335x-evm: Add extlinux.conf support

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.

---
Changes in v2:
- Elaborate on how this feature works in the commit message.

---
 conf/machine/include/ti33x.inc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
conf/machine/include/ti33x.inc +10 -1
index 6dfda754e9dd..35e057d57497 100644
@@ -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"
Signature · 1 line
2.17.1
Reviewed-by on v2 1/1
#2 lore raw
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.

Quoted 37 lines

---
Changes in v2:
- Elaborate on how this feature works in the commit message.

---
 conf/machine/include/ti33x.inc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
conf/machine/include/ti33x.inc +10 -1
index 6dfda754e9dd..35e057d57497 100644
@@ -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"
Signature · 1 line
2.17.1
#3 lore raw
Quoted 30 lines · Denys Dmytriyenko
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.

Quoted 15 lines

---
Changes in v2:
- Elaborate on how this feature works in the commit message.

---
 conf/machine/include/ti33x.inc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
conf/machine/include/ti33x.inc +0 -0
index 6dfda754e9dd..35e057d57497 100644
@@ -43,6 +43,15 @@ UBOOT_MACHINE = "am335x_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
Quoted 9 lines

conf/machine/include/ti33x.inc UBOOT_MACHINE = "am335x_evm_config" · line 54

Quoted 9 lines
conf/machine/include/ti33x.inc +9 -0
+# 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} \
+"
+

Does it make better if we do this in ti-soc.inc ?

Quoted 17 lines
Quoted 13 lines
conf/machine/include/ti33x.inc +1 -1
 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"
Signature · 1 line
2.17.1
Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
#4 lore raw
Quoted 31 lines · Nishanth Menon
Quoted 30 lines · Denys Dmytriyenko
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.

Quoted 15 lines

---
Changes in v2:
- Elaborate on how this feature works in the commit message.

---
 conf/machine/include/ti33x.inc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
conf/machine/include/ti33x.inc +0 -0
index 6dfda754e9dd..35e057d57497 100644
@@ -43,6 +43,15 @@ UBOOT_MACHINE = "am335x_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
Quoted 11 lines
Quoted 9 lines

conf/machine/include/ti33x.inc UBOOT_MACHINE = "am335x_evm_config" · line 54

Quoted 9 lines
conf/machine/include/ti33x.inc +9 -0
+# 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} \
+"
+

Does it make better if we do this in ti-soc.inc ?

The problem here is that we'll have one set of changes for 32bit platforms, where I think extlinux.conf ends up being best as if you look at other distributions (ie Debian), they end up doing the not-EFI path. But on 64bit, everyone goes the EFI path. So I'm working through making an OE image that has a reasonable grub-efi path for us to boot up with.

Signature · 1 line
Tom
#5 lore raw
Quoted 44 lines · Tom Rini
Quoted 31 lines · Nishanth Menon
Quoted 30 lines · Denys Dmytriyenko
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.

Quoted 15 lines

---
Changes in v2:
- Elaborate on how this feature works in the commit message.

---
 conf/machine/include/ti33x.inc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
conf/machine/include/ti33x.inc +0 -0
index 6dfda754e9dd..35e057d57497 100644
@@ -43,6 +43,15 @@ UBOOT_MACHINE = "am335x_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
Quoted 11 lines
Quoted 9 lines

conf/machine/include/ti33x.inc UBOOT_MACHINE = "am335x_evm_config" · line 54

Quoted 9 lines
conf/machine/include/ti33x.inc +9 -0
+# 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} \
+"
+

Does it make better if we do this in ti-soc.inc ?

Quoted 5 lines

The problem here is that we'll have one set of changes for 32bit platforms, where I think extlinux.conf ends up being best as if you look at other distributions (ie Debian), they end up doing the not-EFI path. But on 64bit, everyone goes the EFI path. So I'm working through making an OE image that has a reasonable grub-efi path for us to boot up with.

OK. I see now. Thanks for explaining.

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D