* [PATCHv2] conf: am335x-evm: Add extlinux.conf support
[not found] <16875AD11A54340A.8333@lists.yoctoproject.org>
@ 2021-06-12 13:13 ` Tom Rini
2021-06-13 19:36 ` [meta-ti] " Denys Dmytriyenko
0 siblings, 1 reply; 5+ messages in thread
From: Tom Rini @ 2021-06-12 13:13 UTC (permalink / raw)
To: meta-ti
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>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-ti] [PATCHv2] conf: am335x-evm: Add extlinux.conf support
2021-06-12 13:13 ` [PATCHv2] conf: am335x-evm: Add extlinux.conf support Tom Rini
@ 2021-06-13 19:36 ` Denys Dmytriyenko
2021-06-14 14:43 ` Nishanth Menon
0 siblings, 1 reply; 5+ messages in thread
From: Denys Dmytriyenko @ 2021-06-13 19:36 UTC (permalink / raw)
To: Tom Rini; +Cc: meta-ti
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 <trini@konsulko.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> 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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-ti] [PATCHv2] conf: am335x-evm: Add extlinux.conf support
2021-06-13 19:36 ` [meta-ti] " Denys Dmytriyenko
@ 2021-06-14 14:43 ` Nishanth Menon
2021-06-14 16:02 ` Tom Rini
0 siblings, 1 reply; 5+ messages in thread
From: Nishanth Menon @ 2021-06-14 14:43 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Tom Rini, meta-ti
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 <trini@konsulko.com>
>
> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
>
>
> > ---
> > 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-ti] [PATCHv2] conf: am335x-evm: Add extlinux.conf support
2021-06-14 14:43 ` Nishanth Menon
@ 2021-06-14 16:02 ` Tom Rini
2021-06-14 16:27 ` Nishanth Menon
0 siblings, 1 reply; 5+ messages in thread
From: Tom Rini @ 2021-06-14 16:02 UTC (permalink / raw)
To: Nishanth Menon; +Cc: Denys Dmytriyenko, meta-ti
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 <trini@konsulko.com>
> >
> > Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> >
> >
> > > ---
> > > 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.
--
Tom
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-ti] [PATCHv2] conf: am335x-evm: Add extlinux.conf support
2021-06-14 16:02 ` Tom Rini
@ 2021-06-14 16:27 ` Nishanth Menon
0 siblings, 0 replies; 5+ messages in thread
From: Nishanth Menon @ 2021-06-14 16:27 UTC (permalink / raw)
To: Tom Rini; +Cc: Denys Dmytriyenko, meta-ti
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 <trini@konsulko.com>
> > >
> > > Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> > >
> > >
> > > > ---
> > > > 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-06-14 16:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <16875AD11A54340A.8333@lists.yoctoproject.org>
2021-06-12 13:13 ` [PATCHv2] conf: am335x-evm: Add extlinux.conf support Tom Rini
2021-06-13 19:36 ` [meta-ti] " Denys Dmytriyenko
2021-06-14 14:43 ` Nishanth Menon
2021-06-14 16:02 ` Tom Rini
2021-06-14 16:27 ` Nishanth Menon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.