--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package flash-kernel (both deb and udeb).
We have received a report on debian-arm (see
https://lists.debian.org/debian-arm/2015/04/msg00016.html and bug
#782016) that running d-i on a Cubox-i4pro (armhf system) worked
without problems on a serial console, but that the installed
system did not appear to come up. The source of the problem was
that the boot script which is installed by flash-kernel into the
final system on Cubox hardware does not pass the u-boot console
variable to the kernel, so the kernel actually boots, but the
user has no way to interact with it. The boot script used by the
installer itself passes the console variable, which is why
running the installer worked without problems.
Checking the other boot scripts used by flash-kernel showed that
the boot script for the Wandboard has the same issue, therefore
bootscr.cubox-i and bootscr.wandboard have been amended to pass
the u-boot console variable to the kernel.
The changes have been tested on the Cubox-i4pro (by Rick Thomas,
the original reporter) and on the Wandboard (by Vagrant
Cascadian). While Vagrant was doing tests on different Wandboard
models, we found that the flash-kernel machine database has an
entry for the Wandboard Quad, but not for the Wandboard Solo/Dual
Lite (same baseboard, but using a stripped-down single/dual-core
variant of the i.MX6 SoC). Vagrant has supplied an appropriate
machine stanza (which covers both the Solo and the Dual Lite) and
I have included it. As the machine db entry does not influence
any existing code, I conside this addition suitable for Jessie
despite the freeze.
Following is the debdiff between flash-kernel 3.34 and 3.35:
diff -Nru flash-kernel-3.34/bootscript/bootscr.cubox-i flash-kernel-3.35/bootscript/bootscr.cubox-i
--- flash-kernel-3.34/bootscript/bootscr.cubox-i 2015-03-26 22:37:26.000000000 +0100
+++ flash-kernel-3.35/bootscript/bootscr.cubox-i 2015-04-06 15:34:11.000000000 +0200
@@ -2,6 +2,15 @@
setenv device mmc
setenv partition ${mmcdev}:${mmcpart}
+
+if test "${console}" = "ttymxc0" && test -n "${baudrate}"; then
+ setenv console "${console},${baudrate}"
+fi
+
+if test -n "${console}"; then
+ setenv bootargs "${bootargs} console=${console}"
+fi
+
setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@
image_locations='/boot/ /'
diff -Nru flash-kernel-3.34/bootscript/bootscr.wandboard flash-kernel-3.35/bootscript/bootscr.wandboard
--- flash-kernel-3.34/bootscript/bootscr.wandboard 2015-03-26 22:37:26.000000000 +0100
+++ flash-kernel-3.35/bootscript/bootscr.wandboard 2015-04-06 15:34:11.000000000 +0200
@@ -5,6 +5,15 @@
if test -z "${ramdiskaddr}" ; then
setenv ramdiskaddr 0x13000000
fi
+
+if test "${console}" = "ttymxc0" && test -n "${baudrate}"; then
+ setenv console "${console},${baudrate}"
+fi
+
+if test -n "${console}"; then
+ setenv bootargs "${bootargs} console=${console}"
+fi
+
setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@
image_locations='/boot/ /'
diff -Nru flash-kernel-3.34/db/all.db flash-kernel-3.35/db/all.db
--- flash-kernel-3.34/db/all.db 2015-03-26 22:37:26.000000000 +0100
+++ flash-kernel-3.35/db/all.db 2015-04-07 00:19:51.000000000 +0200
@@ -614,6 +614,13 @@
Android-Boot-Device: /dev/mmcblk0
Required-Packages: abootimg
+Machine: Wandboard i.MX6 Dual Lite Board
+Kernel-Flavors: armmp
+DTB-Id: imx6dl-wandboard.dtb
+Boot-Script-Path: /boot/boot.scr
+U-Boot-Script-Name: bootscr.wandboard
+Required-Packages: u-boot-tools
+
Machine: Wandboard i.MX6 Quad Board
Kernel-Flavors: armmp
DTB-Id: imx6q-wandboard.dtb
diff -Nru flash-kernel-3.34/debian/changelog flash-kernel-3.35/debian/changelog
--- flash-kernel-3.34/debian/changelog 2015-03-26 22:37:26.000000000 +0100
+++ flash-kernel-3.35/debian/changelog 2015-04-07 00:33:25.000000000 +0200
@@ -1,3 +1,15 @@
+flash-kernel (3.35) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Karsten Merker ]
+ * Pass the u-boot console variable to the kernel in bootscr.cubox-i
+ and bootscr.wandboard. (Closes: #782016)
+ * Add a machine db entry for the Wandboard Dual Lite / Solo,
+ supplied by Vagrant Cascadian.
+
+ -- Karsten Merker <merker@debian.org> Tue, 07 Apr 2015 00:19:59 +0200
+
flash-kernel (3.34) unstable; urgency=medium
* Update u-boot-tools to Recommends. In practice it is needed on most systems
unblock flash-kernel/3.35
-- System Information:
Debian Release: 7.8
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: armhf
Kernel: Linux 3.19.3 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
Gem. Par. 28 Abs. 4 Bundesdatenschutzgesetz widerspreche ich der Nutzung
sowie der Weitergabe meiner personenbezogenen Daten für Zwecke der
Werbung sowie der Markt- oder Meinungsforschung.
--- End Message ---