Merge lp:~dannf/ubuntu/trusty/flash-kernel/mustang-upstream into lp:ubuntu/trusty/flash-kernel

[dann frazier]

=== added file 'bootscript/bootscr.xgene-mustang'
--- bootscript/bootscr.xgene-mustang	1970-01-01 00:00:00 +0000
+++ bootscript/bootscr.xgene-mustang	2014-03-20 21:57:13 +0000
@@ -0,0 +1,5 @@
+setenv bootargs 'console=ttyS0,115200n8 ro'
+ext4load scsi 0 ${kernel_addr_r} uImage
+ext4load scsi 0 ${ramdisk_addr_r} uInitrd
+ext4load scsi 0 ${fdt_addr_r} apm-mustang.dtb
+bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
 
=== modified file 'db/all.db'
--- db/all.db	2014-03-12 15:10:43 +0000
+++ db/all.db	2014-03-20 21:57:13 +0000
@@ -1,16 +1,16 @@
 # somewhat RFC2822 based, but case sensitive, not tolerant to spaces etc.
 
-Machine: APM X-Gene CPU Potenza
+Machine: APM X-Gene Mustang board
 U-Boot-Kernel-Address: 0x80000
 U-Boot-Initrd-Address: 0x0
 U-Boot-Script-Address: 0x4004000000
-U-Boot-Script-Name: bootscr.xgene
+U-Boot-Script-Name: bootscr.xgene-mustang
 Required-Packages: u-boot-tools
 Boot-Kernel-Path: /boot/uImage
 Boot-Initrd-Path: /boot/uInitrd
-Boot-Dtb-Path: /boot/mustang.dtb
+Boot-Dtb-Path: /boot/apm-mustang.dtb
 Boot-Script-Path: /boot/boot.scr
-DTB-Id: mustang.dtb
+DTB-Id: apm-mustang.dtb
 
 Machine: Buffalo Linkstation LiveV3 (LS-CHL)
 Kernel-Flavors: orion5x
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-03-12 15:10:43 +0000
+++ debian/changelog	2014-03-20 21:57:13 +0000
@@ -1,3 +1,11 @@
+flash-kernel (3.0~rc.4ubuntu48) UNRELEASED; urgency=medium
+
+  * Update APM X-Gene config to match upstream device tree filename/model
+  * Add a bootscript specific to X-Gene Mustang boards since they need to
+    pull their dtb from the OS.
+
+ -- dann frazier <[e-mail]>  Tue, 18 Mar 2014 16:31:38 -0600
+
 flash-kernel (3.0~rc.4ubuntu47) trusty; urgency=medium
 
   * Add support for HP ProLiant m400 Server Cartridges (LP: #1287910)