[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#985922: unblock: u-boot/2021.01+dfsg-4



Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: vagrant@debian.org, debian-boot@lists.debian.org
Severity: normal

Please unblock package u-boot

[ Reason ]

This version adds support for the pinetab platform and fixes a bug that
fails to detect some pinephone platforms. This also re-adds debugging
symbols that were lost late in the bullseye release cycle due to
upstream buildsystem changes.

[ Impact ]

Hardware support for another platform (pinetab) and working
installation process for another platform (pinephone). Ability to
debug u-boot using debugging symbols.

[ Tests ]

None.

[ Risks ]

Very low risk to existing platforms as this involves no code changes to
u-boot itself.  Increases the installed size (~2MB) and .deb size
nominally for the u-boot-sunxi:arm64 package.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]

This is depended on by debian-installer for the arm64/armhf images, so
leaving this in a blocked state could impact debian-installer update
process.


unblock u-boot/2021.01+dfsg-4


Thanks for your work managing the release!


live well,
  vagrant

diff -Nru u-boot-2021.01+dfsg/debian/bin/u-boot-install-sunxi u-boot-2021.01+dfsg/debian/bin/u-boot-install-sunxi
--- u-boot-2021.01+dfsg/debian/bin/u-boot-install-sunxi	2021-02-28 18:14:48.000000000 -0800
+++ u-boot-2021.01+dfsg/debian/bin/u-boot-install-sunxi	2021-03-12 11:10:45.000000000 -0800
@@ -38,7 +38,9 @@
 		"OrangePi Zero Plus2") TARGET="/usr/lib/u-boot/orangepi_zero_plus2/" ;;
 		"OrangePi One Plus") TARGET="/usr/lib/u-boot/orangepi_one_plus/" ;;
 		"Pinebook") TARGET="/usr/lib/u-boot/pinebook" ;;
-		"Pine64 PinePhone (1."[12]")") TARGET='/usr/lib/u-boot/pinephone' ;;
+		"Pine64 PinePhone Braveheart (1.1)") TARGET='/usr/lib/u-boot/pinephone' ;;
+		"Pine64 PinePhone (1.2)") TARGET='/usr/lib/u-boot/pinephone' ;;
+		"PineTab") TARGET="/usr/lib/u-boot/pinetab" ;;
 		"Pine64+") TARGET="/usr/lib/u-boot/pine64_plus" ;;
 		"Pine64 LTS") TARGET="/usr/lib/u-boot/pine64-lts" ;;
 		"PineRiver Mini X-Plus") TARGET="/usr/lib/u-boot/Mini-X" ;;
diff -Nru u-boot-2021.01+dfsg/debian/changelog u-boot-2021.01+dfsg/debian/changelog
--- u-boot-2021.01+dfsg/debian/changelog	2021-03-01 00:00:18.000000000 -0800
+++ u-boot-2021.01+dfsg/debian/changelog	2021-03-12 15:00:43.000000000 -0800
@@ -1,3 +1,18 @@
+u-boot (2021.01+dfsg-4) unstable; urgency=medium
+
+  [ Arnaud Ferraris ]
+  * Add support for the pinetab platform (Closes: #982982)
+  * u-boot-install-sunxi: fix device tree model for PinePhone 1.1
+    (Closes: #984704)
+
+  [ Vagrant Cascadian ]
+  * debian/patches: Update PineTab patch use default bootdelay.
+  * debian/patches: Add Forwarded link to PineTab patch.
+  * debian/rules: Ensure debugging symbols are enabled.
+  * debian/rules: Pass argument to remove build path from debug symbols.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 12 Mar 2021 15:00:43 -0800
+
 u-boot (2021.01+dfsg-3) unstable; urgency=medium
 
   [ Domenico Andreoli ]
diff -Nru u-boot-2021.01+dfsg/debian/patches/pinetab/0001-configs-add-PineTab-defconfig.patch u-boot-2021.01+dfsg/debian/patches/pinetab/0001-configs-add-PineTab-defconfig.patch
--- u-boot-2021.01+dfsg/debian/patches/pinetab/0001-configs-add-PineTab-defconfig.patch	1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2021.01+dfsg/debian/patches/pinetab/0001-configs-add-PineTab-defconfig.patch	2021-03-12 11:15:15.000000000 -0800
@@ -0,0 +1,45 @@
+From 2c346cacb4b0841051bceb27a57058020860ab8b Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Wed, 2 Sep 2020 09:53:50 +0200
+Subject: [PATCH] configs: add PineTab defconfig
+Forwarded: https://patchwork.ozlabs.org/project/uboot/list/?series=232582
+
+The PineTab device-tree is already in u-boot, this commit adds the corresponding
+defconfig, based on pinephone_defconfig.
+
+Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+
+---
+ configs/pinetab_defconfig | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+ create mode 100644 configs/pinetab_defconfig
+
+diff --git a/configs/pinetab_defconfig b/configs/pinetab_defconfig
+new file mode 100644
+index 0000000000..71dda9f5d9
+--- /dev/null
++++ b/configs/pinetab_defconfig
+@@ -0,0 +1,20 @@
++CONFIG_ARM=y
++CONFIG_ARCH_SUNXI=y
++CONFIG_SPL=y
++CONFIG_IDENT_STRING=""
++CONFIG_MACH_SUN50I=y
++CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y
++CONFIG_DRAM_CLK=552
++CONFIG_DRAM_ZQ=3881949
++CONFIG_MMC_SUNXI_SLOT_EXTRA=2
++# CONFIG_VIDEO_DE2 is not set
++CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pinetab"
++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++CONFIG_SYS_CONSOLE_INFO_QUIET=y
++# CONFIG_DISPLAY_CPUINFO is not set
++# CONFIG_DISPLAY_BOARDINFO is not set
++# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
++# CONFIG_SPL_BANNER_PRINT is not set
++# CONFIG_SPL_POWER_SUPPORT is not set
++# CONFIG_NET is not set
++# CONFIG_EFI_LOADER is not set
+-- 
+2.28.0
+
diff -Nru u-boot-2021.01+dfsg/debian/patches/series u-boot-2021.01+dfsg/debian/patches/series
--- u-boot-2021.01+dfsg/debian/patches/series	2021-02-28 16:59:12.000000000 -0800
+++ u-boot-2021.01+dfsg/debian/patches/series	2021-03-12 13:17:18.000000000 -0800
@@ -19,3 +19,5 @@
 n900/bootz_and_raw_initrd.patch
 
 rk3399/disable-preboot
+
+pinetab/0001-configs-add-PineTab-defconfig.patch
diff -Nru u-boot-2021.01+dfsg/debian/rules u-boot-2021.01+dfsg/debian/rules
--- u-boot-2021.01+dfsg/debian/rules	2021-02-28 19:57:51.000000000 -0800
+++ u-boot-2021.01+dfsg/debian/rules	2021-03-12 13:33:38.000000000 -0800
@@ -32,6 +32,9 @@
 TARGETSUBARCH = $(patsubst pkg.uboot.subarch.%,%,$(filter pkg.uboot.subarch.%,$(DEB_BUILD_PROFILES)))
 endif
 
+# Enable debugging symbols and remove build paths
+export HOSTCFLAGS = -g -ffile-prefix-map=$(CURDIR)=.
+
 %:
 	dh $@
 
diff -Nru u-boot-2021.01+dfsg/debian/targets u-boot-2021.01+dfsg/debian/targets
--- u-boot-2021.01+dfsg/debian/targets	2021-02-28 17:24:30.000000000 -0800
+++ u-boot-2021.01+dfsg/debian/targets	2021-03-12 11:10:05.000000000 -0800
@@ -259,6 +259,9 @@
 # Arnaud Ferraris <arnaud.ferraris@collabora.com> (1.1, 1.2)
 arm64	sunxi		pinephone	/usr/lib/arm-trusted-firmware/sun50i_a64/bl31.bin u-boot.bin spl/sunxi-spl.bin u-boot-nodtb.bin arch/arm/dts/sun50i-a64-pinephone-1.1.dtb arch/arm/dts/sun50i-a64-pinephone-1.2.dtb u-boot-sunxi-with-spl.fit.itb
 
+# Arnaud Ferraris <arnaud.ferraris@collabora.com>
+arm64	sunxi		pinetab		/usr/lib/arm-trusted-firmware/sun50i_a64/bl31.bin u-boot.bin spl/sunxi-spl.bin u-boot-nodtb.bin arch/arm/dts/sun50i-a64-pinetab.dtb u-boot-sunxi-with-spl.fit.itb
+
 # Jonas Smedegaard <dr@jones.dk>
 arm64	sunxi		teres_i		/usr/lib/arm-trusted-firmware/sun50i_a64/bl31.bin u-boot.bin spl/sunxi-spl.bin u-boot-nodtb.bin arch/arm/dts/sun50i-a64-teres-i.dtb u-boot-sunxi-with-spl.fit.itb
 

Attachment: signature.asc
Description: PGP signature


Reply to: