diff -Nru u-boot-2015.10+dfsg1/debian/changelog u-boot-2015.10+dfsg1/debian/changelog --- u-boot-2015.10+dfsg1/debian/changelog 2015-11-24 22:14:32.000000000 +0000 +++ u-boot-2015.10+dfsg1/debian/changelog 2015-11-28 10:45:17.000000000 +0000 @@ -1,3 +1,10 @@ +u-boot (2015.10+dfsg1-3+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 2014.10+dfsg1-2+rpi1 by Peter Michael Green at Fri, 28 Nov 2014 06:00:07 +0000] + * Don't build versions for various armv7 devices, build rpi version instead. + + -- Peter Michael Green Sat, 28 Nov 2015 01:10:33 +0000 + u-boot (2015.10+dfsg1-3) unstable; urgency=medium * u-boot-install-targets: Add support to install documentation. diff -Nru u-boot-2015.10+dfsg1/debian/control u-boot-2015.10+dfsg1/debian/control --- u-boot-2015.10+dfsg1/debian/control 2015-11-24 21:58:36.000000000 +0000 +++ u-boot-2015.10+dfsg1/debian/control 2015-11-28 10:49:25.000000000 +0000 @@ -12,108 +12,13 @@ Package: u-boot Architecture: armel armhf avr32 mips sh4 Multi-Arch: same -Depends: ${misc:Depends}, - u-boot-imx [armhf], u-boot-omap [armhf], u-boot-sunxi [armhf], u-boot-exynos [armhf] -Description: A boot loader for embedded systems - Das U-Boot is a cross-platform bootloader for embedded systems, - used as the default boot loader by several board vendors. It is - intended to be easy to port and to debug, and runs on many - supported architectures, including PPC, ARM, MIPS, x86, m68k, - NIOS, and Microblaze. - ${uboot:platforms} - -Package: u-boot-imx -Architecture: armhf -Multi-Arch: same -Depends: ${misc:Depends} -Breaks: u-boot (<< 2014.10~rc2+dfsg1-2~) -Replaces: u-boot (<< 2014.10~rc2+dfsg1-2~) -Description: A boot loader for imx systems - Das U-Boot is a cross-platform bootloader for embedded systems, - used as the default boot loader by several board vendors. It is - intended to be easy to port and to debug, and runs on many - supported architectures, including PPC, ARM, MIPS, x86, m68k, - NIOS, and Microblaze. - . - This package includes boot loaders for various imx platforms. - ${uboot:platforms} - -Package: u-boot-tegra -Architecture: armhf -Multi-Arch: same -Depends: ${misc:Depends} -Breaks: u-boot (<< 2014.10~rc2+dfsg1-2~) -Replaces: u-boot (<< 2014.10~rc2+dfsg1-2~) -Description: A boot loader for tegra systems - Das U-Boot is a cross-platform bootloader for embedded systems, - used as the default boot loader by several board vendors. It is - intended to be easy to port and to debug, and runs on many - supported architectures, including PPC, ARM, MIPS, x86, m68k, - NIOS, and Microblaze. - . - This package includes boot loaders for various tegra platforms. - ${uboot:platforms} - -Package: u-boot-omap -Architecture: armhf -Multi-Arch: same Depends: ${misc:Depends} -Breaks: u-boot (<< 2014.10~rc2+dfsg1-2~) -Replaces: u-boot (<< 2014.10~rc2+dfsg1-2~) -Description: A boot loader for omap systems - Das U-Boot is a cross-platform bootloader for embedded systems, - used as the default boot loader by several board vendors. It is - intended to be easy to port and to debug, and runs on many - supported architectures, including PPC, ARM, MIPS, x86, m68k, - NIOS, and Microblaze. - . - This package includes boot loaders for various omap and related - platforms. - ${uboot:platforms} - -Package: u-boot-sunxi -Architecture: armhf -Multi-Arch: same -Depends: ${misc:Depends} -Breaks: u-boot (<< 2014.10~rc2+dfsg1-2~) -Replaces: u-boot (<< 2014.10~rc2+dfsg1-2~) -Description: A boot loader for sunxi systems - Das U-Boot is a cross-platform bootloader for embedded systems, - used as the default boot loader by several board vendors. It is - intended to be easy to port and to debug, and runs on many - supported architectures, including PPC, ARM, MIPS, x86, m68k, - NIOS, and Microblaze. - . - This package includes boot loaders for various Allwinner/sunxi - platforms. - ${uboot:platforms} - -Package: u-boot-exynos -Architecture: armhf -Multi-Arch: same -Depends: ${misc:Depends} -Description: A boot loader for exynos systems - Das U-Boot is a cross-platform bootloader for embedded systems, - used as the default boot loader by several board vendors. It is - intended to be easy to port and to debug, and runs on many - supported architectures, including PPC, ARM, MIPS, x86, m68k, - NIOS, and Microblaze. - . - This package includes boot loaders for various Exynos platforms. - ${uboot:platforms} - -Package: u-boot-rockchip -Architecture: armhf -Multi-Arch: same -Depends: ${misc:Depends} -Description: A boot loader for rockchip systems +Description: A boot loader for embedded systems Das U-Boot is a cross-platform bootloader for embedded systems, used as the default boot loader by several board vendors. It is intended to be easy to port and to debug, and runs on many supported architectures, including PPC, ARM, MIPS, x86, m68k, NIOS, and Microblaze. - . - This package includes boot loaders for various Rockchip platforms. ${uboot:platforms} Package: u-boot-tools diff -Nru u-boot-2015.10+dfsg1/debian/targets u-boot-2015.10+dfsg1/debian/targets --- u-boot-2015.10+dfsg1/debian/targets 2015-11-24 21:58:36.000000000 +0000 +++ u-boot-2015.10+dfsg1/debian/targets 2015-11-28 10:52:51.000000000 +0000 @@ -10,113 +10,11 @@ # Vagrant Cascadian , rpi B 256M armel - rpi u-boot.bin +armhf - rpi u-boot.bin # drEagle armel - sheevaplug u-boot.kwb -# Ian Campbell -armhf exynos arndale u-boot-dtb.bin spl/arndale-spl.bin - -# Joost van Zwieten , Odroid-U3 -armhf exynos odroid u-boot-dtb.bin - -# Robert Nelson -armhf imx mx53loco u-boot.imx - -# Steve Langasek , CuBox-i4 -# Vagrant Cascadian , CuBox-i4, hummingboard-i1, hummingboard-i2ex -# Rainer Dorsch , CuBox-i2u (i2u-300-d) -armhf imx mx6cuboxi u-boot.img spl/u-boot-spl.bin SPL - -# Hector Oron -armhf imx nitrogen6q u-boot.imx - -# Tony Mancill -armhf imx novena u-boot.img spl/u-boot-spl.bin SPL - -# Michael Fladischer -armhf imx udoo u-boot.img spl/u-boot-spl.bin SPL - -# Vagrant Cascadian -armhf imx usbarmory u-boot.imx - -# Vagrant Cascadian -# Robert Nelson -armhf imx wandboard u-boot.img spl/u-boot-spl.bin SPL - -# Ian Campbell -armhf tegra jetson-tk1 u-boot-dtb-tegra.bin - -# Vagrant Cascadian -# Andrew M.A. Cater -armhf omap am335x_boneblack u-boot.img spl/u-boot-spl.bin MLO - -# Robert Nelson -armhf omap igep0020 u-boot.img spl/u-boot-spl.bin MLO - -armhf omap nokia_rx51 u-boot.bin - -# Robert Nelson -armhf omap omap3_beagle u-boot.img spl/u-boot-spl.bin MLO - -# Robert Nelson -armhf omap omap4_panda u-boot.img spl/u-boot-spl.bin MLO - -# Emilio Pozuelo Monfort -# Sjoerd Simons -armhf rockchip firefly-rk3288 u-boot.img spl/u-boot-spl-dtb.bin - -# Joey Hess -# Christian Kastner -armhf sunxi A10-OLinuXino-Lime u-boot-sunxi-with-spl.bin - -# Benedikt Wildenhain -armhf sunxi A10s-OLinuXino-M u-boot-sunxi-with-spl.bin - -# Karsten Merker -armhf sunxi A20-Olimex-SOM-EVB u-boot-sunxi-with-spl.bin - -# Christian Kastner -armhf sunxi A20-OLinuXino-Lime u-boot-sunxi-with-spl.bin - -# Karsten Merker -armhf sunxi A20-OLinuXino-Lime2 u-boot-sunxi-with-spl.bin - -# Arne Ploese -armhf sunxi A20-OLinuXino_MICRO u-boot-sunxi-with-spl.bin - -# Ian Campbell -# Vagrant Cascadian -armhf sunxi Bananapi u-boot-sunxi-with-spl.bin - -# Karsten Merker -armhf sunxi Bananapro u-boot-sunxi-with-spl.bin - -# Vagrant Cascadian -armhf sunxi Cubieboard u-boot-sunxi-with-spl.bin - -# Philip Rinn -# Ian Campbell -# Karsten Merker -armhf sunxi Cubieboard2 u-boot-sunxi-with-spl.bin - -# Ian Campbell -# Robert Nelson -# Karsten Merker -armhf sunxi Cubietruck u-boot-sunxi-with-spl.bin - -# Vagrant Cascadian -armhf sunxi Lamobo_R1 u-boot-sunxi-with-spl.bin - -# Robert Hegner -armhf sunxi Linksprite_pcDuino u-boot-sunxi-with-spl.bin - -# Patrice Go -armhf sunxi Linksprite_pcDuino3 u-boot-sunxi-with-spl.bin - -# Jochen Sprickerhof -armhf sunxi Mini-X u-boot-sunxi-with-spl.bin - avr32 - hammerhead u-boot.img mips - qemu_mips u-boot.bin diff -Nru u-boot-2015.10+dfsg1/debian/u-boot-exynos.substvars u-boot-2015.10+dfsg1/debian/u-boot-exynos.substvars --- u-boot-2015.10+dfsg1/debian/u-boot-exynos.substvars 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2015.10+dfsg1/debian/u-boot-exynos.substvars 2015-11-28 10:44:53.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends= diff -Nru u-boot-2015.10+dfsg1/debian/u-boot-imx.substvars u-boot-2015.10+dfsg1/debian/u-boot-imx.substvars --- u-boot-2015.10+dfsg1/debian/u-boot-imx.substvars 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2015.10+dfsg1/debian/u-boot-imx.substvars 2015-11-28 10:44:53.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends= diff -Nru u-boot-2015.10+dfsg1/debian/u-boot-omap.substvars u-boot-2015.10+dfsg1/debian/u-boot-omap.substvars --- u-boot-2015.10+dfsg1/debian/u-boot-omap.substvars 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2015.10+dfsg1/debian/u-boot-omap.substvars 2015-11-28 10:44:53.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends= diff -Nru u-boot-2015.10+dfsg1/debian/u-boot-sunxi.substvars u-boot-2015.10+dfsg1/debian/u-boot-sunxi.substvars --- u-boot-2015.10+dfsg1/debian/u-boot-sunxi.substvars 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2015.10+dfsg1/debian/u-boot-sunxi.substvars 2015-11-28 10:44:53.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends=