All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v3 1/5] imx: mx6qarm2: Add the kernel FDT Loading support
@ 2014-09-09  2:16 Ye.Li
  2014-09-09  2:16 ` [U-Boot] [PATCH v3 2/5] imx: mx6qarm2: Change the mmcroot and mmcpart env value Ye.Li
                   ` (4 more replies)
  0 siblings, 5 replies; 11+ messages in thread
From: Ye.Li @ 2014-09-09  2:16 UTC (permalink / raw)
  To: u-boot

To support loading FDT file for kernel, add the fdt address,
file and loading script to arm2 board default environment.

Signed-off-by: Ye.Li <B37916@freescale.com>
---
Changes since v2:
- Rework the short log subject.

Changes since v1:
- None

 include/configs/mx6qarm2.h |   41 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index fd651cf..f633525 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -67,15 +67,19 @@
 
 #define CONFIG_BOOTDELAY		3
 
-#define CONFIG_LOADADDR			0x10800000
+#define CONFIG_LOADADDR			0x12000000
 #define CONFIG_SYS_TEXT_BASE		0x17800000
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc3\0" \
+	"fdt_file=imx6q-arm2.dtb\0" \
+	"fdt_addr=0x18000000\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
+	"boot_fdt=try\0" \
+	"ip_dyn=yes\0" \
 	"mmcdev=1\0" \
 	"mmcpart=2\0" \
 	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
@@ -86,15 +90,46 @@
 	"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" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
-		"bootz\0" \
+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+			"if run loadfdt; then " \
+				"bootz ${loadaddr} - ${fdt_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootz; " \
+				"else " \
+					"echo WARN: Cannot load the DT; " \
+				"fi; " \
+			"fi; " \
+		"else " \
+			"bootz; " \
+		"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 ${image}; bootz\0" \
+		"if test ${ip_dyn} = yes; then " \
+			"setenv get_cmd dhcp; " \
+		"else " \
+			"setenv get_cmd tftp; " \
+		"fi; " \
+		"${get_cmd} ${image}; " \
+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+				"bootz ${loadaddr} - ${fdt_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootz; " \
+				"else " \
+					"echo WARN: Cannot load the DT; " \
+				"fi; " \
+			"fi; " \
+		"else " \
+			"bootz; " \
+		"fi;\0"
 
 #define CONFIG_BOOTCOMMAND \
 	"mmc dev ${mmcdev};" \
-- 
1.7.4.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-09-29  8:27 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-09  2:16 [U-Boot] [PATCH v3 1/5] imx: mx6qarm2: Add the kernel FDT Loading support Ye.Li
2014-09-09  2:16 ` [U-Boot] [PATCH v3 2/5] imx: mx6qarm2: Change the mmcroot and mmcpart env value Ye.Li
2014-09-29  8:14   ` Stefano Babic
2014-09-09  2:16 ` [U-Boot] [PATCH v3 3/5] imx: mx6dlarm2: Add support for i.MX6DL arm2 DDR3 board Ye.Li
2014-09-29  8:14   ` Stefano Babic
2014-09-29  8:27     ` Stefano Babic
2014-09-09  2:17 ` [U-Boot] [PATCH v3 4/5] imx: mx6: Checking PLL2 PFD0 and PFD2 for periph_clk before PFD reset Ye.Li
2014-09-29  8:14   ` Stefano Babic
2014-09-09  2:17 ` [U-Boot] [PATCH v3 5/5] imx: mx6dlarm2: Add support for i.MX6Q/DL arm2 LPDDR2 boards Ye.Li
2014-09-29  8:15   ` Stefano Babic
2014-09-29  8:14 ` [U-Boot] [PATCH v3 1/5] imx: mx6qarm2: Add the kernel FDT Loading support Stefano Babic

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.