From effb499486581a8948e729e8d9d63be2d01c33d668a92cf826c2ad4f33363a15 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 3 Jan 2014 18:52:00 +0000 Subject: [PATCH] Accepting request 212485 from Base:System (forwarded request 212475 from matwey) OBS-URL: https://build.opensuse.org/request/show/212485 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=17 --- am335x_evm-bootscr.patch | 47 ++++++++++++++++++++++++++++++++++++++ u-boot-am335xevm.changes | 6 +++++ u-boot-am335xevm.spec | 2 ++ u-boot-arndale.changes | 6 +++++ u-boot-arndale.spec | 2 ++ u-boot-cubieboard.changes | 6 +++++ u-boot-cubieboard.spec | 2 ++ u-boot-highbank.changes | 6 +++++ u-boot-highbank.spec | 2 ++ u-boot-hyundaia7hd.changes | 6 +++++ u-boot-hyundaia7hd.spec | 2 ++ u-boot-melea1000.changes | 6 +++++ u-boot-melea1000.spec | 2 ++ u-boot-mx53loco.changes | 6 +++++ u-boot-mx53loco.spec | 2 ++ u-boot-omap3beagle.changes | 6 +++++ u-boot-omap3beagle.spec | 2 ++ u-boot-omap4panda.changes | 6 +++++ u-boot-omap4panda.spec | 2 ++ u-boot-origen.changes | 6 +++++ u-boot-origen.spec | 2 ++ u-boot-rpib.changes | 6 +++++ u-boot-rpib.spec | 2 ++ u-boot.changes | 6 +++++ u-boot.spec.in | 2 ++ 25 files changed, 143 insertions(+) create mode 100644 am335x_evm-bootscr.patch diff --git a/am335x_evm-bootscr.patch b/am335x_evm-bootscr.patch new file mode 100644 index 0000000..08a1b63 --- /dev/null +++ b/am335x_evm-bootscr.patch @@ -0,0 +1,47 @@ +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; " \ diff --git a/u-boot-am335xevm.changes b/u-boot-am335xevm.changes index f3ed38e..6a44a3e 100644 --- a/u-boot-am335xevm.changes +++ b/u-boot-am335xevm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + ------------------------------------------------------------------- Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org diff --git a/u-boot-am335xevm.spec b/u-boot-am335xevm.spec index 227cb20..cf69b76 100644 --- a/u-boot-am335xevm.spec +++ b/u-boot-am335xevm.spec @@ -42,6 +42,7 @@ Patch5: mx53loco-bootscr.patch 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 @@ rm -rf board/Marvell %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" am335x_evm_config diff --git a/u-boot-arndale.changes b/u-boot-arndale.changes index f3ed38e..6a44a3e 100644 --- a/u-boot-arndale.changes +++ b/u-boot-arndale.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + ------------------------------------------------------------------- Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org diff --git a/u-boot-arndale.spec b/u-boot-arndale.spec index 1432d2d..a81c1b3 100644 --- a/u-boot-arndale.spec +++ b/u-boot-arndale.spec @@ -42,6 +42,7 @@ Patch5: mx53loco-bootscr.patch 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 @@ rm -rf board/Marvell %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" arndale_config diff --git a/u-boot-cubieboard.changes b/u-boot-cubieboard.changes index f3ed38e..6a44a3e 100644 --- a/u-boot-cubieboard.changes +++ b/u-boot-cubieboard.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + ------------------------------------------------------------------- Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org diff --git a/u-boot-cubieboard.spec b/u-boot-cubieboard.spec index ea8c2ce..d981a2b 100644 --- a/u-boot-cubieboard.spec +++ b/u-boot-cubieboard.spec @@ -42,6 +42,7 @@ Patch5: mx53loco-bootscr.patch 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 @@ rm -rf board/Marvell %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" cubieboard_config diff --git a/u-boot-highbank.changes b/u-boot-highbank.changes index f3ed38e..6a44a3e 100644 --- a/u-boot-highbank.changes +++ b/u-boot-highbank.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + ------------------------------------------------------------------- Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org diff --git a/u-boot-highbank.spec b/u-boot-highbank.spec index 0a230ba..a70dfa3 100644 --- a/u-boot-highbank.spec +++ b/u-boot-highbank.spec @@ -42,6 +42,7 @@ Patch5: mx53loco-bootscr.patch 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 @@ rm -rf board/Marvell %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" highbank_config diff --git a/u-boot-hyundaia7hd.changes b/u-boot-hyundaia7hd.changes index f3ed38e..6a44a3e 100644 --- a/u-boot-hyundaia7hd.changes +++ b/u-boot-hyundaia7hd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + ------------------------------------------------------------------- Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org diff --git a/u-boot-hyundaia7hd.spec b/u-boot-hyundaia7hd.spec index c014aa2..94b6d74 100644 --- a/u-boot-hyundaia7hd.spec +++ b/u-boot-hyundaia7hd.spec @@ -42,6 +42,7 @@ Patch5: mx53loco-bootscr.patch 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 @@ rm -rf board/Marvell %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" hyundai_a7hd_config diff --git a/u-boot-melea1000.changes b/u-boot-melea1000.changes index f3ed38e..6a44a3e 100644 --- a/u-boot-melea1000.changes +++ b/u-boot-melea1000.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + ------------------------------------------------------------------- Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org diff --git a/u-boot-melea1000.spec b/u-boot-melea1000.spec index 6b26193..a7bec81 100644 --- a/u-boot-melea1000.spec +++ b/u-boot-melea1000.spec @@ -42,6 +42,7 @@ Patch5: mx53loco-bootscr.patch 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 @@ rm -rf board/Marvell %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mele_a1000_config diff --git a/u-boot-mx53loco.changes b/u-boot-mx53loco.changes index f3ed38e..6a44a3e 100644 --- a/u-boot-mx53loco.changes +++ b/u-boot-mx53loco.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + ------------------------------------------------------------------- Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org diff --git a/u-boot-mx53loco.spec b/u-boot-mx53loco.spec index 7c82af7..53907d8 100644 --- a/u-boot-mx53loco.spec +++ b/u-boot-mx53loco.spec @@ -42,6 +42,7 @@ Patch5: mx53loco-bootscr.patch 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 @@ rm -rf board/Marvell %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx53loco_config diff --git a/u-boot-omap3beagle.changes b/u-boot-omap3beagle.changes index f3ed38e..6a44a3e 100644 --- a/u-boot-omap3beagle.changes +++ b/u-boot-omap3beagle.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + ------------------------------------------------------------------- Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org diff --git a/u-boot-omap3beagle.spec b/u-boot-omap3beagle.spec index 2398679..1beab2e 100644 --- a/u-boot-omap3beagle.spec +++ b/u-boot-omap3beagle.spec @@ -42,6 +42,7 @@ Patch5: mx53loco-bootscr.patch 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 @@ rm -rf board/Marvell %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_config diff --git a/u-boot-omap4panda.changes b/u-boot-omap4panda.changes index f3ed38e..6a44a3e 100644 --- a/u-boot-omap4panda.changes +++ b/u-boot-omap4panda.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + ------------------------------------------------------------------- Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org diff --git a/u-boot-omap4panda.spec b/u-boot-omap4panda.spec index d57c6ee..bdd8041 100644 --- a/u-boot-omap4panda.spec +++ b/u-boot-omap4panda.spec @@ -42,6 +42,7 @@ Patch5: mx53loco-bootscr.patch 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 @@ rm -rf board/Marvell %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap4_panda_config diff --git a/u-boot-origen.changes b/u-boot-origen.changes index f3ed38e..6a44a3e 100644 --- a/u-boot-origen.changes +++ b/u-boot-origen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + ------------------------------------------------------------------- Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org diff --git a/u-boot-origen.spec b/u-boot-origen.spec index b4d2ef0..f4dbded 100644 --- a/u-boot-origen.spec +++ b/u-boot-origen.spec @@ -42,6 +42,7 @@ Patch5: mx53loco-bootscr.patch 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 @@ rm -rf board/Marvell %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" origen_config diff --git a/u-boot-rpib.changes b/u-boot-rpib.changes index f3ed38e..6a44a3e 100644 --- a/u-boot-rpib.changes +++ b/u-boot-rpib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + ------------------------------------------------------------------- Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org diff --git a/u-boot-rpib.spec b/u-boot-rpib.spec index 3fafd37..5424a51 100644 --- a/u-boot-rpib.spec +++ b/u-boot-rpib.spec @@ -42,6 +42,7 @@ Patch5: mx53loco-bootscr.patch 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 @@ rm -rf board/Marvell %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" rpi_b_config diff --git a/u-boot.changes b/u-boot.changes index f3ed38e..6a44a3e 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com + +- Add am335x_evm-bootscr.patch: Add bootscr to AM335x + platform based devices + ------------------------------------------------------------------- Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org diff --git a/u-boot.spec.in b/u-boot.spec.in index 3a9fb98..084444c 100644 --- a/u-boot.spec.in +++ b/u-boot.spec.in @@ -42,6 +42,7 @@ Patch5: mx53loco-bootscr.patch 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 @@ rm -rf board/Marvell %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG