Bug#788782: Need to add DTB settings for non-DTB Freescale MX53 LOCO Board too

[Ian Campbell <ijc@debian.org>]

On Sun, 2015-06-14 at 23:27 +0100, Steve McIntyre wrote:
> Package: flash-kernel
> Version: 3.35
> Severity: important
> 
> Looking at the settings for the two different stanzas for imx53,
> they're quite different for no good reason that I can see:

Probably just that it's not immediately obvious that QSB==Loco so
whoever added it missed it.

> The obvious fix is to clone the settings from the first stanza here to
> the second.

We actually support multiple Machine fields per stanza, for just this so
of case. I've merged them into a single (hopefully correct) entry (patch
below). I wasn't totally sure about moving the obsolete mx5 kernel
flavour over, but it seems harmless enough.

>  It's also worth checking any *other* supported machine
> types for the same bug. 

I had a look and nothing jumped out at me.

> This also *really* needs to be back-ported to stable!

Agreed.

So I can tell SRM if so -- do we use the LOCO as a buildd board still?

Ian.

diff --git a/db/all.db b/db/all.db
index a348f0d..f41aac6 100644
--- a/db/all.db
+++ b/db/all.db
@@ -131,7 +131,8 @@ Required-Packages: u-boot-tools
 Bootloader-Sets-Incorrect-Root: yes
 
 Machine: Freescale i.MX53 Quick Start Board
-Kernel-Flavors: armmp
+Machine: Freescale MX53 LOCO Board
+Kernel-Flavors: armmp mx5
 DTB-Id: imx53-qsb.dtb
 DTB-Append-From: 3.12
 Boot-DTB-Path: /boot/dtb
@@ -142,14 +143,6 @@ Boot-Initrd-Path: /boot/uInitrd
 Required-Packages: u-boot-tools
 Bootloader-Sets-Incorrect-Root: no
 
-Machine: Freescale MX53 LOCO Board
-Kernel-Flavors: armmp mx5
-U-Boot-Kernel-Address: 0x70008000
-U-Boot-Initrd-Address: 0x0
-Boot-Kernel-Path: /boot/uImage
-Boot-Initrd-Path: /boot/uInitrd
-Required-Packages: u-boot-tools
-
 Machine: Genesi Efika Smartbook
 Kernel-Flavors: armmp mx5
 U-Boot-Kernel-Address: 0x90008000
diff --git a/debian/changelog b/debian/changelog
index f732bff..ef9dcc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+flash-kernel (3.43) UNRELEASED; urgency=medium
+
+  * Combine i.MX53 QSB and LOCO board entries, they are the same thing and the
+    LOCO variant was missing DTB information. (Closes: #788782)
+
+ -- Ian Campbell <ijc@debian.org>  Mon, 15 Jun 2015 19:04:31 +0100
+
 flash-kernel (3.42) unstable; urgency=medium
 
   * Only install bootscripts relevant to the arch.