Skip to contentSkip to conversation

config: exynos: common: Provide env variables to support Image.itb

PATCH New Lukasz Majewski 2 participants 6 messages Apr 1, 2015 – Apr 6, 2015 Arm Samsung Exynos

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 config: exynos: common: Provide env variables to support Image.itb

This change allows using Image.itb image format with Exynos4 devices (especially trats and trats2).
Such change facilitates automated testing since only one binary needs to be prepared.

---
 include/configs/exynos4-common.h | 54 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
include/configs/exynos4-common.h +54 -0
index 41631c7..577afe7 100644
@@ -66,4 +66,58 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_GADGET_MASS_STORAGE
 
+/* Common environment variables */
+#define CONFIG_EXTRA_ENV_ITB \
+	"loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \
+		"${kernelname}\0" \
+	"loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \
+		"${initrdname}\0" \
+	"loaddtb=load mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} " \
+		"${fdtfile}\0" \
+	"check_ramdisk=" \
+		"if run loadinitrd; then " \
+			"setenv initrd_addr ${initrdaddr};" \
+		"else " \
+			"setenv initrd_addr -;" \
+		"fi;\0" \
+	"check_dtb=" \
+		"if run loaddtb; then " \
+			"setenv fdt_addr ${fdtaddr};" \
+		"else " \
+			"setenv fdt_addr;" \
+		"fi;\0" \
+	"kernel_args=" \
+		"setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart}" \
+		" ${lpj} rootwait ${console} ${meminfo} ${opts} ${lcdinfo};\0" \
+	"boot_fit=" \
+		"setenv kerneladdr 0x42000000;" \
+		"setenv kernelname Image.itb;" \
+		"run loadkernel;" \
+		"run kernel_args;" \
+		"bootm ${kerneladdr}#${board_name}\0" \
+	"boot_uimg=" \
+		"setenv kerneladdr 0x40007FC0;" \
+		"setenv kernelname uImage;" \
+		"run check_dtb;" \
+		"run check_ramdisk;" \
+		"run loadkernel;" \
+		"run kernel_args;" \
+		"bootm ${kerneladdr} ${initrd_addr} ${fdt_addr};\0" \
+	"boot_zimg=" \
+		"setenv kerneladdr 0x40007FC0;" \
+		"setenv kernelname zImage;" \
+		"run check_dtb;" \
+		"run check_ramdisk;" \
+		"run loadkernel;" \
+		"run kernel_args;" \
+		"bootz ${kerneladdr} ${initrd_addr} ${fdt_addr};\0" \
+	"autoboot=" \
+		"if test -e mmc ${mmcdev}:${mmcbootpart} Image.itb; then; " \
+			"run boot_fit;" \
+		"elif test -e mmc ${mmcdev}:${mmcbootpart} zImage; then; " \
+			"run boot_zimg;" \
+		"elif test -e mmc ${mmcdev}:${mmcbootpart} uImage; then; " \
+			"run boot_uimg;" \
+		"fi;\0"
+
 #endif	/* __CONFIG_EXYNOS4_COMMON_H */
Signature · 1 line
2.0.0.rc2
#1 lore raw

PATCH 2/3 config: exynos: trats: Enable support for Image.itb at trats device

After this change it is possible to boot trats device with Image.itb, which facilitates automated testing, since only one file is necessary.

---
 include/configs/trats.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
include/configs/trats.h +6 -2
index b21ea2d..6808e78 100644
@@ -51,8 +51,10 @@
 #define MACH_TYPE_TRATS			3928
 #define CONFIG_MACH_TYPE		MACH_TYPE_TRATS
 
+#define CONFIG_FIT
+#define CONFIG_FIT_VERBOSE
 #define CONFIG_BOOTARGS			"Please use defined boot"
-#define CONFIG_BOOTCOMMAND		"run mmcboot"
+#define CONFIG_BOOTCOMMAND		"run autoboot"
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"
 
 #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_LOAD_ADDR \
@@ -106,7 +108,8 @@
 	""PARTS_ROOT" part 0 5;" \
 	""PARTS_DATA" part 0 6;" \
 	""PARTS_UMS" part 0 7;" \
-	"params.bin raw 0x38 0x8\0"
+	"params.bin raw 0x38 0x8;" \
+	"/Image.itb ext4 0 2\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootk=" \
@@ -172,6 +175,7 @@
 		   "setenv spl_imgsize;" \
 		   "setenv spl_imgaddr;" \
 		   "setenv spl_addr_tmp;\0" \
+	CONFIG_EXTRA_ENV_ITB \
 	"fdtaddr=40800000\0" \
 
 /* Falcon mode definitions */
Signature · 1 line
2.0.0.rc2
#2 lore raw

PATCH 2/3 config: exynos: trats: Enable support for Image.itb at trats device

Quoted 8 lines · Lukasz Majewski

After this change it is possible to boot trats device with Image.itb, which facilitates automated testing, since only one file is necessary.

---
 include/configs/trats.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

applied to u-boot-samsung.

Thanks,
Minkyu Kang.

#3 lore raw

PATCH 3/3 config: exynos: trats2: Enable support for Image.itb at trats2 device

In reply to Lukasz Majewski

After this change it is possible to boot trats2 device with Image.itb, which facilitates automated testing, since only one file is necessary.

---
 include/configs/trats2.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
include/configs/trats2.h +6 -2
index 42481ab..94c31fb 100644
@@ -44,8 +44,10 @@
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
+#define CONFIG_FIT
+#define CONFIG_FIT_VERBOSE
 #define CONFIG_BOOTARGS			"Please use defined boot"
-#define CONFIG_BOOTCOMMAND		"run mmcboot"
+#define CONFIG_BOOTCOMMAND		"run autoboot"
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"
 
 #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_LOAD_ADDR \
@@ -96,7 +98,8 @@
 	""PARTS_ROOT" part 0 5;" \
 	""PARTS_DATA" part 0 6;" \
 	""PARTS_UMS" part 0 7;" \
-	"params.bin raw 0x38 0x8\0"
+	"params.bin raw 0x38 0x8;" \
+	"/Image.itb ext4 0 2\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootk=" \
@@ -153,6 +156,7 @@
 		   "setenv spl_imgsize;" \
 		   "setenv spl_imgaddr;" \
 		   "setenv spl_addr_tmp;\0" \
+	CONFIG_EXTRA_ENV_ITB \
 	"fdtaddr=40800000\0" \
 
 /* GPT */
Signature · 1 line
2.0.0.rc2
#4 lore raw

PATCH 3/3 config: exynos: trats2: Enable support for Image.itb at trats2 device

Quoted 8 lines · Lukasz Majewski

After this change it is possible to boot trats2 device with Image.itb, which facilitates automated testing, since only one file is necessary.

---
 include/configs/trats2.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

applied to u-boot-samsung.

Thanks,
Minkyu Kang.

#5 lore raw

PATCH 1/3 config: exynos: common: Provide env variables to support Image.itb

In reply to Lukasz Majewski
Quoted 10 lines · Lukasz Majewski

This change allows using Image.itb image format with Exynos4 devices (especially trats and trats2).
Such change facilitates automated testing since only one binary needs to be prepared.

---
 include/configs/exynos4-common.h | 54 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

applied to u-boot-samsung.

Thanks,
Minkyu Kang.