Patchwork [U-Boot,v1] arm:trats: change auto-booting to boot kernel with separate device tree blob

login
register
mail settings
Submitter a.wlodarczyk@samsung.com
Date April 2, 2013, 1:10 p.m.
Message ID <1364908216-11400-1-git-send-email-a.wlodarczyk@samsung.com>
Download mbox | patch
Permalink /patch/232990/
State Accepted
Delegated to: Minkyu Kang
Headers show

Comments

a.wlodarczyk@samsung.com - April 2, 2013, 1:10 p.m.
From: Arkadiusz Wlodarczyk <arek@AMDC384.(none)>

Signed-off-by: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Tested-by: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
Changes:
Modify autoboot scripts that are included in environment variables of default
environment in order to load device tree to memory prior to booting and to
pass device tree address to mboot command.
Switch on dft library, that is necessary for mboot command to pass the device
tree address in memory to kernel.
Added device tree file entry in DFU items table in order to facilitate
uploading the device tree blob file on a target.
---
---
 include/configs/trats.h |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)
Minkyu Kang - June 13, 2013, 8:15 a.m.
On 02/04/13 22:10, a.wlodarczyk@samsung.com wrote:
> From: Arkadiusz Wlodarczyk <arek@AMDC384.(none)>
> 
> Signed-off-by: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Tested-by: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
> ---
> Changes:
> Modify autoboot scripts that are included in environment variables of default
> environment in order to load device tree to memory prior to booting and to
> pass device tree address to mboot command.
> Switch on dft library, that is necessary for mboot command to pass the device
> tree address in memory to kernel.
> Added device tree file entry in DFU items table in order to facilitate
> uploading the device tree blob file on a target.
> ---
> ---
>  include/configs/trats.h |   17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
> 

applied to u-boot-samsung.

Thanks,
Minkyu Kang.

Patch

diff --git a/include/configs/trats.h b/include/configs/trats.h
index 31d8190..b044fcc 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -146,7 +146,8 @@ 
 
 #define CONFIG_DFU_ALT \
 	"u-boot mmc 80 400;" \
-	"uImage ext4 0 2\0" \
+	"uImage ext4 0 2;" \
+	"exynos4210-trats.dtb ext4 0 2\0"
 
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
@@ -154,7 +155,7 @@ 
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootk=" \
-		"run loaduimage; bootm 0x40007FC0\0" \
+		"run loaddtb; run loaduimage; bootm 0x40007FC0 - ${fdtaddr}\0" \
 	"updatemmc=" \
 		"mmc boot 0 1 1 1; mmc write 0 0x42008000 0 0x200;" \
 		"mmc boot 0 1 1 0\0" \
@@ -177,7 +178,7 @@ 
 	"mmcboot=" \
 		"setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
 		"${lpj} rootwait ${console} ${meminfo} ${opts} ${lcdinfo}; " \
-		"run loaduimage; bootm 0x40007FC0\0" \
+		"run loaddtb; run loaduimage; bootm 0x40007FC0 - ${fdtaddr}\0" \
 	"bootchart=setenv opts init=/sbin/bootchartd; run bootcmd\0" \
 	"boottrace=setenv opts initcall_debug; run bootcmd\0" \
 	"mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
@@ -188,6 +189,8 @@ 
 	"nfsroot=/nfsroot/arm\0" \
 	"bootblock=" CONFIG_BOOTBLOCK "\0" \
 	"loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 uImage\0" \
+	"loaddtb=ext4load mmc ${mmcdev}:${mmcbootpart} ${fdtaddr}" \
+		"${fdtfile}\0" \
 	"mmcdev=0\0" \
 	"mmcbootpart=2\0" \
 	"mmcrootpart=5\0" \
@@ -211,7 +214,10 @@ 
 		   " /${splfile} ${spl_imgaddr} ${spl_imgsize};" \
 		   "setenv spl_imgsize;" \
 		   "setenv spl_imgaddr;" \
-		   "setenv spl_addr_tmp;\0"
+		   "setenv spl_addr_tmp;\0" \
+	"fdtaddr=40800000\0" \
+	"fdtfile=exynos4210-trats.dtb\0"
+
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
@@ -321,4 +327,7 @@ 
 #define CONFIG_USB_GADGET_MASS_STORAGE
 #endif
 
+/* Pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT    1
+
 #endif	/* __CONFIG_H */