Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2016-04-07 13:32:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot" Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot-a10-olinuxino-lime.changes 2016-03-17 16:49:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-a10-olinuxino-lime.changes 2016-04-07 13:32:24.000000000 +0200 @@ -1,0 +2,17 @@ +Sun Apr 3 04:40:53 UTC 2016 - [email protected] + +- Package .img for firefly-rk3288 +- Package firefly-rk3288 SPL images. Generate them here so that we + notice early if the size constraints are ever again not met. + +------------------------------------------------------------------- +Sat Apr 2 23:08:53 UTC 2016 - [email protected] + +- Package spl/u-boot-spl for new tegra-uboot-flasher-scripts + +------------------------------------------------------------------- +Fri Apr 1 17:07:55 UTC 2016 - [email protected] + +- Add clearfog + +------------------------------------------------------------------- u-boot-a13-olinuxino.changes: same change u-boot-a13-olinuxinom.changes: same change u-boot-a20-olinuxino-lime.changes: same change u-boot-a20-olinuxino-lime2.changes: same change u-boot-a20-olinuxinomicro.changes: same change u-boot-am335xboneblack.changes: same change u-boot-am335xevm.changes: same change u-boot-am57xxevm.changes: same change u-boot-am57xxevmnodt.changes: same change u-boot-arndale.changes: same change u-boot-bananapi.changes: same change New Changes file: --- /dev/null 2016-04-07 01:36:33.300037506 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-clearfog.changes 2016-04-07 13:32:26.000000000 +0200 @@ -0,0 +1,1098 @@ +------------------------------------------------------------------- +Sun Apr 3 04:40:53 UTC 2016 - [email protected] + +- Package .img for firefly-rk3288 +- Package firefly-rk3288 SPL images. Generate them here so that we + notice early if the size constraints are ever again not met. + +------------------------------------------------------------------- +Sat Apr 2 23:08:53 UTC 2016 - [email protected] + +- Package spl/u-boot-spl for new tegra-uboot-flasher-scripts + +------------------------------------------------------------------- +Fri Apr 1 17:07:55 UTC 2016 - [email protected] + +- Add clearfog + +------------------------------------------------------------------- +Tue Mar 15 08:47:35 UTC 2016 - [email protected] + +- Update to 2016.03 +- Remove upstreamed patch: + * omap3-Use-raw-SPL-by-default-for-mmc1.patch + +------------------------------------------------------------------- +Sun Mar 13 21:48:46 UTC 2016 - [email protected] + +- add support for Raspberry Pi 3 (rpi3.patch) + +------------------------------------------------------------------- +Wed Mar 9 22:50:22 UTC 2016 - [email protected] + +- Fix missing 0-terminator in efi patch, breaking boot.scr boot + +------------------------------------------------------------------- +Sat Mar 5 22:02:18 UTC 2016 - [email protected] + +- Non-free licensed Marvell code has long been removed. + Drop obsolete drop-marvell.patch (bsc#773824) +- Fix indentation of Patch6 in u-boot.spec.in + +------------------------------------------------------------------- +Thu Mar 3 15:02:37 UTC 2016 - [email protected] + +- EFI: Map fdt as reserved + * efi-map-fdt-as-reserved.patch + +------------------------------------------------------------------- +Thu Mar 3 12:52:17 UTC 2016 - [email protected] + +- Fix OMAP3 boards to load u-boot from raw sector offset + * omap3-Use-raw-SPL-by-default-for-mmc1.patch + +------------------------------------------------------------------- +Wed Mar 2 23:46:44 UTC 2016 - [email protected] + +- Allow grub2 to find its config + * efi_loader-Pass-proper-device-path-in-on-boot.patch +- Fix Raspberry Pi 1 build + * efi_loader-Provide-icache-flush-stub.patch + +------------------------------------------------------------------- +Wed Mar 2 10:03:56 UTC 2016 - [email protected] + +- Update to 2016.03-rc3 +- Remove upstreamed patches: + * 0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.patch + +------------------------------------------------------------------- +Tue Mar 1 23:06:57 UTC 2016 - [email protected] + +- Move omap3 to distro bootcmd (to enable efi boot on beagle-xm) + * omap3-Move-to-distro-bootcmd.patch +- Add EFI patch to support FDT fixups (patches in RAM size) + * efi_loader-Call-fdt-preparation-functions.patch + +------------------------------------------------------------------- +Mon Feb 29 23:28:15 UTC 2016 - [email protected] + +- Patch the default u-boot env to search for dtb in /boot at part 2 + * efi-default-env.patch + +------------------------------------------------------------------- +Sun Feb 28 11:02:04 UTC 2016 - [email protected] + +- Use $fdtfile rather than $fdt_name everywhere: + * efi2.patch + +------------------------------------------------------------------- +Sat Feb 27 13:20:29 UTC 2016 - [email protected] + +- Add EFI support about to move upstream: + * efi.patch + +------------------------------------------------------------------- +Mon Feb 22 13:32:31 UTC 2016 - [email protected] + +- Update to 2016.03-rc2 +- Remove upstreamed patches: + * U-Boot-am335x_evm-Don-t-undef-CONFIG_BOOTDELAY.patch + * 0001-udoo-use-load-instead-of-fatload.patch +- Refresh drop-marvell.patch +- Remove dropped doc from file list: doc/README.Modem + +------------------------------------------------------------------- +Wed Feb 17 08:16:15 UTC 2016 - [email protected] + +- Add a patch to fix boot on partition when raw boot mode is also + available: + * 0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.patch + +------------------------------------------------------------------- +Wed Feb 17 08:15:52 UTC 2016 - [email protected] + +- Add am335x_boneblack + +------------------------------------------------------------------- +Sat Feb 13 14:56:43 UTC 2016 - [email protected] + +- Enable Hyundai_A7HD, superseding :Contrib:sunxi package + +------------------------------------------------------------------- +Thu Feb 9 13:02:26 UTC 2016 - [email protected] + +- Adjust installation path for qemu-ppce500 to replace qemu-ppc's +* Pull in qemu (not qemu-ppc) for directory ownership + +------------------------------------------------------------------- +Tue Feb 9 00:03:18 UTC 2016 - [email protected] + +- Add Jetson TX1 board (p2371-2180) +- Fix indentation of last Patch line in .spec.in to match .spec + +------------------------------------------------------------------- +Mon Feb 1 19:35:45 UTC 2016 - [email protected] + +- Add patch to fix exynos armv7 kvm support + * adds u-boot-exynos.patch + +------------------------------------------------------------------- +Tue Jan 19 14:15:58 UTC 2016 - [email protected] + +- Prepare for non-/boot installation directories +* For /boot/vc pull in raspberrypi-firmware package + +------------------------------------------------------------------- +Fri Jan 15 21:19:43 UTC 2016 - [email protected] + +- Add udoo (dual and quad) boards + * adds 0001-udoo-use-load-instead-of-fatload.patch + +------------------------------------------------------------------- +Thu Jan 14 15:43:36 UTC 2016 - [email protected] + +- Add qemu-ppce500, to replace u-boot.e500 blob in qemu package +* Override CROSS_COMPILE variable to use native gcc + +------------------------------------------------------------------- +Wed Jan 13 14:07:32 UTC 2016 - [email protected] + +- Update to 2016.01 + +------------------------------------------------------------------- +Mon Jan 11 11:08:50 UTC 2016 - [email protected] + +- Update to 2016.01-rc4 + +------------------------------------------------------------------- +Mon Dec 28 13:50:10 UTC 2015 - [email protected] + +- Update to 2016.01-rc3 + +------------------------------------------------------------------- +Sun Dec 20 20:56:54 UTC 2015 - [email protected] + +- Suppress stripping debug info - it affects u-boot-jetson-tk1 +- Install rpi and rpi2 binaries to /boot/vc + +------------------------------------------------------------------- +Tue Dec 15 09:27:03 UTC 2015 - [email protected] + +- Backport U-Boot-am335x_evm-Don-t-undef-CONFIG_BOOTDELAY.patch + to fix bootdelay on Beaglebone board + +------------------------------------------------------------------- +Tue Dec 15 09:15:30 UTC 2015 - [email protected] + +- Add orangepi_pc board + +------------------------------------------------------------------- +Fri Dec 11 09:23:17 UTC 2015 - [email protected] + +- Add support to am57xx_evm (beagle_x15 with u-boot DT) + +------------------------------------------------------------------- +Fri Dec 11 09:08:25 UTC 2015 - [email protected] + ++++ 901 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-clearfog.changes --- /work/SRC/openSUSE:Factory/u-boot/u-boot-colibrit20.changes 2016-03-17 16:49:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-colibrit20.changes 2016-04-07 13:32:26.000000000 +0200 @@ -1,0 +2,17 @@ +Sun Apr 3 04:40:53 UTC 2016 - [email protected] + +- Package .img for firefly-rk3288 +- Package firefly-rk3288 SPL images. Generate them here so that we + notice early if the size constraints are ever again not met. + +------------------------------------------------------------------- +Sat Apr 2 23:08:53 UTC 2016 - [email protected] + +- Package spl/u-boot-spl for new tegra-uboot-flasher-scripts + +------------------------------------------------------------------- +Fri Apr 1 17:07:55 UTC 2016 - [email protected] + +- Add clearfog + +------------------------------------------------------------------- u-boot-cubieboard.changes: same change u-boot-cubieboard2.changes: same change u-boot-cubietruck.changes: same change u-boot-firefly-rk3288.changes: same change u-boot-highbank.changes: same change u-boot-hyundaia7hd.changes: same change u-boot-jetson-tk1.changes: same change u-boot-melea1000.changes: same change u-boot-merriia80optimus.changes: same change u-boot-mx53loco.changes: same change u-boot-mx6cuboxi.changes: same change u-boot-mx6qsabrelite.changes: same change u-boot-odroid-xu3.changes: same change u-boot-odroid.changes: same change u-boot-omap3beagle.changes: same change u-boot-omap4panda.changes: same change u-boot-orangepipc.changes: same change u-boot-p2371-2180.changes: same change u-boot-paz00.changes: same change u-boot-pcm051rev3.changes: same change u-boot-qemu-ppce500.changes: same change u-boot-rpi.changes: same change u-boot-rpi2.changes: same change u-boot-rpi3.changes: same change u-boot-snow.changes: same change u-boot-spring.changes: same change u-boot-udoo.changes: same change u-boot.changes: same change New: ---- u-boot-clearfog.changes u-boot-clearfog.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-a10-olinuxino-lime.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 1 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin u-boot-a13-olinuxino.spec: same change u-boot-a13-olinuxinom.spec: same change u-boot-a20-olinuxino-lime.spec: same change u-boot-a20-olinuxino-lime2.spec: same change u-boot-a20-olinuxinomicro.spec: same change ++++++ u-boot-am335xboneblack.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 1 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin u-boot-am335xevm.spec: same change ++++++ u-boot-am57xxevm.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin u-boot-am57xxevmnodt.spec: same change ++++++ u-boot-arndale.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 1 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin ++++++ u-boot-bananapi.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 1 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin ++++++ u-boot-clearfog.spec ++++++ # # spec file for package u-boot-clearfog # # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define x_loader 0 %define origen_spl 0 %define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 %define udoo_spl 0 # archive_version differs from version for RC version only %define archive_version 2016.03 Name: u-boot-clearfog Version: 2016.03 Release: 0 Summary: The u-boot firmware for the clearfog 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-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc # Fix exynos KVM support Patch1: u-boot-exynos.patch # Add EFI support. Will be upstream in the next version of u-boot. Patch3: efi.patch Patch4: efi2.patch # Set default environment slightly different for EFI, so it finds our dtbs Patch5: efi-default-env.patch # Move omap3 to distro boot method Patch6: omap3-Move-to-distro-bootcmd.patch # efi: Run memory node fixups in device tree Patch7: efi_loader-Call-fdt-preparation-functions.patch # Allow grub2 to find its config file Patch8: efi_loader-Pass-proper-device-path-in-on-boot.patch # Fix Raspberry Pi 1 build Patch9: efi_loader-Provide-icache-flush-stub.patch # Ensure we mark the device tree as reserved Patch11: efi-map-fdt-as-reserved.patch Patch12: rpi3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: bc BuildRequires: dtc >= 1.4.0 %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-clearfog Provides: x-loader-clearfog %endif ExclusiveArch: armv7l armv7hl %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains the firmware for the clearfog arm platform. %package doc Summary: Documentation for the u-boot Firmware Group: Documentation/Other %description doc Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains documentation for u-boot firmware %prep %setup -q -n u-boot-%{archive_version} %patch1 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch11 -p1 %patch12 %build make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" clearfog_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" # Chromebook ARM (snow) and HP Chromebook 11 (spring) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif %if %rockchip_spl == 1 for t in ; do ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t done %endif %install export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" %define uboot_dir %{_datadir}/qemu %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else # 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}%{uboot_dir}/u-boot.bin elif [ -f u-boot-dtb.bin ]; then install -D -m 0644 u-boot-dtb.bin %{buildroot}%{uboot_dir}/u-boot.bin else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin fi %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif %endif %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif %if %origen_spl == 1 install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin %endif %if %arndale_spl == 1 install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %rockchip_spl == 1 install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin for t in ; do install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t done %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin %endif %if %udoo_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif %files %defattr(-,root,root) %{uboot_dir}/* %doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) # Generic documents %doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands %doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb %doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST # 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-memory-map %changelog ++++++ u-boot-colibrit20.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin ++++++ u-boot-cubieboard.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 1 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin u-boot-cubieboard2.spec: same change u-boot-cubietruck.spec: same change ++++++ u-boot-firefly-rk3288.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 1 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in rksd rkimage; do + ./tools/mkimage -n rk3288 -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,21 +129,21 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else # 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}%{uboot_dir}/u-boot.bin -elif [ -f u-boot-dtb.bin ]; then - install -D -m 0644 u-boot-dtb.bin %{buildroot}%{uboot_dir}/u-boot.bin + install -D -m 0644 u-boot-dtb-tegra.img %{buildroot}%{uboot_dir}/u-boot.img +elif [ -f u-boot-dtb.img ]; then + install -D -m 0644 u-boot-dtb.img %{buildroot}%{uboot_dir}/u-boot.img else - install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin + install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img fi %if "%{name}" == "u-boot-qemu-ppce500" -mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 +mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif %endif %if %x_loader == 1 @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in rksd rkimage; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin ++++++ u-boot-highbank.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin ++++++ u-boot-hyundaia7hd.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 1 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin ++++++ u-boot-jetson-tk1.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin ++++++ u-boot-melea1000.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 1 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin ++++++ u-boot-merriia80optimus.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin u-boot-mx53loco.spec: same change ++++++ u-boot-mx6cuboxi.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 1 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin ++++++ u-boot-mx6qsabrelite.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin u-boot-odroid-xu3.spec: same change u-boot-odroid.spec: same change ++++++ u-boot-omap3beagle.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 1 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin u-boot-omap4panda.spec: same change ++++++ u-boot-orangepipc.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:33.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin u-boot-p2371-2180.spec: same change u-boot-paz00.spec: same change ++++++ u-boot-pcm051rev3.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:34.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:34.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 1 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin ++++++ u-boot-qemu-ppce500.spec ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:34.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:34.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader 0 %define origen_spl 0 +%define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ; do + ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin u-boot-rpi.spec: same change u-boot-rpi2.spec: same change u-boot-rpi3.spec: same change u-boot-snow.spec: same change u-boot-spring.spec: same change u-boot-udoo.spec: same change ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:34.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:34.000000000 +0200 @@ -25,6 +25,8 @@ armv7_boards="$armv7_boards colibri_t20 paz00 jetson-tk1" # Rockchip armv7_boards="$armv7_boards firefly-rk3288" +# Marvell +armv7_boards="$armv7_boards clearfog" aarch64_boards="p2371-2180 rpi_3" @@ -64,6 +66,7 @@ OMAP_SPL=0 ORIGEN_SPL=0 +ROCKCHIP_SPL=0 SUNXI_SPL=0 ARNDALE_SPL=0 CUBOXI_SPL=0 @@ -99,6 +102,12 @@ BINEND=img UDOO_SPL=1 ;; +firefly-rk3288) + BINEND=img + ROCKCHIP_SPL=1 + ROCKCHIP_SPL_IMAGE_TYPES="rksd rkimage" + ROCKCHIP_SPL_SOC=rk3288 + ;; *) BINEND=bin ;; esac @@ -109,6 +118,9 @@ s/BINEND/$BINEND/g s/ORIGEN_SPL/$ORIGEN_SPL/g s/ARNDALE_SPL/$ARNDALE_SPL/g +s/ROCKCHIP_SPL_IMAGE_TYPES/$ROCKCHIP_SPL_IMAGE_TYPES/g +s/ROCKCHIP_SPL_SOC/$ROCKCHIP_SPL_SOC/g +s/ROCKCHIP_SPL/$ROCKCHIP_SPL/g s/SUNXI_SPL/$SUNXI_SPL/g s/TEGRA_SPL/$TEGRA_SPL/g s/CUBOXI_SPL/$CUBOXI_SPL/g ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.JfHAjF/_old 2016-04-07 13:32:34.000000000 +0200 +++ /var/tmp/diff_new_pack.JfHAjF/_new 2016-04-07 13:32:34.000000000 +0200 @@ -20,6 +20,7 @@ %define x_loader OMAP_SPL %define origen_spl ORIGEN_SPL +%define rockchip_spl ROCKCHIP_SPL %define sunxi_spl SUNXI_SPL %define arndale_spl ARNDALE_SPL %define cuboxi_spl CUBOXI_SPL @@ -110,6 +111,11 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif +%if %rockchip_spl == 1 +for t in ROCKCHIP_SPL_IMAGE_TYPES; do + ./tools/mkimage -n ROCKCHIP_SPL_SOC -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t +done +%endif %install export NO_BRP_STRIP_DEBUG=true @@ -123,7 +129,7 @@ %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do +for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else @@ -150,6 +156,12 @@ install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif +%if %rockchip_spl == 1 +install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin +for t in ROCKCHIP_SPL_IMAGE_TYPES; do + install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t +done +%endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin
