Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2014-09-08 21:29:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-08-01 07:08:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-am335xevm.changes 2014-09-08 21:30:36.000000000 +0200 @@ -1,0 +2,41 @@ +Mon Sep 8 13:06:52 UTC 2014 - guilla...@opensuse.org + +- Drop Hyundai_a7hd and cubox-i boards (now handle in Contrib repos +since it is not upstreamed), so drop related patches: + * v2014.04-sunxi.patch + * cubox-i-v2014.04-port.patch + * cubox-i-enable_raw_rd.patch + +------------------------------------------------------------------- +Wed Sep 3 12:02:22 UTC 2014 - guilla...@opensuse.org + +- Update to version 2014.10-rc2 +- drop upstreamed patch rpi_b-bootscr.patch +- drop fix_spl_build_for_am335x.patch (does build without it) +- Refresh patches: + * drop-marvell.patch + * fix_snow_config.patch + +------------------------------------------------------------------- +Thu Aug 21 08:50:10 UTC 2014 - guilla...@opensuse.org + +- Update SPL EXT fs support: + * For omap boards (beagle and panda), SPL now looks for u-boot.img + as upstream instead of u-boot.bin + * Remove mlo-ext2.patch to make proper patches in +order to ease upstreaming our EXT fs SPL functions + * Add panda-bootscr.patch to fix panda boot (was included in + mlo-ext2.patch) + * Add fix_omap_boot_mode.patch to fix beagle and panda boot mode + (was included in mlo-ext2.patch) + * Add add_spl_extfs_support.patch to get proper SPL EXT fs functions + * Add enable_spl_ext_support_for_ti_armv7.patch to enable SPL EXT fs + support for TI ARMv7 boards + + +------------------------------------------------------------------- +Tue Aug 19 17:35:22 UTC 2014 - matwey.korni...@gmail.com + +- Update to version 2014.10-rc1 and update patches + +------------------------------------------------------------------- u-boot-arndale.changes: same change u-boot-colibrit20iris.changes: same change u-boot-cubieboard.changes: same change u-boot-cubieboard2.changes: same change u-boot-cubietruck.changes: same change u-boot-highbank.changes: same change u-boot-melea1000.changes: same change u-boot-mx53loco.changes: same change u-boot-mx6qsabrelite.changes: same change u-boot-omap3beagle.changes: same change u-boot-omap4panda.changes: same change u-boot-paz00.changes: same change u-boot-rpib.changes: same change u-boot-snow.changes: same change u-boot-vexpressaemv8a.changes: same change u-boot.changes: same change Old: ---- cubox-i-enable_raw_rd.patch cubox-i-v2014.04-port.patch fix_spl_build_for_am335x.patch mlo-ext2.patch openSUSE_panda.txt rpi_b-bootscr.patch u-boot-2014.04.tar.bz2 u-boot-hyundaia7hd.changes u-boot-hyundaia7hd.spec u-boot-mx6cubox-i.changes u-boot-mx6cubox-i.spec v2014.04-sunxi.patch New: ---- add_spl_extfs_support.patch drop-marvell.patch enable_spl_ext_support_for_ti_armv7.patch fix_omap_boot_mode.patch panda-bootscr.patch u-boot-2014.10-rc2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-am335xevm.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-am335xevm -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the am335xevm arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" am335x_evm_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" am335x_evm_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -117,15 +112,15 @@ %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin +install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then - install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin -elif [ -f u-boot-dtb.bin ]; then - install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot-dtb-tegra.img %{buildroot}/boot/u-boot.img +elif [ -f u-boot-dtb.img ]; then + install -D -m 0644 u-boot-dtb.img %{buildroot}/boot/u-boot.img else - install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img fi %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-arndale.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-arndale -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the arndale arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" arndale_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" arndale_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-colibrit20iris.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-colibrit20iris -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the colibrit20iris arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" colibri_t20_iris_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" colibri_t20_iris_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-cubieboard.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-cubieboard -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the cubieboard arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubieboard_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubieboard_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-cubieboard2.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-cubieboard2 -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the cubieboard2 arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubieboard2_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubieboard2_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-cubietruck.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-cubietruck -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the cubietruck arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubietruck_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubietruck_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-highbank.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-highbank -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the highbank arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" highbank_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" highbank_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-melea1000.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-melea1000 -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the melea1000 arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Mele_A1000_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Mele_A1000_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-mx53loco.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-mx53loco -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the mx53loco arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx53loco_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx53loco_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-mx6qsabrelite.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-mx6qsabrelite -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the mx6qsabrelite arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx6qsabrelite_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx6qsabrelite_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-omap3beagle.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:42.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-omap3beagle -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the omap3beagle arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -117,15 +112,15 @@ %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin +install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then - install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin -elif [ -f u-boot-dtb.bin ]; then - install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot-dtb-tegra.img %{buildroot}/boot/u-boot.img +elif [ -f u-boot-dtb.img ]; then + install -D -m 0644 u-boot-dtb.img %{buildroot}/boot/u-boot.img else - install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img fi %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-omap4panda.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-omap4panda -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the omap4panda arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap4_panda_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap4_panda_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -117,15 +112,15 @@ %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin +install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then - install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin -elif [ -f u-boot-dtb.bin ]; then - install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot-dtb-tegra.img %{buildroot}/boot/u-boot.img +elif [ -f u-boot-dtb.img ]; then + install -D -m 0644 u-boot-dtb.img %{buildroot}/boot/u-boot.img else - install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img fi %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-paz00.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-paz00 -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the paz00 arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" paz00_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" paz00_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-rpib.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-rpib -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the rpib arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" rpi_b_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" rpi_b_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-snow.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-snow -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the snow arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" snow_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" snow_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot-vexpressaemv8a.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl 0 Name: u-boot-vexpressaemv8a -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the vexpressaemv8a arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,38 +76,32 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build -make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" vexpress_aemv8a_config +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" vexpress_aemv8a_defconfig # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog ++++++ u-boot.spec ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -19,13 +19,16 @@ Name: u-boot -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: Tools for the u-boot Firmware License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: u-boot-%{version}.tar.bz2 +#Source: u-boot-%{version}.tar.bz2 +Source: u-boot-2014.10-rc2.tar.bz2 +BuildRequires: libopenssl-devel +BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,9 +47,13 @@ mkimage- a tool that creates kernel bootable images for u-boot. %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 %build +# needed for include/config/auto.conf +make defconfig +make silentoldconfig make USE_PRIVATE_LIBGG=yes tools-only %install ++++++ add_spl_extfs_support.patch ++++++ --- ./include/spl.h.orig 2014-08-21 09:49:13.104157699 +0200 +++ ./include/spl.h 2014-08-21 09:49:55.343156204 +0200 @@ -72,6 +72,10 @@ void spl_sata_load_image(void); int spl_load_image_fat(block_dev_desc_t *block_dev, int partition, const char *filename); int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition); +/* SPL EXT image functions */ +int spl_load_image_ext(block_dev_desc_t *block_dev, int partition, const char *filename); +int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition); + #ifdef CONFIG_SPL_BOARD_INIT void spl_board_init(void); #endif --- ./common/spl/Makefile.orig 2014-08-21 09:55:50.011143645 +0200 +++ ./common/spl/Makefile 2014-08-21 09:56:05.061143112 +0200 @@ -18,5 +18,6 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += spl_net obj-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.o +obj-$(CONFIG_SPL_EXT_SUPPORT) += spl_ext.o obj-$(CONFIG_SPL_SATA_SUPPORT) += spl_sata.o endif --- ./fs/Makefile.orig 2014-08-21 09:58:00.612139021 +0200 +++ ./fs/Makefile 2014-08-21 09:58:15.603138490 +0200 @@ -8,6 +8,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/ +obj-$(CONFIG_SPL_EXT_SUPPORT) += ext4/ else obj-y += fs.o --- /dev/null 2014-08-21 08:33:45.854318006 +0200 +++ common/spl/spl_ext.c 2014-08-21 10:26:03.376079435 +0200 @@ -0,0 +1,139 @@ +/* + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <spl.h> +#include <asm/u-boot.h> +#include <ext4fs.h> +#include <image.h> + +#ifdef CONFIG_SPL_EXT_SUPPORT +int spl_load_image_ext(block_dev_desc_t *block_dev, + int partition, + const char *filename) +{ + s32 err; + struct image_header *header; + int filelen; + disk_partition_t part_info = {}; + + header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - + sizeof(struct image_header)); + + if (get_partition_info(block_dev, + partition, &part_info)) { + printf("spl: no partition table found\n"); + goto end; + } + + ext4fs_set_blk_dev(block_dev, &part_info); + + err = ext4fs_mount(0); + if (!err) { +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT + printf("%s: ext4fs mount err - %d\n", __func__, err); +#endif + goto end; + } + + filelen = err = ext4fs_open(filename); + if (err < 0) { + puts("spl: ext4fs_open failed\n"); + goto end; + } + err = ext4fs_read((u8 *)header, sizeof(struct image_header)); + if (err <= 0) { + puts("spl: ext4fs_read failed\n"); + goto end; + } + + spl_parse_image_header(header); + + err = ext4fs_read((u8 *)spl_image.load_addr, filelen); + +end: +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT + if (err <= 0) + printf("%s: error reading image %s, err - %d\n", + __func__, filename, err); +#endif + + return (err <= 0); +} + +#ifdef CONFIG_SPL_OS_BOOT +int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition) +{ + int err; + int filelen; + disk_partition_t part_info = {}; + __maybe_unused char *file; + + if (get_partition_info(block_dev, + partition, &part_info)) { + printf("spl: no partition table found\n"); + return -1; + } + + ext4fs_set_blk_dev(block_dev, &part_info); + + err = ext4fs_mount(0); + if (!err) { +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT + printf("%s: ext4fs mount err - %d\n", __func__, err); +#endif + return -1; + } + +#if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT) + file = getenv("falcon_args_file"); + if (file) { + filelen = err = ext4fs_open(file); + if (err < 0) { + puts("spl: ext4fs_open failed\n"); + goto defaults; + } + err = ext4fs_read( (void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen); + if (err <= 0) { + printf("spl: error reading image %s, err - %d, falling back to default\n", + file, err); + goto defaults; + } + file = getenv("falcon_image_file"); + if (file) { + err = spl_load_image_ext(block_dev, partition, file); + if (err != 0) { + puts("spl: falling back to default\n"); + goto defaults; + } + + return 0; + } else + puts("spl: falcon_image_file not set in environment, falling back to default\n"); + } else + puts("spl: falcon_args_file not set in environment, falling back to default\n"); + +defaults: +#endif + + filelen = err = ext4fs_open(CONFIG_SPL_FAT_LOAD_ARGS_NAME); + if (err < 0) { + puts("spl: ext4fs_open failed\n"); + //goto defaults; + } + err = ext4fs_read( (void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen); + if (err <= 0) { +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT + printf("%s: error reading image %s, err - %d\n", + __func__, CONFIG_SPL_FAT_LOAD_ARGS_NAME, err); +#endif + return -1; + } + + return spl_load_image_ext(block_dev, partition, + CONFIG_SPL_FAT_LOAD_KERNEL_NAME); +} +#endif +#endif + --- common/spl/spl_mmc.c.orig 2014-08-06 15:12:58.000000000 +0200 +++ common/spl/spl_mmc.c 2014-08-21 10:38:25.144053170 +0200 @@ -100,6 +102,17 @@ void spl_mmc_load_image(void) #endif err = mmc_load_image_raw(mmc, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); +#ifdef CONFIG_SPL_EXT_SUPPORT + } else if (boot_mode == MMCSD_MODE_FAT) { + debug("boot mode - EXT\n"); +#ifdef CONFIG_SPL_OS_BOOT + if (spl_start_uboot() || spl_load_image_ext_os(&mmc->block_dev, + CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION)) +#endif + err = spl_load_image_ext(&mmc->block_dev, + CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION, + CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME); +#endif #ifdef CONFIG_SPL_FAT_SUPPORT } else if (boot_mode == MMCSD_MODE_FAT) { debug("boot mode - FAT\n"); ++++++ am335x_evm-bootscr.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,8 +1,8 @@ -Index: u-boot-2013.10/include/configs/am335x_evm.h +Index: u-boot-2014.10-rc1/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 @@ +--- u-boot-2014.10-rc1.orig/include/configs/am335x_evm.h ++++ u-boot-2014.10-rc1/include/configs/am335x_evm.h +@@ -115,6 +115,9 @@ "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ "ip=dhcp\0" \ "bootenv=uEnv.txt\0" \ @@ -11,8 +11,8 @@ + "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 @@ + "env import -t -r $loadaddr $filesize\0" \ +@@ -142,17 +145,21 @@ "mmcboot=mmc dev ${mmcdev}; " \ "if mmc rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \ ++++++ arndale.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,6 +1,8 @@ ---- ./include/configs/arndale.h.orig 2013-11-26 14:20:52.645451329 +0100 -+++ ./include/configs/arndale.h 2013-11-26 15:05:07.495703179 +0100 -@@ -74,9 +74,6 @@ +Index: include/configs/arndale.h +=================================================================== +--- include/configs/arndale.h.orig ++++ include/configs/arndale.h +@@ -72,9 +72,6 @@ "stdout=serial\0" \ "stderr=serial\0" @@ -10,7 +12,7 @@ /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC #define CONFIG_MMC -@@ -106,6 +103,8 @@ +@@ -105,6 +102,8 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_NET #define CONFIG_CMD_HASH @@ -19,7 +21,7 @@ #define CONFIG_BOOTDELAY 3 #define CONFIG_ZERO_BOOTDELAY_CHECK -@@ -127,7 +126,23 @@ +@@ -130,7 +129,23 @@ #define CONFIG_SPL_TEXT_BASE 0x02023400 #define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024) ++++++ beagle-bootscr.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,16 +1,27 @@ ---- 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 @@ +Index: include/configs/omap3_beagle.h +=================================================================== +--- include/configs/omap3_beagle.h.orig ++++ include/configs/omap3_beagle.h +@@ -193,7 +193,7 @@ + "fi; " \ + "fi; \0" \ + "bootenv=uEnv.txt\0" \ +- "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ ++ "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ + "env import -t -r $loadaddr $filesize\0" \ + "ramargs=setenv bootargs console=${console} " \ +@@ -207,6 +207,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.scr\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" \ - "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ -@@ -300,9 +303,13 @@ +@@ -243,9 +246,13 @@ "echo Running uenvcmd ...;" \ "run uenvcmd;" \ "fi;" \ ++++++ drop-marvell.patch ++++++ Index: u-boot-2014.10-rc1/arch/arm/Kconfig =================================================================== --- u-boot-2014.10-rc1.orig/arch/arm/Kconfig +++ u-boot-2014.10-rc1/arch/arm/Kconfig @@ -545,9 +545,6 @@ source "board/BuR/tseries/Kconfig" source "board/BuS/eb_cpux9k2/Kconfig" source "board/BuS/vl_ma2sc/Kconfig" source "board/CarMediaLab/flea3/Kconfig" -source "board/Marvell/aspenite/Kconfig" -source "board/Marvell/dkb/Kconfig" -source "board/Marvell/gplugd/Kconfig" source "board/afeb9260/Kconfig" source "board/altera/socfpga/Kconfig" source "board/armadeus/apf27/Kconfig" Index: u-boot-2014.10-rc1/arch/arm/cpu/arm926ejs/kirkwood/Kconfig =================================================================== --- u-boot-2014.10-rc1.orig/arch/arm/cpu/arm926ejs/kirkwood/Kconfig +++ u-boot-2014.10-rc1/arch/arm/cpu/arm926ejs/kirkwood/Kconfig @@ -67,12 +67,6 @@ config SYS_SOC string default "kirkwood" -source "board/Marvell/openrd/Kconfig" -source "board/Marvell/mv88f6281gtw_ge/Kconfig" -source "board/Marvell/rd6281a/Kconfig" -source "board/Marvell/dreamplug/Kconfig" -source "board/Marvell/guruplug/Kconfig" -source "board/Marvell/sheevaplug/Kconfig" source "board/buffalo/lsxl/Kconfig" source "board/cloudengines/pogo_e02/Kconfig" source "board/d-link/dns325/Kconfig" Index: u-boot-2014.10-rc1/arch/powerpc/cpu/74xx_7xx/Kconfig =================================================================== --- u-boot-2014.10-rc1.orig/arch/powerpc/cpu/74xx_7xx/Kconfig +++ u-boot-2014.10-rc1/arch/powerpc/cpu/74xx_7xx/Kconfig @@ -37,8 +37,6 @@ config TARGET_P3MX endchoice -source "board/Marvell/db64360/Kconfig" -source "board/Marvell/db64460/Kconfig" source "board/eltec/elppc/Kconfig" source "board/esd/cpci750/Kconfig" source "board/evb64260/Kconfig" ++++++ enable_spl_ext_support_for_ti_armv7.patch ++++++ --- include/configs/ti_armv7_common.h.orig 2014-08-21 10:41:47.979045987 +0200 +++ include/configs/ti_armv7_common.h 2014-08-21 10:42:12.325045125 +0200 @@ -250,6 +250,7 @@ #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT +#define CONFIG_SPL_EXT_SUPPORT #endif /* General parts of the framework, required. */ ++++++ exynos5-dt.h.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,5 +1,7 @@ ---- include/configs/exynos5-dt.h.orig 2014-02-04 10:19:32.915229302 +0100 -+++ include/configs/exynos5-dt.h 2014-02-05 16:15:04.818804877 +0100 +Index: include/configs/exynos5-dt.h +=================================================================== +--- include/configs/exynos5-dt.h.orig ++++ include/configs/exynos5-dt.h @@ -83,12 +83,25 @@ #define CONFIG_CONSOLE_MUX #define CONFIG_SYS_CONSOLE_IS_IN_ENV ++++++ fix_omap_boot_mode.patch ++++++ Index: arch/arm/cpu/armv7/omap3/board.c =================================================================== --- arch/arm/cpu/armv7/omap3/board.c.orig +++ arch/arm/cpu/armv7/omap3/board.c @@ -61,6 +61,8 @@ u32 omap3_boot_device = BOOT_DEVICE_NAND /* auto boot mode detection is not possible for OMAP3 - hard code */ u32 spl_boot_mode(void) { + return MMCSD_MODE_FAT; + switch (spl_boot_device()) { case BOOT_DEVICE_MMC2: return MMCSD_MODE_RAW; Index: common/spl/spl_mmc.c.orig =================================================================== --- common/spl/spl_mmc.c.orig 2014-08-06 15:12:58.000000000 +0200 +++ common/spl/spl_mmc.c 2014-08-21 10:38:25.144053170 +0200 @@ -92,7 +92,9 @@ void spl_mmc_load_image(void) hang(); } - boot_mode = spl_boot_mode(); +// boot_mode = spl_boot_mode(); + boot_mode = MMCSD_MODE_FAT; /* Fix OMAP4 boot */ + if (boot_mode == MMCSD_MODE_RAW) { debug("boot mode - RAW\n"); #ifdef CONFIG_SPL_OS_BOOT ++++++ fix_sabrelite_boot.scr.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,6 +1,8 @@ ---- ./include/configs/nitrogen6x.h.orig 2014-03-31 23:17:24.341995637 +0200 -+++ ./include/configs/nitrogen6x.h 2014-04-03 10:07:06.314594508 +0200 -@@ -183,13 +183,12 @@ +Index: include/configs/nitrogen6x.h +=================================================================== +--- include/configs/nitrogen6x.h.orig ++++ include/configs/nitrogen6x.h +@@ -186,13 +186,12 @@ "fdt_addr=0x18000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ @@ -16,7 +18,7 @@ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ -@@ -235,16 +234,14 @@ +@@ -238,16 +237,14 @@ "fi;\0" #define CONFIG_BOOTCOMMAND \ ++++++ fix_snow_config.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,8 +1,10 @@ ---- include/configs/snow.h.orig 2014-02-04 10:21:12.328756964 +0100 -+++ include/configs/snow.h 2014-02-05 16:15:08.265722911 +0100 -@@ -14,4 +14,31 @@ - #undef CONFIG_DEFAULT_DEVICE_TREE - #define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow +Index: include/configs/snow.h +=================================================================== +--- include/configs/snow.h.orig ++++ include/configs/snow.h +@@ -18,4 +18,31 @@ + #define CONFIG_FIT + #define CONFIG_FIT_BEST_MATCH +#undef CONFIG_BOOTCOMMAND +#define CONFIG_BOOTCOMMAND \ @@ -25,7 +27,7 @@ +#define CONFIG_PRE_CON_BUF_SZ 0x100000 +#define CONFIG_PRE_CON_BUF_ADDR 0x41f00000 + -+#define DEBUG ++/*#define DEBUG*/ +#undef CONFIG_SPL +#undef CONFIG_SYS_THUMB_BUILD +#undef CONFIG_SYS_ARM_CACHE_WRITETHROUGH ++++++ mx53loco-bootscr.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,6 +1,8 @@ ---- include/configs/mx53loco.h.orig 2014-04-14 21:19:24.000000000 +0200 -+++ include/configs/mx53loco.h 2014-04-29 11:53:24.669579194 +0200 -@@ -92,6 +92,7 @@ +Index: include/configs/mx53loco.h +=================================================================== +--- include/configs/mx53loco.h.orig ++++ include/configs/mx53loco.h +@@ -94,6 +94,7 @@ /* Command definition */ #include <config_cmd_default.h> #define CONFIG_CMD_BOOTZ @@ -8,7 +10,7 @@ #undef CONFIG_CMD_IMLS -@@ -114,11 +115,11 @@ +@@ -116,11 +117,11 @@ "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \ "mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot}\0" \ "loadbootscript=" \ ++++++ origen-ext2.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,5 +1,7 @@ ---- include/configs/origen.h.orig 2014-04-29 14:10:29.864588285 +0200 -+++ include/configs/origen.h 2014-04-29 14:15:44.511098108 +0200 +Index: include/configs/origen.h +=================================================================== +--- include/configs/origen.h.orig ++++ include/configs/origen.h @@ -61,6 +61,9 @@ #undef CONFIG_CMD_PING #define CONFIG_CMD_ELF @@ -10,7 +12,7 @@ #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS -@@ -69,7 +72,35 @@ +@@ -68,7 +71,35 @@ #define COPY_BL2_FNPTR_ADDR 0x02020030 #define CONFIG_SPL_TEXT_BASE 0x02021410 ++++++ panda-bootscr.patch ++++++ Index: include/configs/ti_omap4_common.h =================================================================== --- include/configs/ti_omap4_common.h.orig +++ include/configs/ti_omap4_common.h @@ -102,10 +102,10 @@ "vram=${vram} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ - "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ "source ${loadaddr}\0" \ - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ + "loadbootenv=load mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ "env import -t ${loadaddr} ${filesize}\0" \ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -5,28 +5,28 @@ ARCH_RESTRICTIONS="$3 $4" armv6_boards="rpi_b" -armv7_boards="omap3_beagle omap4_panda am335x_evm arndale highbank mx53loco mx6qsabrelite Cubieboard Cubieboard2 Cubietruck Hyundai_A7HD Mele_A1000 colibri_t20_iris paz00 snow mx6_cubox-i" +armv7_boards="omap3_beagle omap4_panda am335x_evm arndale highbank mx53loco mx6qsabrelite Cubieboard Cubieboard2 Cubietruck Mele_A1000 colibri_t20_iris paz00 snow" aarch64_boards="vexpress_aemv8a" if [ ! "$1" -o ! "$2" -o ! "$3" ]; then # armv6 boards for BOARDCONFIG in $armv6_boards; do BOARDNAME="$(echo $BOARDCONFIG | tr -d '_' | tr '[:upper:]' '[:lower:]')" - BOARDCONFIG=${BOARDCONFIG}_config + BOARDCONFIG=${BOARDCONFIG}_defconfig ARCH_RESTRICTIONS="armv6l armv6hl" bash $0 $BOARDNAME $BOARDCONFIG $ARCH_RESTRICTIONS done # armv7 boards for BOARDCONFIG in $armv7_boards; do BOARDNAME="$(echo $BOARDCONFIG | tr -d '_' | tr '[:upper:]' '[:lower:]')" - BOARDCONFIG=${BOARDCONFIG}_config + BOARDCONFIG=${BOARDCONFIG}_defconfig ARCH_RESTRICTIONS="armv7l armv7hl" bash $0 $BOARDNAME $BOARDCONFIG $ARCH_RESTRICTIONS done # aarch64 boards for BOARDCONFIG in $aarch64_boards; do BOARDNAME="$(echo $BOARDCONFIG | tr -d '_' | tr '[:upper:]' '[:lower:]')" - BOARDCONFIG=${BOARDCONFIG}_config + BOARDCONFIG=${BOARDCONFIG}_defconfig ARCH_RESTRICTIONS="aarch64" bash $0 $BOARDNAME $BOARDCONFIG $ARCH_RESTRICTIONS done @@ -40,7 +40,7 @@ CUBOXI_SPL=0 case "$BOARDCONFIG" in mx53loco*|mx6qsabrelite*|efika*) BINEND=imx ;; -*omap*|*am335x*) BINEND=bin +*omap*|*am335x*) BINEND=img XLOADER=1 ;; *arndale*) BINEND=bin ARNDALE_SPL=1 ;; ++++++ ti_common_initrd_support.patch ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -1,6 +1,8 @@ ---- ./include/configs/ti_armv7_common.h.orig 2013-12-17 15:08:07.380596872 +0100 -+++ ./include/configs/ti_armv7_common.h 2013-12-17 15:08:30.370055488 +0100 -@@ -149,6 +149,7 @@ +Index: include/configs/ti_armv7_common.h +=================================================================== +--- include/configs/ti_armv7_common.h.orig ++++ include/configs/ti_armv7_common.h +@@ -174,6 +174,7 @@ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_ECHO #define CONFIG_CMD_BOOTZ ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.4h3OTl/_old 2014-09-08 21:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4h3OTl/_new 2014-09-08 21:30:43.000000000 +0200 @@ -25,34 +25,35 @@ %define cuboxi_spl CUBOXI_SPL Name: u-boot-BOARDNAME -Version: 2014.04 +Version: 2014.10~rc2 Release: 0 Summary: The u-boot firmware for the BOARDNAME arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 -Source1: openSUSE_panda.txt +#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2 +Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2014.10-rc2.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch2: mlo-ext2.patch +Patch0: enable_spl_ext_support_for_ti_armv7.patch +Patch1: add_spl_extfs_support.patch +Patch2: fix_omap_boot_mode.patch Patch3: ti_common_initrd_support.patch Patch4: beagle-bootscr.patch -Patch5: mx53loco-bootscr.patch -Patch6: origen-ext2.patch -Patch7: arndale.patch -Patch8: v2014.04-sunxi.patch +Patch5: panda-bootscr.patch +Patch6: mx53loco-bootscr.patch +Patch7: origen-ext2.patch +Patch8: arndale.patch Patch9: am335x_evm-bootscr.patch -Patch10: rpi_b-bootscr.patch -Patch12: fix_spl_build_for_am335x.patch -Patch13: fix_sabrelite_boot.scr.patch -Patch14: cubox-i-v2014.04-port.patch -Patch15: cubox-i-enable_raw_rd.patch +Patch10: fix_sabrelite_boot.scr.patch Patch20: fix_exynos5_text_base.patch Patch21: fix_snow_config.patch Patch22: exynos5-dt.h.patch +# Marvell boards support is non-free licensed, and we don't need it (bnc#773824) +Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 +BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -75,35 +76,29 @@ This package contains documentation for u-boot firmware %prep -%setup -q -n u-boot-%{version} +#%setup -q -n u-boot-%{version} +%setup -q -n u-boot-2014.10-rc2 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%if "%{name}" != "u-boot-mx6cubox-i" -# conflicts with cubox-i-v2014.04-port.patch, skip it when building for cubox-i +%patch0 +%patch1 %patch2 -%endif %patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 -p1 %patch10 -%patch12 -%patch13 -%if "%{name}" == "u-boot-mx6cubox-i" -# Conflicts with mlo-ext2.patch, so apply only for cubox-i now -%patch14 -p1 -%patch15 -p1 -%endif %if "%{name}" == "u-boot-snow" # Still WIP, so only apply Chromebook ARM (snow) patches for u-boot-snow to avoid to break other boards (Arndale board) %patch20 %patch21 %patch22 %endif +%patch99 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG @@ -160,6 +155,6 @@ # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation -%doc doc/README.ARM-SoC doc/README.ARM-memory-map +%doc doc/README.ARM-memory-map %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
