forked from pool/u-boot
9a7b58c834
- Remove old unused patches: * v2013.04-sunxi.patch * loadaddr-defaults.patch - Add ti_common_initrd_support.patch to enable initrd support for AM335x boards - Add am335x_evm support which includes: Beagle Bone, Beagle Bone Black, TI AM335x EVM, TI AM335x EVM-SK - Add Arndale support - Update v2013.04-sunxi.patch to v2013.10-sunxi.patch - Remove kerneladdr and ramdiskaddr definition in u-boot patches (now done in JeOS image with u-boot hooks) - Update patches to current version: * 0006-ARMV7-hardfp-build-fix.patch * beagle-bootscr.patch * mx53loco-bootscr.patch * mlo-ext2.patch - Merge fix_omap4_ext2_boot.patch in mlo-ext2.patch - Rename exynos-ext2.patch in origen-ext2.patch - Update to 2013.10 - Fix OMAP4 pandaboard EXT2 boot - Remove old unused patches: * v2013.04-sunxi.patch OBS-URL: https://build.opensuse.org/request/show/211599 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=16
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
--- include/configs/origen.h.orig 2013-10-16 19:08:12.000000000 +0200
|
|
+++ include/configs/origen.h 2013-11-21 15:57:25.724045492 +0100
|
|
@@ -74,8 +74,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
|
|
@@ -85,7 +88,35 @@
|
|
|
|
#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=ext2load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
|
|
+ "importbootenv=echo Importing environment from mmc ...; " \
|
|
+ "env import -t $loadaddr $filesize\0" \
|
|
+ "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot/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 */
|