Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2014-01-03 19:52:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-am335xevm.changes 2013-12-22 19:38:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-am335xevm.changes 2014-01-03 19:52:01.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + +------------------------------------------------------------------- u-boot-arndale.changes: same change u-boot-cubieboard.changes: same change u-boot-highbank.changes: same change u-boot-hyundaia7hd.changes: same change u-boot-melea1000.changes: same change u-boot-mx53loco.changes: same change u-boot-omap3beagle.changes: same change u-boot-omap4panda.changes: same change u-boot-origen.changes: same change u-boot-rpib.changes: same change u-boot.changes: same change New: ---- am335x_evm-bootscr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-am335xevm.spec ++++++ --- /var/tmp/diff_new_pack.giC7SE/_old 2014-01-03 19:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.giC7SE/_new 2014-01-03 19:52:03.000000000 +0100 @@ -42,6 +42,7 @@ Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2013.10-sunxi.patch +Patch9: am335x_evm-bootscr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 @@ -78,6 +79,7 @@ %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" am335x_evm_config ++++++ u-boot-arndale.spec ++++++ --- /var/tmp/diff_new_pack.giC7SE/_old 2014-01-03 19:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.giC7SE/_new 2014-01-03 19:52:03.000000000 +0100 @@ -42,6 +42,7 @@ Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2013.10-sunxi.patch +Patch9: am335x_evm-bootscr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 @@ -78,6 +79,7 @@ %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" arndale_config ++++++ u-boot-cubieboard.spec ++++++ --- /var/tmp/diff_new_pack.giC7SE/_old 2014-01-03 19:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.giC7SE/_new 2014-01-03 19:52:03.000000000 +0100 @@ -42,6 +42,7 @@ Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2013.10-sunxi.patch +Patch9: am335x_evm-bootscr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 @@ -78,6 +79,7 @@ %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" cubieboard_config ++++++ u-boot-highbank.spec ++++++ --- /var/tmp/diff_new_pack.giC7SE/_old 2014-01-03 19:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.giC7SE/_new 2014-01-03 19:52:03.000000000 +0100 @@ -42,6 +42,7 @@ Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2013.10-sunxi.patch +Patch9: am335x_evm-bootscr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 @@ -78,6 +79,7 @@ %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" highbank_config ++++++ u-boot-hyundaia7hd.spec ++++++ --- /var/tmp/diff_new_pack.giC7SE/_old 2014-01-03 19:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.giC7SE/_new 2014-01-03 19:52:03.000000000 +0100 @@ -42,6 +42,7 @@ Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2013.10-sunxi.patch +Patch9: am335x_evm-bootscr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 @@ -78,6 +79,7 @@ %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" hyundai_a7hd_config ++++++ u-boot-melea1000.spec ++++++ --- /var/tmp/diff_new_pack.giC7SE/_old 2014-01-03 19:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.giC7SE/_new 2014-01-03 19:52:03.000000000 +0100 @@ -42,6 +42,7 @@ Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2013.10-sunxi.patch +Patch9: am335x_evm-bootscr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 @@ -78,6 +79,7 @@ %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mele_a1000_config ++++++ u-boot-mx53loco.spec ++++++ --- /var/tmp/diff_new_pack.giC7SE/_old 2014-01-03 19:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.giC7SE/_new 2014-01-03 19:52:03.000000000 +0100 @@ -42,6 +42,7 @@ Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2013.10-sunxi.patch +Patch9: am335x_evm-bootscr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 @@ -78,6 +79,7 @@ %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx53loco_config ++++++ u-boot-omap3beagle.spec ++++++ --- /var/tmp/diff_new_pack.giC7SE/_old 2014-01-03 19:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.giC7SE/_new 2014-01-03 19:52:03.000000000 +0100 @@ -42,6 +42,7 @@ Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2013.10-sunxi.patch +Patch9: am335x_evm-bootscr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 @@ -78,6 +79,7 @@ %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_config ++++++ u-boot-omap4panda.spec ++++++ --- /var/tmp/diff_new_pack.giC7SE/_old 2014-01-03 19:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.giC7SE/_new 2014-01-03 19:52:03.000000000 +0100 @@ -42,6 +42,7 @@ Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2013.10-sunxi.patch +Patch9: am335x_evm-bootscr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 @@ -78,6 +79,7 @@ %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap4_panda_config ++++++ u-boot-origen.spec ++++++ --- /var/tmp/diff_new_pack.giC7SE/_old 2014-01-03 19:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.giC7SE/_new 2014-01-03 19:52:03.000000000 +0100 @@ -42,6 +42,7 @@ Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2013.10-sunxi.patch +Patch9: am335x_evm-bootscr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 @@ -78,6 +79,7 @@ %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" origen_config ++++++ u-boot-rpib.spec ++++++ --- /var/tmp/diff_new_pack.giC7SE/_old 2014-01-03 19:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.giC7SE/_new 2014-01-03 19:52:03.000000000 +0100 @@ -42,6 +42,7 @@ Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2013.10-sunxi.patch +Patch9: am335x_evm-bootscr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 @@ -78,6 +79,7 @@ %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" rpi_b_config ++++++ am335x_evm-bootscr.patch ++++++ Index: u-boot-2013.10/include/configs/am335x_evm.h =================================================================== --- u-boot-2013.10.orig/include/configs/am335x_evm.h +++ u-boot-2013.10/include/configs/am335x_evm.h @@ -97,6 +97,9 @@ "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ "ip=dhcp\0" \ "bootenv=uEnv.txt\0" \ + "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" \ "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ "importbootenv=echo Importing environment from mmc ...; " \ "env import -t $loadaddr $filesize\0" \ @@ -125,17 +128,21 @@ "mmcboot=mmc dev ${mmcdev}; " \ "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 loadimage; then " \ - "run mmcloados;" \ - "fi;" \ + "if run loadbootscript; then " \ + "run bootscript;" \ + "else " \ + "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 loadimage; then " \ + "run mmcloados;" \ + "fi;" \ + "fi ;" \ "fi;\0" \ "spiboot=echo Booting from spi ...; " \ "run spiargs; " \ ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.giC7SE/_old 2014-01-03 19:52:04.000000000 +0100 +++ /var/tmp/diff_new_pack.giC7SE/_new 2014-01-03 19:52:04.000000000 +0100 @@ -42,6 +42,7 @@ Patch6: origen-ext2.patch Patch7: arndale.patch Patch8: v2013.10-sunxi.patch +Patch9: am335x_evm-bootscr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: dtc >= 1.4.0 @@ -78,6 +79,7 @@ %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org