Most systems encode the console baudrate in the ${console} variable, but
several i.MX6-based systems do not. As ${console} gets passed to the kernel,
we need to explicitly add the baudrate on i.MX6-based systems to avoid
a baudrate mismatch between u-boot and kernel.
---
build/boot/arm/bootscr.mainline_common | 5 +++++
debian/changelog | 3 +++
2 files changed, 8 insertions(+)
diff --git a/build/boot/arm/bootscr.mainline_common
b/build/boot/arm/bootscr.mainline_common
index 4dc6bf5..c68eb79 100644
--- a/build/boot/arm/bootscr.mainline_common
+++ b/build/boot/arm/bootscr.mainline_common
@@ -22,6 +22,11 @@ if test ! -e ${devtype} ${devnum}:${bootpart}
dtbs/${fdtfile}; then
exit 0
fi
+# Some i.MX6-based systems do not encode the baudrate in the console variable
+if test "${console}" = "ttymxc0" && test -n "${baudrate}"; then
+ setenv console "${console},${baudrate}"
+fi
+
if test -n "${console}"; then
setenv bootargs "${bootargs} console=${console}"
fi
diff --git a/debian/changelog b/debian/changelog
index 9020933..5754f48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ debian-installer (201410XX) UNRELEASED; urgency=medium
* Add SD-card image build support for hd-media builds on armhf.
* Add SD-card image and tftpboot tarball build support for netboot builds
on armhf.
+ * Make sure to pass the proper console baudrate to the kernel in
+ bootscr.mainline_common when booted on i.MX6-based systems that do not
+ encode the console baudrate in the ${console} variable.
[ Aurelien Jarno ]
* Add scsi-modules to the cdrom flavour on ppc64el to be able to access
--
2.1.4
--
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive:
https://lists.debian.org/1420124326-7070-7-git-send-email-mer...@debian.org
