Accepting request 199000 from Base:System

Fix u-boot.bin and boot.scr place since they are now in boot/ folder. (forwarded request 198925 from Guillaume_G)

OBS-URL: https://build.opensuse.org/request/show/199000
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=14
This commit is contained in:
Tomáš Chvátal 2013-09-14 18:31:35 +00:00 committed by Git OBS Bridge
parent 2ab1f2309e
commit e1ab7b92b5
14 changed files with 55 additions and 5 deletions

View File

@ -13,7 +13,7 @@ Index: u-boot-2013.04rc2/include/configs/omap3_beagle.h
"loadramdisk=ext2load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
"loaduimagefat=ext2load mmc ${mmcdev} ${loadaddr} uImage\0" \
"loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \
+ "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+ "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \
+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ "source ${loadaddr}\0" \
"mmcboot=echo Booting from mmc ...; " \

View File

@ -30,7 +30,7 @@ Index: u-boot-2013.04rc2/include/configs/origen.h
+ "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" \
+ "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \
+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ "source ${loadaddr}\0"
+#define CONFIG_BOOTCOMMAND \

View File

@ -36,7 +36,7 @@ Index: u-boot-2013.04/drivers/mmc/spl_mmc.c
+ }
+
+
+ payloadname = "u-boot.bin";
+ payloadname = "boot/u-boot.bin";
+
+ filelen = err = ext4fs_open(payloadname);
+ if (err < 0) {
@ -121,7 +121,7 @@ Index: u-boot-2013.04/include/configs/omap4_common.h
"root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
- "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+ "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+ "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \
"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
"source ${loadaddr}\0" \
- "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org
- Fix u-boot.bin and boot.scr place since they are now in boot/ folder.
-------------------------------------------------------------------
Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org
- Fix u-boot.bin and boot.scr place since they are now in boot/ folder.
-------------------------------------------------------------------
Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org
- Fix u-boot.bin and boot.scr place since they are now in boot/ folder.
-------------------------------------------------------------------
Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org
- Fix u-boot.bin and boot.scr place since they are now in boot/ folder.
-------------------------------------------------------------------
Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org
- Fix u-boot.bin and boot.scr place since they are now in boot/ folder.
-------------------------------------------------------------------
Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org
- Fix u-boot.bin and boot.scr place since they are now in boot/ folder.
-------------------------------------------------------------------
Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org
- Fix u-boot.bin and boot.scr place since they are now in boot/ folder.
-------------------------------------------------------------------
Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org
- Fix u-boot.bin and boot.scr place since they are now in boot/ folder.
-------------------------------------------------------------------
Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org
- Fix u-boot.bin and boot.scr place since they are now in boot/ folder.
-------------------------------------------------------------------
Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org
- Fix u-boot.bin and boot.scr place since they are now in boot/ folder.
-------------------------------------------------------------------
Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com

View File

@ -5540,7 +5540,7 @@ Index: include/configs/sunxi-common.h
+ " loglevel=${loglevel} ${panicarg} ${extraargs}\0" \
+ "kernel=uImage\0" \
+ "bootenv=uEnv.txt\0" \
+ "bootscr=boot.scr\0" \
+ "bootscr=boot/boot.scr\0" \
+ "loadbootscr=fatload mmc 0 $scriptaddr ${bootscr} ||" \
+ " ext2load mmc 0 $scriptaddr ${bootscr} ||" \
+ " ext2load mmc 0 $scriptaddr boot/${bootscr}\0" \