ORIGEN: Enhance origen config to be more flexible on boot.

This patch enhances the boot of origen board by adding support to ext2, bootz, initrd, bootenv loading and boot script. It still keeps the previous mmc load command if boot script fails. Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

ORIGEN: Enhance origen config to be more flexible on boot.
This patch enhances the boot of origen board by adding support to ext2, bootz, initrd, bootenv loading and boot script. It still keeps the previous mmc load command if boot script fails. Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Guillaume GARDET · Minkyu Kang
1 parent df96337a53
Showing 1 changed file with 34 additions and 1 deletions Side-by-side Diff
include/configs/origen.h
@@ -56,6 +56,10 @@
 #undef CONFIG_CMD_PING
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_DHCP
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
  
@@ -63,7 +67,36 @@
 #define COPY_BL2_FNPTR_ADDR	0x02020030
 #define CONFIG_SPL_TEXT_BASE	0x02021410
  
-#define CONFIG_BOOTCOMMAND	"fatload mmc 0 40007000 uImage; bootm 40007000"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"loadaddr=0x40007000\0" \
+	"rdaddr=0x48000000\0" \
+	"kerneladdr=0x40007000\0" \
+	"ramdiskaddr=0x48000000\0" \
+	"console=ttySAC2,115200n8\0" \
+	"mmcdev=0\0" \
+	"bootenv=uEnv.txt\0" \
+	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+	"importbootenv=echo Importing environment from mmc ...; " \
+		"env import -t $loadaddr $filesize\0" \
+        "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+        "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+                "source ${loadaddr}\0"
+#define CONFIG_BOOTCOMMAND \
+	"if mmc rescan; then " \
+		"echo SD/MMC found on device ${mmcdev};" \
+		"if run loadbootenv; then " \
+			"echo Loaded environment from ${bootenv};" \
+			"run importbootenv;" \
+		"fi;" \
+		"if test -n $uenvcmd; then " \
+			"echo Running uenvcmd ...;" \
+			"run uenvcmd;" \
+		"fi;" \
+		"if run loadbootscript; then " \
+			"run bootscript; " \
+		"fi; " \
+	"fi;" \
+	"load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} "
  
 #define CONFIG_IDENT_STRING		" for ORIGEN"
...	...	@@ -56,6 +56,10 @@
56	56	#undef CONFIG_CMD_PING
57	57	#define CONFIG_CMD_ELF
58	58	#define CONFIG_CMD_DHCP
	59	+#define CONFIG_CMD_EXT2
	60	+#define CONFIG_CMD_FS_GENERIC
	61	+#define CONFIG_CMD_BOOTZ
	62	+#define CONFIG_SUPPORT_RAW_INITRD
59	63	#undef CONFIG_CMD_NET
60	64	#undef CONFIG_CMD_NFS
61	65
...	...	@@ -63,7 +67,36 @@
63	67	#define COPY_BL2_FNPTR_ADDR 0x02020030
64	68	#define CONFIG_SPL_TEXT_BASE 0x02021410
65	69
66		-#define CONFIG_BOOTCOMMAND "fatload mmc 0 40007000 uImage; bootm 40007000"
	70	+#define CONFIG_EXTRA_ENV_SETTINGS \
	71	+ "loadaddr=0x40007000\0" \
	72	+ "rdaddr=0x48000000\0" \
	73	+ "kerneladdr=0x40007000\0" \
	74	+ "ramdiskaddr=0x48000000\0" \
	75	+ "console=ttySAC2,115200n8\0" \
	76	+ "mmcdev=0\0" \
	77	+ "bootenv=uEnv.txt\0" \
	78	+ "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
	79	+ "importbootenv=echo Importing environment from mmc ...; " \
	80	+ "env import -t $loadaddr $filesize\0" \
	81	+ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
	82	+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
	83	+ "source ${loadaddr}\0"
	84	+#define CONFIG_BOOTCOMMAND \
	85	+ "if mmc rescan; then " \
	86	+ "echo SD/MMC found on device ${mmcdev};" \
	87	+ "if run loadbootenv; then " \
	88	+ "echo Loaded environment from ${bootenv};" \
	89	+ "run importbootenv;" \
	90	+ "fi;" \
	91	+ "if test -n $uenvcmd; then " \
	92	+ "echo Running uenvcmd ...;" \
	93	+ "run uenvcmd;" \
	94	+ "fi;" \
	95	+ "if run loadbootscript; then " \
	96	+ "run bootscript; " \
	97	+ "fi; " \
	98	+ "fi;" \
	99	+ "load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} "
67	100
68	101	#define CONFIG_IDENT_STRING " for ORIGEN"
69	102