Skip to contentSkip to conversation

mx6: mx6sabre common: Use more conventional spelling of fdtfile

PATCH New Sjoerd Simons 3 participants 5 messages Jun 20, 2019 – Oct 14, 2019

lore
Share & tools
lore
#0 lore raw

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.

---

 include/configs/mx6sabre_common.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
include/configs/mx6sabre_common.h +11 -11
index c137612b01..270cd2bae2 100644
@@ -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" \
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 mx6: mx6sabre common: Add distro boot config

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.

---

 configs/mx6sabreauto_defconfig    |  2 ++
 include/configs/mx6sabre_common.h | 52 +++++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 13 deletions(-)
configs/mx6sabreauto_defconfig +2 -0
index 558b1cd996..e3430fd131 100644
@@ -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
include/configs/mx6sabre_common.h +39 -13

66 lines not on this page · raw message

Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/2 mx6: mx6sabre common: Add distro boot config

Hi Sjoerd,

Subject says 2/2, but I don't see a 1/2.

Quoted 9 lines · Sjoerd Simons

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.

---

 configs/mx6sabreauto_defconfig    |  2 ++

It seems you missed to touch mx6sabresd_defconfig.

#3 lore raw

PATCH 2/2 mx6: mx6sabre common: Add distro boot config

Quoted 3 lines · Fabio Estevam

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.

Quoted 6 lines
Quoted 4 lines · Sjoerd Simons

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.

Quoted 6 lines
Quoted 4 lines

---

 configs/mx6sabreauto_defconfig    |  2 ++

It seems you missed to touch mx6sabresd_defconfig.

Indeed; Thanks! Will get that fixed

Signature · 2 lines
Sjoerd Simons
Collabora Ltd.
#4 lore raw

PATCH 1/2 mx6: mx6sabre common: Use more conventional spelling of fdtfile

In reply to Sjoerd Simons
Quoted 4 lines

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.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================