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
30 lines
1007 B
Diff
30 lines
1007 B
Diff
--- include/configs/omap3_beagle.h.orig 2013-11-21 15:44:37.041667288 +0100
|
|
+++ include/configs/omap3_beagle.h 2013-11-21 15:47:25.589580653 +0100
|
|
@@ -264,6 +264,9 @@
|
|
"rootfstype=${ramrootfstype}\0" \
|
|
"loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \
|
|
"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
|
|
+ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \
|
|
+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
|
|
+ "source ${loadaddr}\0" \
|
|
"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
|
|
"mmcboot=echo Booting from mmc ...; " \
|
|
"run mmcargs; " \
|
|
@@ -300,9 +303,13 @@
|
|
"echo Running uenvcmd ...;" \
|
|
"run uenvcmd;" \
|
|
"fi;" \
|
|
- "if run loadimage; then " \
|
|
- "run mmcboot;" \
|
|
- "fi;" \
|
|
+ "if run loadbootscript; then " \
|
|
+ "run bootscript; " \
|
|
+ "else " \
|
|
+ "if run loadimage; then " \
|
|
+ "run mmcboot;" \
|
|
+ "fi;" \
|
|
+ "fi; " \
|
|
"fi;" \
|
|
"run nandboot;" \
|
|
"setenv bootfile zImage;" \
|