[U-Boot] [PATCH 1/2] mx6: mx6sabre common: Use more conventional spelling of fdtfile
Both the distro boot configuration as well as the general pxe support standardized on fdtfile as the variable to hold the dtb filename. Adjust to follow that such that e.g. "pxe boot" will just work.
Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk ---
include/configs/mx6sabre_common.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index c137612b01..270cd2bae2 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -51,7 +51,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ - "fdt_file=undefined\0" \ + "fdtfile=undefined\0" \ "fdt_addr=0x18000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ @@ -86,7 +86,7 @@ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run finduuid; " \ "run mmcargs; " \ @@ -115,7 +115,7 @@ "fi; " \ "${get_cmd} ${image}; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ + "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ "bootz ${loadaddr} - ${fdt_addr}; " \ "else " \ "if test ${boot_fdt} = try; then " \ @@ -128,20 +128,20 @@ "bootz; " \ "fi;\0" \ "findfdt="\ - "if test $fdt_file = undefined; then " \ + "if test $fdtfile = undefined; then " \ "if test $board_name = SABREAUTO && test $board_rev = MX6QP; then " \ - "setenv fdt_file imx6qp-sabreauto.dtb; fi; " \ + "setenv fdtfile imx6qp-sabreauto.dtb; fi; " \ "if test $board_name = SABREAUTO && test $board_rev = MX6Q; then " \ - "setenv fdt_file imx6q-sabreauto.dtb; fi; " \ + "setenv fdtfile imx6q-sabreauto.dtb; fi; " \ "if test $board_name = SABREAUTO && test $board_rev = MX6DL; then " \ - "setenv fdt_file imx6dl-sabreauto.dtb; fi; " \ + "setenv fdtfile imx6dl-sabreauto.dtb; fi; " \ "if test $board_name = SABRESD && test $board_rev = MX6QP; then " \ - "setenv fdt_file imx6qp-sabresd.dtb; fi; " \ + "setenv fdtfile imx6qp-sabresd.dtb; fi; " \ "if test $board_name = SABRESD && test $board_rev = MX6Q; then " \ - "setenv fdt_file imx6q-sabresd.dtb; fi; " \ + "setenv fdtfile imx6q-sabresd.dtb; fi; " \ "if test $board_name = SABRESD && test $board_rev = MX6DL; then " \ - "setenv fdt_file imx6dl-sabresd.dtb; fi; " \ - "if test $fdt_file = undefined; then " \ + "setenv fdtfile imx6dl-sabresd.dtb; fi; " \ + "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine dtb to use; fi; " \ "fi;\0" \
Allow mx6 sabreauto and sabresd to boot via the default distro boot commands to make it easier to support general distributions. The previous boot setup is still supported via legacy boot targets.
Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk ---
configs/mx6sabreauto_defconfig | 2 ++ include/configs/mx6sabre_common.h | 52 +++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index 558b1cd996..e3430fd131 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 270cd2bae2..bc4444700b 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -48,7 +48,45 @@ #define EMMC_ENV "" #endif
+#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel #instance "=" \ + "setenv mmcdev " #instance "; "\ + "mmc dev ${mmcdev};" \ + "if mmc rescan; then " \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ + "if run loadimage; then " \ + "run mmcboot; " \ + "fi; " \ + "fi; " \ + "fi;\0" + +#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \ + #devtypel #instance " " + +#define BOOTENV_DEV_LEGACY_NET(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel "=" \ + "run netboot\0" + +#define BOOTENV_DEV_NAME_LEGACY_NET(devtypeu, devtypel, instance) \ + #devtypel " " + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, CONFIG_SYS_MMC_ENV_DEV) \ + func(LEGACY_MMC, legacy_mmc, CONFIG_SYS_MMC_ENV_DEV) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) \ + func(LEGACY_NET, legacy_net, na) + +#include <config_distro_bootcmd.h> + #define CONFIG_EXTRA_ENV_SETTINGS \ + "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "ramdisk_addr_r=0x14000000\0" \ + "fdt_addr_r=0x18000000\0" \ "script=boot.scr\0" \ "image=zImage\0" \ "fdtfile=undefined\0" \ @@ -144,20 +182,8 @@ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine dtb to use; fi; " \ "fi;\0" \ + BOOTENV
-#define CONFIG_BOOTCOMMAND \ - "run findfdt;" \ - "mmc dev ${mmcdev};" \ - "if mmc rescan; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ - "if run loadimage; then " \ - "run mmcboot; " \ - "else run netboot; " \ - "fi; " \ - "fi; " \ - "else run netboot; fi"
#define CONFIG_ARP_TIMEOUT 200UL
Hi Sjoerd,
Subject says 2/2, but I don't see a 1/2.
On Thu, Jun 20, 2019 at 5:35 PM Sjoerd Simons sjoerd.simons@collabora.co.uk wrote:
Allow mx6 sabreauto and sabresd to boot via the default distro boot commands to make it easier to support general distributions. The previous boot setup is still supported via legacy boot targets.
Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk
configs/mx6sabreauto_defconfig | 2 ++
It seems you missed to touch mx6sabresd_defconfig.
On Fri, 2019-07-12 at 10:51 -0300, Fabio Estevam wrote:
Hi Sjoerd,
Subject says 2/2, but I don't see a 1/2.
1/2 is https://patchwork.ozlabs.org/patch/1119776/ guess patman didn't cc you.
On Thu, Jun 20, 2019 at 5:35 PM Sjoerd Simons sjoerd.simons@collabora.co.uk wrote:
Allow mx6 sabreauto and sabresd to boot via the default distro boot commands to make it easier to support general distributions. The previous boot setup is still supported via legacy boot targets.
Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk
configs/mx6sabreauto_defconfig | 2 ++
It seems you missed to touch mx6sabresd_defconfig.
Indeed; Thanks! Will get that fixed
Both the distro boot configuration as well as the general pxe support standardized on fdtfile as the variable to hold the dtb filename. Adjust to follow that such that e.g. "pxe boot" will just work. Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
participants (3)
-
Fabio Estevam -
sbabic＠denx.de -
Sjoerd Simons