Patchwork [U-Boot,v5,6/6] mx6qsabre{auto, sd}: Add support to dynamically choose between fdt use or not

login
register
mail settings
Submitter Otavio Salvador
Date Jan. 9, 2013, 11:58 a.m.
Message ID <1357732680-30245-7-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/210700/
State Superseded
Delegated to: Stefano Babic
Headers show

Comments

Otavio Salvador - Jan. 9, 2013, 11:58 a.m.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v5:
- Change subject
- Reword the warning

Changes in v4:
- Use a warning, instead of error when failing to fetch fdt
- Drop exit use
- Fix netboot
- Use fdt instead of ftd

Changes in v3:
- Add loadfdt
- Use loadfdt
- Call exit to abort script

Changes in v2:
- Allow use of dynamic/static ip
- Allow force use, or not, of fdt
- Change 'auto' to 'try'

 include/configs/mx6qsabre_common.h |   41 +++++++++++++++++++++++++++++++++---
 include/configs/mx6qsabreauto.h    |    1 +
 include/configs/mx6qsabresd.h      |    1 +
 3 files changed, 40 insertions(+), 3 deletions(-)
Liu Hui-R64343 - Jan. 9, 2013, 12:12 p.m.
>-----Original Message-----
>From: u-boot-bounces@lists.denx.de [mailto:u-boot-bounces@lists.denx.de]
>On Behalf Of Otavio Salvador
>Sent: Wednesday, January 09, 2013 7:58 PM
>To: U-Boot Mailing List
>Cc: Estevam Fabio-R49496; Otavio Salvador
>Subject: [U-Boot] [PATCH v5 6/6] mx6qsabre{auto, sd}: Add support to
>dynamically choose between fdt use or not
>
>Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>---
>Changes in v5:
>- Change subject
>- Reword the warning
>
>Changes in v4:
>- Use a warning, instead of error when failing to fetch fdt
>- Drop exit use
>- Fix netboot
>- Use fdt instead of ftd
>
>Changes in v3:
>- Add loadfdt
>- Use loadfdt
>- Call exit to abort script
>
>Changes in v2:
>- Allow use of dynamic/static ip
>- Allow force use, or not, of fdt
>- Change 'auto' to 'try'
>
> include/configs/mx6qsabre_common.h |   41
>+++++++++++++++++++++++++++++++++---

Acked-by: Jason Liu <r64343@freescale.com>

> include/configs/mx6qsabreauto.h    |    1 +
> include/configs/mx6qsabresd.h      |    1 +
> 3 files changed, 40 insertions(+), 3 deletions(-)
>
>diff --git a/include/configs/mx6qsabre_common.h
>b/include/configs/mx6qsabre_common.h
>index bd2fb10..0f0e51f 100644
>--- a/include/configs/mx6qsabre_common.h
>+++ b/include/configs/mx6qsabre_common.h
>@@ -83,6 +83,10 @@
> #define CONFIG_EXTRA_ENV_SETTINGS \
> 	"script=boot.scr\0" \
> 	"uimage=uImage\0" \
>+	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
>+	"fdt_addr=0x11000000\0" \
>+	"boot_fdt=try\0" \
>+	"ip_dyn=yes\0" \
> 	"console=" CONFIG_CONSOLE_DEV "\0" \
> 	"fdt_high=0xffffffff\0"	  \
> 	"initrd_high=0xffffffff\0" \
>@@ -96,15 +100,46 @@
> 	"bootscript=echo Running bootscript from mmc ...; " \
> 		"source\0" \
> 	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
>${uimage}\0" \
>-		"mmcboot=echo Booting from mmc ...; " \
>+	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr}
>${fdt_file}\0" \
>+	"mmcboot=echo Booting from mmc ...; " \
> 		"run mmcargs; " \
>-		"bootm\0" \
>+		"if test ${boot_fdt} = yes; then " \
>+			"if run loadfdt; then " \
>+				"bootm ${loadaddr} - ${fdt_addr}; " \
>+			"else " \
>+				"if test ${boot_fdt} = try; then " \
>+					"bootm; " \
>+				"else " \
>+					"echo WARN: Cannot load the DT; " \
>+				"fi; " \
>+			"fi; " \
>+		"else " \
>+			"bootm; " \
>+		"fi;\0" \
> 	"netargs=setenv bootargs console=${console},${baudrate} " \
> 		"root=/dev/nfs " \
> 		"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
> 	"netboot=echo Booting from net ...; " \
> 		"run netargs; " \
>-		"dhcp ${uimage}; bootm\0" \
>+		"if test ${ip_dyn} = yes; then " \
>+			"setenv get_cmd dhcp; " \
>+		"else " \
>+			"setenv get_cmd tftp; " \
>+		"fi; " \
>+		"${get_cmd} ${uimage}; " \
>+		"if test ${boot_fdt} = yes; then " \
>+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
>+				"bootm ${loadaddr} - ${fdt_addr}; " \
>+			"else " \
>+				"if test ${boot_fdt} = try; then " \
>+					"bootm; " \
>+				"else " \
>+					"echo WARN: Cannot load the DT; " \
>+				"fi; " \
>+			"fi; " \
>+		"else " \
>+			"bootm; " \
>+		"fi;\0"
>
> #define CONFIG_BOOTCOMMAND \
> 	"mmc dev ${mmcdev};" \
>diff --git a/include/configs/mx6qsabreauto.h
>b/include/configs/mx6qsabreauto.h index f1ff201..f4a082a 100644
>--- a/include/configs/mx6qsabreauto.h
>+++ b/include/configs/mx6qsabreauto.h
>@@ -15,6 +15,7 @@
> #define CONFIG_MACH_TYPE	3529
> #define CONFIG_MXC_UART_BASE	UART4_BASE
> #define CONFIG_CONSOLE_DEV		"ttymxc3"
>+#define CONFIG_DEFAULT_FDT_FILE	"imx6q-sabreauto.dtb"
> #define CONFIG_MMCROOT			"/dev/mmcblk0p2"
> #define PHYS_SDRAM_SIZE		(2u * 1024 * 1024 * 1024)
>
>diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h
>index a1d9285..b64e925 100644
>--- a/include/configs/mx6qsabresd.h
>+++ b/include/configs/mx6qsabresd.h
>@@ -21,6 +21,7 @@
> #define CONFIG_MXC_UART_BASE	UART1_BASE
> #define CONFIG_CONSOLE_DEV		"ttymxc0"
> #define CONFIG_MMCROOT			"/dev/mmcblk1p2"
>+#define CONFIG_DEFAULT_FDT_FILE	"imx6q-sabresd.dtb"
> #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
>
> #include "mx6qsabre_common.h"
>--
>1.7.10.4
>
>_______________________________________________
>U-Boot mailing list
>U-Boot@lists.denx.de
>http://lists.denx.de/mailman/listinfo/u-boot

Patch

diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
index bd2fb10..0f0e51f 100644
--- a/include/configs/mx6qsabre_common.h
+++ b/include/configs/mx6qsabre_common.h
@@ -83,6 +83,10 @@ 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"uimage=uImage\0" \
+	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"fdt_addr=0x11000000\0" \
+	"boot_fdt=try\0" \
+	"ip_dyn=yes\0" \
 	"console=" CONFIG_CONSOLE_DEV "\0" \
 	"fdt_high=0xffffffff\0"	  \
 	"initrd_high=0xffffffff\0" \
@@ -96,15 +100,46 @@ 
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"source\0" \
 	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
-		"mmcboot=echo Booting from mmc ...; " \
+	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
-		"bootm\0" \
+		"if test ${boot_fdt} = yes; then " \
+			"if run loadfdt; then " \
+				"bootm ${loadaddr} - ${fdt_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo WARN: Cannot load the DT; " \
+				"fi; " \
+			"fi; " \
+		"else " \
+			"bootm; " \
+		"fi;\0" \
 	"netargs=setenv bootargs console=${console},${baudrate} " \
 		"root=/dev/nfs " \
 		"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
 	"netboot=echo Booting from net ...; " \
 		"run netargs; " \
-		"dhcp ${uimage}; bootm\0" \
+		"if test ${ip_dyn} = yes; then " \
+			"setenv get_cmd dhcp; " \
+		"else " \
+			"setenv get_cmd tftp; " \
+		"fi; " \
+		"${get_cmd} ${uimage}; " \
+		"if test ${boot_fdt} = yes; then " \
+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+				"bootm ${loadaddr} - ${fdt_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo WARN: Cannot load the DT; " \
+				"fi; " \
+			"fi; " \
+		"else " \
+			"bootm; " \
+		"fi;\0"
 
 #define CONFIG_BOOTCOMMAND \
 	"mmc dev ${mmcdev};" \
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index f1ff201..f4a082a 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -15,6 +15,7 @@ 
 #define CONFIG_MACH_TYPE	3529
 #define CONFIG_MXC_UART_BASE	UART4_BASE
 #define CONFIG_CONSOLE_DEV		"ttymxc3"
+#define CONFIG_DEFAULT_FDT_FILE	"imx6q-sabreauto.dtb"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2"
 #define PHYS_SDRAM_SIZE		(2u * 1024 * 1024 * 1024)
 
diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h
index a1d9285..b64e925 100644
--- a/include/configs/mx6qsabresd.h
+++ b/include/configs/mx6qsabresd.h
@@ -21,6 +21,7 @@ 
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONFIG_CONSOLE_DEV		"ttymxc0"
 #define CONFIG_MMCROOT			"/dev/mmcblk1p2"
+#define CONFIG_DEFAULT_FDT_FILE	"imx6q-sabresd.dtb"
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
 
 #include "mx6qsabre_common.h"