* [PATCH 1/2] ARM: imx6: mx6sabre-common: Replace fatload with FS_GENERIC load
@ 2021-02-04 18:00 Marek Vasut
2021-02-04 18:00 ` [PATCH 2/2] ARM: imx6: mx6sabre-common: Search for boot components in /boot too Marek Vasut
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Marek Vasut @ 2021-02-04 18:00 UTC (permalink / raw)
To: u-boot
Replace filesystem specific fatload command with a filesystem agnostic
load command, so the board can boot from e.g. ext4 too.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Ye Li <ye.li@nxp.com>
Cc: uboot-imx <uboot-imx@nxp.com>
---
include/configs/mx6sabre_common.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 93d00a4dc3c..735532955fd 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -73,11 +73,11 @@
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=PARTUUID=${uuid} rootwait rw\0" \
"loadbootscript=" \
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+ "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \
"source\0" \
- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
+ "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
+ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run finduuid; " \
"run mmcargs; " \
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: imx6: mx6sabre-common: Search for boot components in /boot too
2021-02-04 18:00 [PATCH 1/2] ARM: imx6: mx6sabre-common: Replace fatload with FS_GENERIC load Marek Vasut
@ 2021-02-04 18:00 ` Marek Vasut
2021-02-05 6:46 ` Peng Fan
2021-03-01 11:56 ` sbabic at denx.de
2021-02-05 6:45 ` [PATCH 1/2] ARM: imx6: mx6sabre-common: Replace fatload with FS_GENERIC load Peng Fan
2021-03-01 11:56 ` sbabic at denx.de
2 siblings, 2 replies; 6+ messages in thread
From: Marek Vasut @ 2021-02-04 18:00 UTC (permalink / raw)
To: u-boot
Some root filesystem configurations do not have separate /boot partition,
but rather place kernel, DT, scripts into /boot directory. Search the /boot
directory for these boot components in case they are not found in /, which
is the old behavior.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Ye Li <ye.li@nxp.com>
Cc: uboot-imx <uboot-imx@nxp.com>
---
include/configs/mx6sabre_common.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 735532955fd..ac579f3338a 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -73,11 +73,14 @@
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=PARTUUID=${uuid} rootwait rw\0" \
"loadbootscript=" \
- "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+ "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script} || " \
+ "load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \
"source\0" \
- "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
- "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
+ "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} || " \
+ "load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \
+ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile} || " \
+ "load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run finduuid; " \
"run mmcargs; " \
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/2] ARM: imx6: mx6sabre-common: Replace fatload with FS_GENERIC load
2021-02-04 18:00 [PATCH 1/2] ARM: imx6: mx6sabre-common: Replace fatload with FS_GENERIC load Marek Vasut
2021-02-04 18:00 ` [PATCH 2/2] ARM: imx6: mx6sabre-common: Search for boot components in /boot too Marek Vasut
@ 2021-02-05 6:45 ` Peng Fan
2021-03-01 11:56 ` sbabic at denx.de
2 siblings, 0 replies; 6+ messages in thread
From: Peng Fan @ 2021-02-05 6:45 UTC (permalink / raw)
To: u-boot
> Subject: [PATCH 1/2] ARM: imx6: mx6sabre-common: Replace fatload with
> FS_GENERIC load
>
> Replace filesystem specific fatload command with a filesystem agnostic load
> command, so the board can boot from e.g. ext4 too.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: Peng Fan <peng.fan@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Ye Li <ye.li@nxp.com>
> Cc: uboot-imx <uboot-imx@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
> ---
> include/configs/mx6sabre_common.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/configs/mx6sabre_common.h
> b/include/configs/mx6sabre_common.h
> index 93d00a4dc3c..735532955fd 100644
> --- a/include/configs/mx6sabre_common.h
> +++ b/include/configs/mx6sabre_common.h
> @@ -73,11 +73,11 @@
> "mmcargs=setenv bootargs console=${console},${baudrate} " \
> "root=PARTUUID=${uuid} rootwait rw\0" \
> "loadbootscript=" \
> - "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> + "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> "bootscript=echo Running bootscript from mmc ...; " \
> "source\0" \
> - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
> ${image}\0" \
> - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
> + "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0"
> \
> + "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
> "mmcboot=echo Booting from mmc ...; " \
> "run finduuid; " \
> "run mmcargs; " \
> --
> 2.29.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: imx6: mx6sabre-common: Search for boot components in /boot too
2021-02-04 18:00 ` [PATCH 2/2] ARM: imx6: mx6sabre-common: Search for boot components in /boot too Marek Vasut
@ 2021-02-05 6:46 ` Peng Fan
2021-03-01 11:56 ` sbabic at denx.de
1 sibling, 0 replies; 6+ messages in thread
From: Peng Fan @ 2021-02-05 6:46 UTC (permalink / raw)
To: u-boot
> Subject: [PATCH 2/2] ARM: imx6: mx6sabre-common: Search for boot
> components in /boot too
>
> Some root filesystem configurations do not have separate /boot partition, but
> rather place kernel, DT, scripts into /boot directory. Search the /boot directory
> for these boot components in case they are not found in /, which is the old
> behavior.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: Peng Fan <peng.fan@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Ye Li <ye.li@nxp.com>
> Cc: uboot-imx <uboot-imx@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
> ---
> include/configs/mx6sabre_common.h | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/include/configs/mx6sabre_common.h
> b/include/configs/mx6sabre_common.h
> index 735532955fd..ac579f3338a 100644
> --- a/include/configs/mx6sabre_common.h
> +++ b/include/configs/mx6sabre_common.h
> @@ -73,11 +73,14 @@
> "mmcargs=setenv bootargs console=${console},${baudrate} " \
> "root=PARTUUID=${uuid} rootwait rw\0" \
> "loadbootscript=" \
> - "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> + "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script} || " \
> + "load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${script};\0" \
> "bootscript=echo Running bootscript from mmc ...; " \
> "source\0" \
> - "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0"
> \
> - "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
> + "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} ||
> " \
> + "load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \
> + "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile} || " \
> + "load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \
> "mmcboot=echo Booting from mmc ...; " \
> "run finduuid; " \
> "run mmcargs; " \
> --
> 2.29.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] ARM: imx6: mx6sabre-common: Replace fatload with FS_GENERIC load
2021-02-04 18:00 [PATCH 1/2] ARM: imx6: mx6sabre-common: Replace fatload with FS_GENERIC load Marek Vasut
2021-02-04 18:00 ` [PATCH 2/2] ARM: imx6: mx6sabre-common: Search for boot components in /boot too Marek Vasut
2021-02-05 6:45 ` [PATCH 1/2] ARM: imx6: mx6sabre-common: Replace fatload with FS_GENERIC load Peng Fan
@ 2021-03-01 11:56 ` sbabic at denx.de
2 siblings, 0 replies; 6+ messages in thread
From: sbabic at denx.de @ 2021-03-01 11:56 UTC (permalink / raw)
To: u-boot
> Replace filesystem specific fatload command with a filesystem agnostic
> load command, so the board can boot from e.g. ext4 too.
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: Peng Fan <peng.fan@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Ye Li <ye.li@nxp.com>
> Cc: uboot-imx <uboot-imx@nxp.com>
> Reviewed-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: imx6: mx6sabre-common: Search for boot components in /boot too
2021-02-04 18:00 ` [PATCH 2/2] ARM: imx6: mx6sabre-common: Search for boot components in /boot too Marek Vasut
2021-02-05 6:46 ` Peng Fan
@ 2021-03-01 11:56 ` sbabic at denx.de
1 sibling, 0 replies; 6+ messages in thread
From: sbabic at denx.de @ 2021-03-01 11:56 UTC (permalink / raw)
To: u-boot
> Some root filesystem configurations do not have separate /boot partition,
> but rather place kernel, DT, scripts into /boot directory. Search the /boot
> directory for these boot components in case they are not found in /, which
> is the old behavior.
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: Peng Fan <peng.fan@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Ye Li <ye.li@nxp.com>
> Cc: uboot-imx <uboot-imx@nxp.com>
> Reviewed-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-01 11:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-04 18:00 [PATCH 1/2] ARM: imx6: mx6sabre-common: Replace fatload with FS_GENERIC load Marek Vasut
2021-02-04 18:00 ` [PATCH 2/2] ARM: imx6: mx6sabre-common: Search for boot components in /boot too Marek Vasut
2021-02-05 6:46 ` Peng Fan
2021-03-01 11:56 ` sbabic at denx.de
2021-02-05 6:45 ` [PATCH 1/2] ARM: imx6: mx6sabre-common: Replace fatload with FS_GENERIC load Peng Fan
2021-03-01 11:56 ` sbabic at denx.de
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.