1669bbd6e5
- drop bringing in arm-boot-config on arm systems - build a highbank u-boot (intention is to use in qemu)
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
Index: u-boot-2013.04rc2/include/configs/origen.h
|
|
===================================================================
|
|
--- u-boot-2013.04rc2.orig/include/configs/origen.h
|
|
+++ u-boot-2013.04rc2/include/configs/origen.h
|
|
@@ -87,8 +87,11 @@
|
|
#define CONFIG_CMD_DHCP
|
|
#define CONFIG_CMD_MMC
|
|
#define CONFIG_CMD_FAT
|
|
+#define CONFIG_CMD_EXT2 /* EXT2 Support */
|
|
#undef CONFIG_CMD_NET
|
|
#undef CONFIG_CMD_NFS
|
|
+#define CONFIG_CMD_BOOTZ /* bootz zImage support */
|
|
+#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */
|
|
|
|
#define CONFIG_BOOTDELAY 3
|
|
#define CONFIG_ZERO_BOOTDELAY_CHECK
|
|
@@ -96,7 +99,35 @@
|
|
#define CONFIG_SPL
|
|
#define COPY_BL2_FNPTR_ADDR 0x02020030
|
|
|
|
-#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=ext2load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
|
|
+ "importbootenv=echo Importing environment from mmc ...; " \
|
|
+ "env import -t $loadaddr $filesize\0" \
|
|
+ "loadbootscript=ext2load 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;"
|
|
|
|
/* Miscellaneous configurable options */
|
|
#define CONFIG_SYS_LONGHELP /* undef to save memory */
|
|
|