diff -Nru u-boot-2021.01+dfsg/debian/changelog u-boot-2021.01+dfsg/debian/changelog --- u-boot-2021.01+dfsg/debian/changelog 2021-05-23 04:32:45.000000000 +0000 +++ u-boot-2021.01+dfsg/debian/changelog 2021-06-04 00:18:15.000000000 +0000 @@ -1,3 +1,14 @@ +u-boot (2021.01+dfsg-5+rpi1) bullseye-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. + + [changes introduced in 2021.01+dfsg-4+rpi1 by Peter Michael Green] + * Don't build powerpc targets for qemu, my attempts to build the nessacery + cross-compiler in raspbian failed. + + -- Raspbian forward porter Fri, 04 Jun 2021 00:18:15 +0000 + u-boot (2021.01+dfsg-5) unstable; urgency=medium * debian/patches: Fix boot failure caused by efi loader switching to diff -Nru u-boot-2021.01+dfsg/debian/control u-boot-2021.01+dfsg/debian/control --- u-boot-2021.01+dfsg/debian/control 2021-05-22 23:02:27.000000000 +0000 +++ u-boot-2021.01+dfsg/debian/control 2021-06-04 00:18:15.000000000 +0000 @@ -29,7 +29,6 @@ gcc-aarch64-linux-gnu [!arm64], gcc-riscv64-linux-gnu [!riscv64], gcc-x86-64-linux-gnu [!amd64], - gcc-powerpc-linux-gnu [!powerpc], Rules-Requires-Root: no Standards-Version: 4.5.1 Homepage: https://www.denx.de/wiki/U-Boot/ @@ -39,8 +38,7 @@ 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], u-boot-qemu [mips] +Depends: ${misc:Depends}, u-boot-qemu [mips] 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 @@ -64,22 +62,6 @@ This package includes boot loaders for various amlogic platforms. ${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-qemu Architecture: all Depends: ${misc:Depends} @@ -96,86 +78,6 @@ This package includes boot loaders for qemu/kvm. ${uboot:platforms} -Package: u-boot-qcom -Architecture: arm64 -Multi-Arch: same -Depends: ${misc:Depends} -Description: A boot loader for qcom 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 qcom platforms. - ${uboot:platforms} - -Package: u-boot-tegra -Architecture: armhf arm64 -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 NVIDIA 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 NVIDIA 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 arm64 -Multi-Arch: same -Built-Using: ${uboot:Built-Using} -Depends: ${misc:Depends} -Recommends: arm-trusted-firmware [arm64], u-boot-tools [arm64] -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-mvebu Architecture: arm64 Multi-Arch: same @@ -190,22 +92,6 @@ This package includes boot loaders for various Marvell platforms. ${uboot:platforms} -Package: u-boot-rockchip -Architecture: armhf arm64 -Multi-Arch: same -Built-Using: ${uboot:Built-Using} -Depends: ${misc:Depends} -Recommends: python3, arm-trusted-firmware [arm64], u-boot-tools [arm64] -Description: A boot loader for rockchip 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-rpi Architecture: armel armhf arm64 Multi-Arch: same diff -Nru u-boot-2021.01+dfsg/debian/rules u-boot-2021.01+dfsg/debian/rules --- u-boot-2021.01+dfsg/debian/rules 2021-05-22 23:02:27.000000000 +0000 +++ u-boot-2021.01+dfsg/debian/rules 2021-06-04 00:18:15.000000000 +0000 @@ -84,7 +84,6 @@ all:mips) export CROSS_COMPILE=mips-linux-gnu- ;;\ all:mipsel) export CROSS_COMPILE=mipsel-linux-gnu- ;;\ all:mips64el) export CROSS_COMPILE=mips64el-linux-gnuabi64- ;;\ - all:powerpc) export CROSS_COMPILE=powerpc-linux-gnu- ;;\ all:riscv64) export CROSS_COMPILE=riscv64-linux-gnu- ;;\ all:i386) export CROSS_COMPILE=i686-linux-gnu- ;;\ all:amd64) export CROSS_COMPILE=x86_64-linux-gnu- ;;\ diff -Nru u-boot-2021.01+dfsg/debian/targets u-boot-2021.01+dfsg/debian/targets --- u-boot-2021.01+dfsg/debian/targets 2021-05-22 23:02:27.000000000 +0000 +++ u-boot-2021.01+dfsg/debian/targets 2021-06-04 00:18:15.000000000 +0000 @@ -10,173 +10,16 @@ # Vagrant Cascadian , rpi B 256M armel rpi rpi u-boot.bin +armhf rpi rpi u-boot.bin # Romain Perier , rpi zero w armel rpi rpi_0_w u-boot.bin +armhf rpi rpi_0_w u-boot.bin # drEagle # Rick Thomas armel - sheevaplug u-boot.kwb -armhf exynos arndale u-boot.bin spl/arndale-spl.bin - -# Joost van Zwieten , Odroid-U3 -armhf exynos odroid u-boot.bin - -# Vagrant Cascadian , Odroid-XU4 -armhf exynos odroid-xu3 u-boot.bin - -# Marek Vasut -armhf imx dh_imx6 u-boot-with-spl.imx - -# Robert Nelson -armhf imx mx53loco u-boot.imx - -# Steve Langasek , CuBox-i4 -# Vagrant Cascadian , CuBox-i4pro, Cubox-i4x4, hummingboard-i1, hummingboard-i2ex -# Rainer Dorsch , CuBox-i2u (i2u-300-d) -# Rick Thomas , Cubox-i4x4, Cubox-i4PRO -armhf imx mx6cuboxi u-boot.img SPL - -# Martyn Welch -armhf imx mx6qsabrelite u-boot-dtb.imx - -# Hector Oron -armhf imx nitrogen6q u-boot-dtb.imx - -# Vagrant Cascadian -armhf imx novena u-boot.img SPL -armhf imx novena-rawsd SPL - -# Michael Fladischer -armhf imx udoo u-boot.img SPL - -# Vagrant Cascadian -armhf imx usbarmory u-boot.imx - -# Vagrant Cascadian -# Robert Nelson -armhf imx wandboard u-boot.img SPL - -# Vagrant Cascadian -# Andrew M.A. Cater -armhf omap am335x_boneblack u-boot.img MLO -armhf omap am335x_evm u-boot.img MLO - -# Vagrant Cascadian -armhf omap am57xx_evm u-boot.img MLO - -armhf omap dra7xx_evm u-boot.img MLO - -# Robert Nelson -armhf omap igep00x0 u-boot.img MLO - -armhf omap nokia_rx51 u-boot.bin - -# Robert Nelson -armhf omap omap3_beagle u-boot.img MLO - -# Robert Nelson -armhf omap omap4_panda u-boot.img MLO - -# Vagrant Cascadian , 2GB and 4GB variants -armhf rockchip firefly-rk3288 u-boot.bin u-boot.img spl/u-boot-spl.bin idbloader.img - -# Vagrant Cascadian , Raspberry PI 2B -armhf rpi rpi_2 u-boot.bin - -# Ryan Finnie -armhf rpi rpi_3_32b u-boot.bin - -# Lucas Nussbaum -# Andreas Henriksson -armhf rpi rpi_4_32b u-boot.bin - -# 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 - -# Andreas B. Mundt -armhf sunxi A20-OLinuXino-Lime2-eMMC 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 - -# Lucas Nussbaum -armhf sunxi bananapi_m2_berry u-boot-sunxi-with-spl.bin - -# Bernhard Wörner -armhf sunxi Bananapi_M2_Ultra u-boot-sunxi-with-spl.bin - -# Vagrant Cascadian -armhf sunxi CHIP u-boot-sunxi-with-spl.bin - -# Vagrant Cascadian -armhf sunxi Cubieboard u-boot-sunxi-with-spl.bin - -# Ian Campbell -# Karsten Merker -armhf sunxi Cubieboard2 u-boot-sunxi-with-spl.bin - -# Vagrant Cascadian -armhf sunxi Cubieboard4 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 Cubietruck_plus 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 - -# Paul Tagliamonte -armhf sunxi nanopi_neo u-boot-sunxi-with-spl.bin - -# Philip Hands -armhf sunxi nanopi_neo_air u-boot-sunxi-with-spl.bin - -# Vagrant Cascadian , Orange PI Plus2 -armhf sunxi orangepi_plus u-boot-sunxi-with-spl.bin - -# Mateusz Łukasik , Orange PI Zero -armhf sunxi orangepi_zero u-boot-sunxi-with-spl.bin - -# Bernhard -armhf sunxi Sinovoip_BPI_M3 u-boot-sunxi-with-spl.bin - -# Ian Campbell -armhf tegra jetson-tk1 u-boot-tegra.bin - # Neil Armstrong arm64 amlogic khadas-vim u-boot.bin arm64 amlogic khadas-vim2 u-boot.bin @@ -279,6 +122,5 @@ all:armhf qemu qemu_arm u-boot.bin all:arm64 qemu qemu_arm64 u-boot.bin all:i386 qemu qemu-x86 u-boot.bin u-boot.rom -all:powerpc qemu qemu-ppce500 u-boot.bin all:riscv64 qemu qemu-riscv64 u-boot.bin all:riscv64 qemu qemu-riscv64_smode u-boot.bin diff -Nru u-boot-2021.01+dfsg/debian/u-boot-exynos.substvars u-boot-2021.01+dfsg/debian/u-boot-exynos.substvars --- u-boot-2021.01+dfsg/debian/u-boot-exynos.substvars 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2021.01+dfsg/debian/u-boot-exynos.substvars 2021-06-04 00:18:15.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends= diff -Nru u-boot-2021.01+dfsg/debian/u-boot-imx.substvars u-boot-2021.01+dfsg/debian/u-boot-imx.substvars --- u-boot-2021.01+dfsg/debian/u-boot-imx.substvars 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2021.01+dfsg/debian/u-boot-imx.substvars 2021-06-04 00:18:15.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends= diff -Nru u-boot-2021.01+dfsg/debian/u-boot-omap.substvars u-boot-2021.01+dfsg/debian/u-boot-omap.substvars --- u-boot-2021.01+dfsg/debian/u-boot-omap.substvars 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2021.01+dfsg/debian/u-boot-omap.substvars 2021-06-04 00:18:15.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends= diff -Nru u-boot-2021.01+dfsg/debian/u-boot-sunxi.substvars u-boot-2021.01+dfsg/debian/u-boot-sunxi.substvars --- u-boot-2021.01+dfsg/debian/u-boot-sunxi.substvars 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2021.01+dfsg/debian/u-boot-sunxi.substvars 2021-06-04 00:18:15.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends=