Re: [meta-ti] [PATCHv2] conf: am335x-evm: Add extlinux.conf support
On 12:02-20210614, Tom Rini wrote: > On Mon, Jun 14, 2021 at 09:43:53AM -0500, Nishanth Menon wrote: > > On 15:36-20210613, Denys Dmytriyenko wrote: > > > On Sat, Jun 12, 2021 at 09:13:31AM -0400, Tom Rini wrote: > > > > 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 > > > > > > Reviewed-by: Denys Dmytriyenko > > > > > > > > > > --- > > > > 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(-) > > > > > > > > diff --git a/conf/machine/include/ti33x.inc > > > > b/conf/machine/include/ti33x.inc > > > > index 6dfda754e9dd..35e057d57497 100644 > > > > --- a/conf/machine/include/ti33x.inc > > > > +++ b/conf/machine/include/ti33x.inc > > > > @@ -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} \ > > > > +" > > > > + > > > > 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. OK. I see now. Thanks for explaining. -- Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13838): https://lists.yoctoproject.org/g/meta-ti/message/13838 Mute This Topic: https://lists.yoctoproject.org/mt/83489498/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-ti] [PATCHv2] conf: am335x-evm: Add extlinux.conf support
On 15:36-20210613, Denys Dmytriyenko wrote: > On Sat, Jun 12, 2021 at 09:13:31AM -0400, Tom Rini wrote: > > 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 > > Reviewed-by: Denys Dmytriyenko > > > > --- > > 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(-) > > > > diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc > > index 6dfda754e9dd..35e057d57497 100644 > > --- a/conf/machine/include/ti33x.inc > > +++ b/conf/machine/include/ti33x.inc > > @@ -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} \ > > +" > > + Does it make better if we do this in ti-soc.inc ? > > 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" > > -- > > 2.17.1 > > > > > -- Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13836): https://lists.yoctoproject.org/g/meta-ti/message/13836 Mute This Topic: https://lists.yoctoproject.org/mt/83489498/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-ti] [PATCHv2] conf: am335x-evm: Add extlinux.conf support
On Sat, Jun 12, 2021 at 09:13:31AM -0400, Tom Rini wrote: > 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 Reviewed-by: Denys Dmytriyenko > --- > 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(-) > > diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc > index 6dfda754e9dd..35e057d57497 100644 > --- a/conf/machine/include/ti33x.inc > +++ b/conf/machine/include/ti33x.inc > @@ -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" > -- > 2.17.1 > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13834): https://lists.yoctoproject.org/g/meta-ti/message/13834 Mute This Topic: https://lists.yoctoproject.org/mt/83489498/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-ti] [PATCHv2] 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. Signed-off-by: Tom Rini --- 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(-) diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc index 6dfda754e9dd..35e057d57497 100644 --- a/conf/machine/include/ti33x.inc +++ b/conf/machine/include/ti33x.inc @@ -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" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13833): https://lists.yoctoproject.org/g/meta-ti/message/13833 Mute This Topic: https://lists.yoctoproject.org/mt/83489498/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-