Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Thanks for all your work on the release team!
Please unblock package u-boot
It includes backported support for two new armhf capable boards,
BananaPro and A20-OlinuXino-LIME2. Lintian overrides appropriate for
these two boards were also added. Support for these boards has also
been backported to linux, and enabled in debian-installer and
flash-kernel. Adding support in u-boot would make these boards fully
supported in jessie.
Addition of these two boards should pose no problems for other existing
builds, and only increases the size of the u-boot-sunxi package by about
2MB.
The new version also fixes a FTBFS issue when built using newer versions
of patch, as the cubox-i-support patch included a redundant file that
was already present in the sources, and patch no longer supports this
due to security issues (see bugs #777520 and #777518 for details on
that).
There was also a porter NMU done with a one-line patch to fix FTBFS on
sh4, which is included in the uploads since the version in jessie.
Unfortunately, There was some patch cruft in 2014.10+dfsg1-2 and one
added in 2014.10+dfsg1-4, which I've filtered out with filterdiff in the
debdiff below:
$ debdiff u-boot_2014.10+dfsg1-2.dsc u-boot_2014.10+dfsg1-4.dsc | filterdiff --exclude=u-boot-2014.10+dfsg1/debian/patches/patches/* --exclude=u-boot-2014.10+dfsg1/debian/0001*.patch
diff -Nru u-boot-2014.10+dfsg1/debian/0001-Backport-support-for-the-LeMaker-Banana-Pro-board-fr.patch u-boot-2014.10+dfsg1/debian/0001-Backport-support-for-the-LeMaker-Banana-Pro-board-fr.patch
diff -Nru u-boot-2014.10+dfsg1/debian/changelog u-boot-2014.10+dfsg1/debian/changelog
--- u-boot-2014.10+dfsg1/debian/changelog 2014-11-01 16:38:54.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/changelog 2015-03-08 11:13:14.000000000 -0700
@@ -1,3 +1,32 @@
+u-boot (2014.10+dfsg1-4) unstable; urgency=medium
+
+ [ Karsten Merker ]
+ * Backport support for the LeMaker Banana Pro board (Closes: #779908).
+
+ [ Vagrant Cascadian ]
+ * Update lintian rules for BananaPro and A20-OlinuXino-LIME2.
+
+ -- Vagrant Cascadian <vagrant@debian.org> Sun, 08 Mar 2015 11:13:07 -0700
+
+u-boot (2014.10+dfsg1-3) unstable; urgency=medium
+
+ * cubox-i-support.diff: Refresh patch, dropping solidrun.bmp, which
+ causes FTBFS with newer version of patch (Closes: #777518).
+
+ * Add patch to support A20-OLinuXino-LIME2, backported from u-boot
+ 2015.01. Thanks to Karsten Merker for the patch (Closes: #777466).
+
+ -- Vagrant Cascadian <vagrant@debian.org> Sat, 21 Feb 2015 13:13:31 -0800
+
+u-boot (2014.10+dfsg1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches:
+ - Add sh4-fix-linker-name-prefix.patch to use the proper
+ linker name prefix on sh4. Fixes FTBFS. (Closes: #771747)
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Thu, 11 Dec 2014 00:00:08 +0100
+
u-boot (2014.10+dfsg1-2) unstable; urgency=medium
[ Steve Langasek ]
diff -Nru u-boot-2014.10+dfsg1/debian/patches/A20-OLinuXino-LIME2/sun7i-Add-support-for-Olimex-A20-OLinuXino-LIME2.patch u-boot-2014.10+dfsg1/debian/patches/A20-OLinuXino-LIME2/sun7i-Add-support-for-Olimex-A20-OLinuXino-LIME2.patch
--- u-boot-2014.10+dfsg1/debian/patches/A20-OLinuXino-LIME2/sun7i-Add-support-for-Olimex-A20-OLinuXino-LIME2.patch 1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2014.10+dfsg1/debian/patches/A20-OLinuXino-LIME2/sun7i-Add-support-for-Olimex-A20-OLinuXino-LIME2.patch 2015-03-08 11:03:53.000000000 -0700
@@ -0,0 +1,99 @@
+From d71910fc509933fab881f85ae244ea95525a41d6 Mon Sep 17 00:00:00 2001
+From: Iain Paton <ipaton0@gmail.com>
+Date: Sun, 28 Sep 2014 14:18:42 +0100
+Subject: [PATCH 1/1] sun7i: Add support for Olimex A20-OLinuXino-LIME2
+Origin: http://git.denx.de/?p=u-boot.git;a=patch;h=d71910fc509933fab881f85ae244ea95525a41d6;hp=5b3ee386fde82a1ba42ff09b95247842c9a1585e
+
+This adds support for the Olimex A20-OLinuXino-Lime2
+https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2
+
+Differences to previous Lime boards are 1GB RAM and gigabit ethernet
+
+Signed-off-by: Iain Paton <ipaton0@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ board/sunxi/MAINTAINERS | 6 ++++++
+ board/sunxi/Makefile | 1 +
+ board/sunxi/dram_a20_olinuxino_l2.c | 31 +++++++++++++++++++++++++++++++
+ configs/A20-OLinuXino-Lime2_defconfig | 5 +++++
+ 4 files changed, 43 insertions(+)
+ create mode 100644 board/sunxi/dram_a20_olinuxino_l2.c
+ create mode 100644 configs/A20-OLinuXino-Lime2_defconfig
+
+diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
+index 4f32195..4ed82cf 100644
+--- a/board/sunxi/MAINTAINERS
++++ b/board/sunxi/MAINTAINERS
+@@ -38,3 +38,9 @@ M: FUKAUMI Naoki <naobsd@gmail.com>
+ S: Maintained
+ F: board/sunxi/dram_a20_olinuxino_l.c
+ F: configs/A20-OLinuXino-Lime_defconfig
++
++A20-OLINUXINO-LIME2 BOARD
++M: Iain Paton <ipaton0@gmail.com>
++S: Maintained
++F: board/sunxi/dram_a20_olinuxino_l2.c
++F: configs/A20-OLinuXino-Lime2_defconfig
+diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile
+index 56073a0..d63a6d2 100644
+--- a/board/sunxi/Makefile
++++ b/board/sunxi/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_A10S_OLINUXINO_M) += dram_a10s_olinuxino_m.o
+ obj-$(CONFIG_A13_OLINUXINO) += dram_a13_olinuxino.o
+ obj-$(CONFIG_A13_OLINUXINOM) += dram_a13_oli_micro.o
+ obj-$(CONFIG_A20_OLINUXINO_L) += dram_a20_olinuxino_l.o
++obj-$(CONFIG_A20_OLINUXINO_L2) += dram_a20_olinuxino_l2.o
+ obj-$(CONFIG_A20_OLINUXINO_M) += dram_sun7i_384_1024_iow16.o
+ # This is not a typo, uses the same mem settings as the a10s-olinuxino-m
+ obj-$(CONFIG_AUXTEK_T004) += dram_a10s_olinuxino_m.o
+diff --git a/board/sunxi/dram_a20_olinuxino_l2.c b/board/sunxi/dram_a20_olinuxino_l2.c
+new file mode 100644
+index 0000000..2115d37
+--- /dev/null
++++ b/board/sunxi/dram_a20_olinuxino_l2.c
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++ .clock = 480,
++ .type = 3,
++ .rank_num = 1,
++ .density = 4096,
++ .io_width = 16,
++ .bus_width = 32,
++ .cas = 9,
++ .zq = 0x7f,
++ .odt_en = 0,
++ .size = 1024,
++ .tpr0 = 0x42d899b7,
++ .tpr1 = 0xa090,
++ .tpr2 = 0x22a00,
++ .tpr3 = 0,
++ .tpr4 = 0,
++ .tpr5 = 0,
++ .emr1 = 0x4,
++ .emr2 = 0x10,
++ .emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++ return dramc_init(&dram_para);
++}
+diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
+new file mode 100644
+index 0000000..75ef872
+--- /dev/null
++++ b/configs/A20-OLinuXino-Lime2_defconfig
+@@ -0,0 +1,5 @@
++CONFIG_SPL=y
++CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_L2,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
++CONFIG_FDTFILE="sun7i-a20-olinuxino-lime2.dtb"
+++S:CONFIG_ARM=y
+++S:CONFIG_TARGET_SUN7I=y
+--
+1.7.10.4
+
diff -Nru u-boot-2014.10+dfsg1/debian/patches/BananaPro/Add-support-for-the-LeMaker-Banana-Pro.patch u-boot-2014.10+dfsg1/debian/patches/BananaPro/Add-support-for-the-LeMaker-Banana-Pro.patch
--- u-boot-2014.10+dfsg1/debian/patches/BananaPro/Add-support-for-the-LeMaker-Banana-Pro.patch 1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2014.10+dfsg1/debian/patches/BananaPro/Add-support-for-the-LeMaker-Banana-Pro.patch 2015-03-08 11:03:53.000000000 -0700
@@ -0,0 +1,48 @@
+Index: u-boot-2014.10+dfsg1/board/sunxi/MAINTAINERS
+===================================================================
+--- u-boot-2014.10+dfsg1.orig/board/sunxi/MAINTAINERS
++++ u-boot-2014.10+dfsg1/board/sunxi/MAINTAINERS
+@@ -19,6 +19,7 @@ F: configs/r7-tv-dongle_defconfig
+ F: include/configs/sun7i.h
+ F: configs/A20-OLinuXino_MICRO_defconfig
+ F: configs/Bananapi_defconfig
++F: configs/Bananapro_defconfig
+ F: configs/i12-tvbox_defconfig
+ F: configs/Linksprite_pcDuino3_defconfig
+ F: configs/qt840a_defconfig
+Index: u-boot-2014.10+dfsg1/board/sunxi/Makefile
+===================================================================
+--- u-boot-2014.10+dfsg1.orig/board/sunxi/Makefile
++++ u-boot-2014.10+dfsg1/board/sunxi/Makefile
+@@ -22,6 +22,7 @@ obj-$(CONFIG_A20_OLINUXINO_M) += dram_su
+ obj-$(CONFIG_AUXTEK_T004) += dram_a10s_olinuxino_m.o
+ obj-$(CONFIG_BA10_TV_BOX) += dram_sun4i_384_1024_iow8.o
+ obj-$(CONFIG_BANANAPI) += dram_bananapi.o
++obj-$(CONFIG_BANANAPRO) += dram_bananapi.o
+ obj-$(CONFIG_CUBIEBOARD) += dram_cubieboard.o
+ obj-$(CONFIG_CUBIEBOARD2) += dram_cubieboard2.o
+ obj-$(CONFIG_CUBIETRUCK) += dram_cubietruck.o
+Index: u-boot-2014.10+dfsg1/board/sunxi/gmac.c
+===================================================================
+--- u-boot-2014.10+dfsg1.orig/board/sunxi/gmac.c
++++ u-boot-2014.10+dfsg1/board/sunxi/gmac.c
+@@ -29,7 +29,7 @@ int sunxi_gmac_initialize(bd_t *bis)
+ * need to set bits 10-12 GTXDC "GMAC Transmit Clock Delay Chain"
+ * of the GMAC clk register to 3.
+ */
+-#ifdef CONFIG_BANANAPI
++#if defined CONFIG_BANANAPI || defined CONFIG_BANANAPRO
+ setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10);
+ #endif
+
+Index: u-boot-2014.10+dfsg1/configs/Bananapro_defconfig
+===================================================================
+--- /dev/null
++++ u-boot-2014.10+dfsg1/configs/Bananapro_defconfig
+@@ -0,0 +1,6 @@
++CONFIG_SPL=y
++CONFIG_SYS_EXTRA_OPTIONS="BANANAPRO,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPH(0),SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(1)"
++CONFIG_FDTFILE="sun7i-a20-bananapro.dtb"
+++S:CONFIG_ARM=y
+++S:CONFIG_TARGET_SUN7I=y
++
diff -Nru u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-support.diff u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-support.diff
--- u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-support.diff 2014-11-01 16:32:05.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-support.diff 2015-03-08 11:03:53.000000000 -0700
@@ -3290,7 +3290,3 @@
htab, htab->filled, htab->size,
rv, name, value);
} while ((dp < data + size) && *dp); /* size check needed for text */
-diff --git a/tools/logos/solidrun.bmp b/tools/logos/solidrun.bmp
-new file mode 100644
-index 0000000..93db1f8
-Binary files /dev/null and b/tools/logos/solidrun.bmp differ
diff -Nru u-boot-2014.10+dfsg1/debian/patches/patches/0001-Add-support-for-the-Arndale-board.patch u-boot-2014.10+dfsg1/debian/patches/patches/0001-Add-support-for-the-Arndale-board.patch
diff -Nru u-boot-2014.10+dfsg1/debian/patches/patches/0002-arndale-Enable-distro-defaults-and-distro-config.patch u-boot-2014.10+dfsg1/debian/patches/patches/0002-arndale-Enable-distro-defaults-and-distro-config.patch
diff -Nru u-boot-2014.10+dfsg1/debian/patches/patches/0003-Move-arndale-to-its-own-subarch-pacakge.patch u-boot-2014.10+dfsg1/debian/patches/patches/0003-Move-arndale-to-its-own-subarch-pacakge.patch
diff -Nru u-boot-2014.10+dfsg1/debian/patches/series u-boot-2014.10+dfsg1/debian/patches/series
--- u-boot-2014.10+dfsg1/debian/patches/series 2014-11-01 15:17:22.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/patches/series 2015-03-08 11:03:53.000000000 -0700
@@ -39,3 +39,8 @@
arndale/exynos-Enable-config_distro_defaults.h.patch
arndale/exynos5-Use-config_distro_bootcmd.h.patch
+sh4-fix-linker-name-prefix.patch
+
+A20-OLinuXino-LIME2/sun7i-Add-support-for-Olimex-A20-OLinuXino-LIME2.patch
+
+BananaPro/Add-support-for-the-LeMaker-Banana-Pro.patch
diff -Nru u-boot-2014.10+dfsg1/debian/patches/sh4-fix-linker-name-prefix.patch u-boot-2014.10+dfsg1/debian/patches/sh4-fix-linker-name-prefix.patch
--- u-boot-2014.10+dfsg1/debian/patches/sh4-fix-linker-name-prefix.patch 1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2014.10+dfsg1/debian/patches/sh4-fix-linker-name-prefix.patch 2015-03-08 11:03:53.000000000 -0700
@@ -0,0 +1,30 @@
+Description: sh4-fix-linker-name-prefix.patch
+ u-boot currently fails to build from source on sh4 since the
+ linker name prefix defined in arch/sh/config.mk is outdated.
+ On current Debian installations, the binaries of the GNU
+ toolchain are named using the triplett scheme
+ $arch-$kernel-$toolchain. Thus, on sh4, the proper name
+ is "sh4-linux-gnu-ld" instead of "sh4-linux-ld". This
+ patch updates build configuration on sh4 to reflect that.
+
+---
+
+Origin: Debian
+Bug: (none yet)
+Bug-Debian: https://bugs.debian.org/771747
+Bug-Ubuntu: (none)
+Forwarded: (not yet)
+Reviewed-By: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+Last-Update: 2014-12-10
+
+--- u-boot-2014.10+dfsg1.orig/arch/sh/config.mk
++++ u-boot-2014.10+dfsg1/arch/sh/config.mk
+@@ -6,7 +6,7 @@
+ #
+
+ ifeq ($(CROSS_COMPILE),)
+-CROSS_COMPILE := sh4-linux-
++CROSS_COMPILE := sh4-linux-gnu-
+ endif
+
+ CONFIG_STANDALONE_LOAD_ADDR ?= 0x8C000000
diff -Nru u-boot-2014.10+dfsg1/debian/targets u-boot-2014.10+dfsg1/debian/targets
--- u-boot-2014.10+dfsg1/debian/targets 2014-11-01 15:17:22.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/targets 2015-03-08 11:03:53.000000000 -0700
@@ -23,10 +23,16 @@
# Christian Kastner <debian@kvr.at>
armhf sunxi A20-OLinuXino-Lime u-boot-sunxi-with-spl.bin
+# Karsten Merker <merker@debian.org>
+armhf sunxi A20-OLinuXino-Lime2 u-boot-sunxi-with-spl.bin
+
# Ian Campbell <ijc@hellion.org.uk>
# Vagrant Cascadian <vagrant@debian.org>
armhf sunxi Bananapi u-boot-sunxi-with-spl.bin
+# Karsten Merker <merker@debian.org>
+armhf sunxi Bananapro u-boot-sunxi-with-spl.bin
+
# Vagrant Cascadian <vagrant@debian.org>
armhf sunxi Cubieboard u-boot-sunxi-with-spl.bin
diff -Nru u-boot-2014.10+dfsg1/debian/u-boot-sunxi.lintian-overrides u-boot-2014.10+dfsg1/debian/u-boot-sunxi.lintian-overrides
--- u-boot-2014.10+dfsg1/debian/u-boot-sunxi.lintian-overrides 2014-11-01 15:17:22.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/u-boot-sunxi.lintian-overrides 2015-03-06 09:49:55.000000000 -0800
@@ -5,7 +5,9 @@
# the package for the architecture needed.
u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/A10-OLinuXino-Lime/uboot.elf
u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/A20-OLinuXino-Lime/uboot.elf
+u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/A20-OLinuXino-Lime2/uboot.elf
u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Bananapi/uboot.elf
+u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Bananapro/uboot.elf
u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Cubieboard/uboot.elf
u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Cubieboard2/uboot.elf
u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Cubietruck/uboot.elf
@@ -13,7 +15,9 @@
# These bootloaders need to be statically linked.
u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/A10-OLinuXino-Lime/uboot.elf
u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/A20-OLinuXino-Lime/uboot.elf
+u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/A20-OLinuXino-Lime2/uboot.elf
u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Bananapi/uboot.elf
+u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Bananapro/uboot.elf
u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Cubieboard/uboot.elf
u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Cubieboard2/uboot.elf
u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Cubietruck/uboot.elf
unblock u-boot/2014.10+dfsg1-4
live well,
vagrant
Attachment:
signature.asc
Description: PGP signature