Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2015-10-12 10:02:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot" Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot-a10-olinuxino-lime.changes 2015-10-08 08:25:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-a10-olinuxino-lime.changes 2015-10-12 10:02:12.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 8 09:27:15 UTC 2015 - guilla...@opensuse.org + +- Add boot script support to odroid board: + * 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch + * 0002-odroid-Add-boot-script-boot.scr-support.patch + +------------------------------------------------------------------- @@ -819,5 +825,0 @@ -- 2010.09-MeeGo -- Add Das u-boot package - FEA#9723 - -------------------------------------------------------------------- -Tue Oct 10 00:00:00 UTC 2010 - n...@ti.com> @@ -844,0 +847 @@ +Wed Mar 31 00:00:00 UTC 2010 - u-boot-a13-olinuxino.changes: same change u-boot-a13-olinuxinom.changes: same change u-boot-a20-olinuxino-lime.changes: same change u-boot-a20-olinuxino-lime2.changes: same change u-boot-a20-olinuxinomicro.changes: same change u-boot-am335xevm.changes: same change u-boot-arndale.changes: same change u-boot-bananapi.changes: same change u-boot-colibrit20.changes: same change u-boot-cubieboard.changes: same change u-boot-cubieboard2.changes: same change u-boot-cubietruck.changes: same change u-boot-firefly-rk3288.changes: same change u-boot-highbank.changes: same change u-boot-jetson-tk1.changes: same change u-boot-melea1000.changes: same change u-boot-merriia80optimus.changes: same change u-boot-mx53loco.changes: same change u-boot-mx6cuboxi.changes: same change u-boot-mx6qsabrelite.changes: same change u-boot-odroid-xu3.changes: same change u-boot-odroid.changes: same change u-boot-omap3beagle.changes: same change u-boot-omap4panda.changes: same change u-boot-paz00.changes: same change u-boot-pcm051rev3.changes: same change u-boot-rpi.changes: same change u-boot-rpi2.changes: same change u-boot-snow.changes: same change u-boot-spring.changes: same change u-boot.changes: same change New: ---- 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch 0002-odroid-Add-boot-script-boot.scr-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-a10-olinuxino-lime.spec ++++++ --- /var/tmp/diff_new_pack.y1BhvJ/_old 2015-10-12 10:02:18.000000000 +0200 +++ /var/tmp/diff_new_pack.y1BhvJ/_new 2015-10-12 10:02:18.000000000 +0200 @@ -37,6 +37,9 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc +# Odroid patches +Patch10: 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch +Patch11: 0002-odroid-Add-boot-script-boot.scr-support.patch # openSUSE fixes hopefully going upstream soon # https://www.mail-archive.com/u-boot@lists.denx.de/msg187126.html Patch50: arndale-apply-cortex-a15-erratas.patch @@ -68,6 +71,8 @@ %prep %setup -q -n u-boot-%{archive_version} +%patch10 -p1 +%patch11 -p1 %patch50 -p1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell u-boot-a13-olinuxino.spec: same change u-boot-a13-olinuxinom.spec: same change u-boot-a20-olinuxino-lime.spec: same change u-boot-a20-olinuxino-lime2.spec: same change u-boot-a20-olinuxinomicro.spec: same change u-boot-am335xevm.spec: same change u-boot-arndale.spec: same change u-boot-bananapi.spec: same change u-boot-colibrit20.spec: same change u-boot-cubieboard.spec: same change u-boot-cubieboard2.spec: same change u-boot-cubietruck.spec: same change u-boot-firefly-rk3288.spec: same change u-boot-highbank.spec: same change u-boot-jetson-tk1.spec: same change u-boot-melea1000.spec: same change u-boot-merriia80optimus.spec: same change u-boot-mx53loco.spec: same change u-boot-mx6cuboxi.spec: same change u-boot-mx6qsabrelite.spec: same change u-boot-odroid-xu3.spec: same change u-boot-odroid.spec: same change u-boot-omap3beagle.spec: same change u-boot-omap4panda.spec: same change u-boot-paz00.spec: same change u-boot-pcm051rev3.spec: same change u-boot-rpi.spec: same change u-boot-rpi2.spec: same change u-boot-snow.spec: same change u-boot-spring.spec: same change ++++++ 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch ++++++ >From 33cb0de4447c395229ad381222ad95e18889608e Mon Sep 17 00:00:00 2001 From: Guillaume GARDET <guillaume.gar...@free.fr> Date: Mon, 28 Sep 2015 11:13:07 +0200 Subject: [PATCH V2 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Replace 'fatload' command by 'load', to be able to use EXT* partitions while keeping FAT partition compatibility. Signed-off-by: Guillaume GARDET <guillaume.gar...@free.fr> Cc: Przemyslaw Marczak <p.marc...@samsung.com> Cc: Minkyu Kang <mk7.k...@samsung.com> --- include/configs/odroid.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 1afe04a..e45b00e 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -108,11 +108,11 @@ * 2. ROOT: - */ #define CONFIG_EXTRA_ENV_SETTINGS \ - "loadkernel=fatload mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \ + "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \ "${kernelname}\0" \ - "loadinitrd=fatload mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \ + "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \ "${initrdname}\0" \ - "loaddtb=fatload mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} " \ + "loaddtb=load mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} " \ "${fdtfile}\0" \ "check_ramdisk=" \ "if run loadinitrd; then " \ -- 1.8.4.5 ++++++ 0002-odroid-Add-boot-script-boot.scr-support.patch ++++++ >From 5053f7767e3a0dae83cd8aa85cfeeaf5fd1bc569 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET <guillaume.gar...@free.fr> Date: Mon, 5 Oct 2015 10:59:32 +0200 Subject: [PATCH V2 2/2] odroid: Add boot script (boot.scr) support Add boot script (boot.scr) support. If no boot script are found, it boots as usual. Signed-off-by: Guillaume GARDET <guillaume.gar...@free.fr> Cc: Przemyslaw Marczak <p.marc...@samsung.com> Cc: Minkyu Kang <mk7.k...@samsung.com> --- include/configs/odroid.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index e45b00e..f79847b 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -108,6 +108,8 @@ * 2. ROOT: - */ #define CONFIG_EXTRA_ENV_SETTINGS \ + "loadbootscript=load mmc ${mmcbootdev}:${mmcbootpart} ${scriptaddr} " \ + "boot.scr\0" \ "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \ "${kernelname}\0" \ "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \ @@ -129,6 +131,9 @@ "kernel_args=" \ "setenv bootargs root=/dev/mmcblk${mmcrootdev}p${mmcrootpart}" \ " rootwait ${console} ${opts}\0" \ + "boot_script=" \ + "run loadbootscript;" \ + "source ${scriptaddr}\0" \ "boot_fit=" \ "setenv kerneladdr 0x42000000;" \ "setenv kernelname Image.itb;" \ @@ -152,6 +157,9 @@ "run kernel_args;" \ "bootz ${kerneladdr} ${initrd_addr} ${fdt_addr};\0" \ "autoboot=" \ + "if test -e mmc 0 boot.scr; then; " \ + "run boot_script; " \ + "fi; " \ "if test -e mmc 0 Image.itb; then; " \ "run boot_fit;" \ "elif test -e mmc 0 zImage; then; " \ @@ -171,6 +179,7 @@ "consoleoff=set console console=ram; save; reset\0" \ "initrdname=uInitrd\0" \ "initrdaddr=42000000\0" \ + "scriptaddr=0x42000000\0" \ "fdtaddr=40800000\0" /* I2C */ -- 1.8.4.5 ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.y1BhvJ/_old 2015-10-12 10:02:19.000000000 +0200 +++ /var/tmp/diff_new_pack.y1BhvJ/_new 2015-10-12 10:02:19.000000000 +0200 @@ -37,6 +37,9 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc +# Odroid patches +Patch10: 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch +Patch11: 0002-odroid-Add-boot-script-boot.scr-support.patch # openSUSE fixes hopefully going upstream soon # https://www.mail-archive.com/u-boot@lists.denx.de/msg187126.html Patch50: arndale-apply-cortex-a15-erratas.patch @@ -68,6 +71,8 @@ %prep %setup -q -n u-boot-%{archive_version} +%patch10 -p1 +%patch11 -p1 %patch50 -p1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell