summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2014-04-24 18:21:53 -0500
committerDennis Gilmore <dennis@ausil.us>2014-04-25 17:08:12 -0500
commitf66618b23bc59f2a6374edd2611e88838dc6e854 (patch)
treec8d47ab6848e8420f78beba4dbea61578a99fef5
parent432b9a0f1fcd3ebff235755b9f26d996f36ce946 (diff)
downloadu-boot-f66618b23bc59f2a6374edd2611e88838dc6e854.tar.gz
u-boot-f66618b23bc59f2a6374edd2611e88838dc6e854.tar.xz
u-boot-f66618b23bc59f2a6374edd2611e88838dc6e854.zip
port over to generic bootcommands
-rw-r--r--include/configs/sunxi-common.h24
1 files changed, 19 insertions, 5 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 56a89b9daa..65f3244345 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -112,8 +112,26 @@
#define CONFIG_ENV_OFFSET (544 << 10) /* (8 + 24 + 512) KiB */
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
+#ifndef CONFIG_SPL_BUILD
+#include <config_distro_defaults.h>
+#include <config_distro_bootcmd.h>
+
+#define CONFIG_DEFAULT_FDT_FILE "sun7i-a20-cubietruck.dtb"
+
#define CONFIG_EXTRA_ENV_SETTINGS \
- "bootm_size=0x10000000\0"
+ "kernel_addr_r=0x42000000\0" \
+ "pxe_addr_r=0x4FE00000\0" \
+ "scriptaddr=0x4FF00000\0" \
+ "fdt_addr_r=0x50000000\0" \
+ "ramdisk_addr_r=0x51000000\0" \
+ "bootm_size=0x10000000\0" \
+ "console=ttyS0,115200\0" \
+ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+ BOOTCMDS_COMMON
+
+#define CONFIG_BOOTCOMMAND \
+ "for target in ${boot_targets}; do run bootcmd_${target}; done ;"
+#endif
#define CONFIG_SYS_BOOT_GET_CMDLINE
@@ -197,8 +215,4 @@
#define CONFIG_ENV_IS_NOWHERE
#endif
-#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
-#endif
-
#endif /* _SUNXI_COMMON_CONFIG_H */