Merge lp:~dannf/ubuntu/trusty/flash-kernel/moonshot-updates into lp:ubuntu/trusty/flash-kernel

[dann frazier]

[Adam Conrad (adconrad)]

See inline comment, re: bootscr.

review: Needs Fixing

[lp:~dannf/ubuntu/trusty/flash-kernel/moonshot-updates]

475. By dann frazier on 2014-07-22

add missing bootscr.keystone2 file

[dann frazier (dannf)]

Ooops, fixed.

review: Needs Resubmitting

=== modified file 'README'
--- README	2013-12-23 14:51:32 +0000
+++ README	2014-07-22 21:12:58 +0000
@@ -134,3 +134,17 @@
 * DTB-Kernel-Version: (optional) minimal kernel version for DTB concatenation
 
 * DTB-Id: (optional) specifies the name of the DTB file for this device
+
+
+Adding U-Boot Commands for Pre-Boot Execution
+- - - - - - - - - - - - - - - - - - - - - - -
+
+Packages can drop in files containing U-Boot commands to be executed by a
+platform's bootscript before starting the OS. These files should be
+dropped in /usr/share/flash-kernel/ubootenv.d. Users can add additional
+stubs, or override stubs provided by packages, by adding files to
+/etc/flash-kernel/ubootenv.d. Files in the /etc path that have the same
+name as files in the /usr path will override the /usr counterparts.
+
+Platform bootscripts must contain the @@UBOOT_ENV_EXTRA@@ macro for the
+contents of these stubs to be incorporated.

=== added file 'bootscript/bootscr.keystone2'
--- bootscript/bootscr.keystone2	1970-01-01 00:00:00 +0000
+++ bootscript/bootscr.keystone2	2014-07-22 21:12:58 +0000
@@ -0,0 +1,5 @@
+setenv bootargs 'console=ttyS0,9600n8r ro'
+@@UBOOT_ENV_EXTRA@@
+load scsi 0 ${kernel_addr_r} vmlinuz
+load scsi 0 ${ramdisk_addr_r} initrd.img
+bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r}

=== modified file 'bootscript/bootscr.xgene'
--- bootscript/bootscr.xgene	2013-12-23 14:51:32 +0000
+++ bootscript/bootscr.xgene	2014-07-22 21:12:58 +0000
@@ -1,4 +1,5 @@
-setenv bootargs 'console=ttyS0,115200n8 ro'
-ext4load scsi 0 ${kernel_addr_r} uImage
-ext4load scsi 0 ${ramdisk_addr_r} uInitrd
+setenv bootargs 'console=ttyS0,9600n8r ro'
+@@UBOOT_ENV_EXTRA@@
+load scsi 0 ${kernel_addr_r} uImage
+load scsi 0 ${ramdisk_addr_r} uInitrd
 bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}

=== modified file 'bootscript/bootscr.xgene-mustang'
--- bootscript/bootscr.xgene-mustang	2014-03-18 16:31:38 +0000
+++ bootscript/bootscr.xgene-mustang	2014-07-22 21:12:58 +0000
@@ -1,4 +1,5 @@
 setenv bootargs 'console=ttyS0,115200n8 ro'
+@@UBOOT_ENV_EXTRA@@
 ext4load scsi 0 ${kernel_addr_r} uImage
 ext4load scsi 0 ${ramdisk_addr_r} uInitrd
 ext4load scsi 0 ${fdt_addr_r} apm-mustang.dtb

=== modified file 'db/all.db'
--- db/all.db	2014-04-10 04:15:37 +0000
+++ db/all.db	2014-07-22 21:12:58 +0000
@@ -142,6 +142,13 @@
 Boot-Initrd-Path: /boot/uInitrd
 Boot-Script-Path: /boot/boot.scr
 
+Machine: HP ProLiant m800 Server Cartridge
+Kernel-Flavors: keystone
+U-Boot-Script-Address: 0x0
+U-Boot-Script-Name: bootscr.keystone2
+Required-Packages: u-boot-tools
+Boot-Script-Path: /boot/boot.scr
+
 Machine: HP t5325 Thin Client
 Kernel-Flavors: kirkwood
 Machine-Id: 2846

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-10 04:15:37 +0000
+++ debian/changelog	2014-07-22 21:12:58 +0000
@@ -1,3 +1,15 @@
+flash-kernel (3.0~rc.4ubuntu49.1) UNRELEASED; urgency=medium
+
+  * Add U-Boot environment configuration support (LP: #1328597)
+  * Explicitly lower the console speed for HP ProLiant m400 cartridges to 9600
+    and enable hardware flow control as required by the HP moonshot chassis
+    (LP: #1328280)
+  * Enable U-Boot environment support for X-Gene platforms
+  * Use filesystem agnostic "load" command instead of assuming ext4
+  * Add support for HP ProLiant m800 cartridges (LP: #1326437)
+
+ -- dann frazier <[e-mail]>  Fri, 20 Jun 2014 17:09:02 -0600
+
 flash-kernel (3.0~rc.4ubuntu49) trusty; urgency=medium
 
   * db/all.db: add dummy entries as noops when running on VMs (LP: #1298070)

=== modified file 'debian/control'
--- debian/control	2013-12-23 14:51:32 +0000
+++ debian/control	2014-07-22 21:12:58 +0000
@@ -30,7 +30,7 @@
 Priority: standard
 XC-Package-Type: udeb
 Architecture: arm armel armeb armhf arm64
-XB-Subarchitecture: armadaxp exynos5 generic-lpae generic iop32x ixp4xx kirkwood orion5x s3c24xx mx5 omap omap4 xgene
+XB-Subarchitecture: armadaxp exynos5 generic-lpae generic iop32x ixp4xx keystone kirkwood orion5x s3c24xx mx5 omap omap4 xgene
 Provides: bootable-system
 Depends: cdebconf-udeb, installed-base
 XB-Installer-Menu-Item: 7300

=== modified file 'debian/dirs'
--- debian/dirs	2006-09-25 18:06:07 +0000
+++ debian/dirs	2014-07-22 21:12:58 +0000
@@ -1,1 +1,3 @@
+etc/flash-kernel/ubootenv.d
 usr/sbin
+usr/share/flash-kernel/ubootenv.d

=== modified file 'debian/flash-kernel-installer.isinstallable'
--- debian/flash-kernel-installer.isinstallable	2013-12-23 14:51:32 +0000
+++ debian/flash-kernel-installer.isinstallable	2014-07-22 21:12:58 +0000
@@ -20,6 +20,9 @@
 	arm*/ixp4xx)
 		exit 0
 	;;
+	arm*/keystone)
+		exit 0
+	;;
 	arm*/kirkwood)
 		exit 0
 	;;

=== modified file 'functions'
--- functions	2013-12-23 14:51:32 +0000
+++ functions	2014-07-22 21:12:58 +0000
@@ -187,6 +187,19 @@
 	} >"$output"
 }
 
+gen_ubootenv() {
+	ENVSTUBDIRS="/etc/flash-kernel/ubootenv.d /usr/share/flash-kernel/ubootenv.d"
+	ENVSTUBS="$(find $ENVSTUBDIRS -type f -regex '.*/[0-9a-zA-Z_-]+' -printf '%f\n' | LC_ALL=C sort -u)"
+	for file in $ENVSTUBS; do
+		for dir in $ENVSTUBDIRS; do
+			if [ -f $dir/$file ]; then
+				cat $dir/$file
+				break
+			fi
+		done
+	done
+}
+
 append_dtb() {
 	local kernel="$1"
 	local dtb="$2"
@@ -252,10 +265,19 @@
 	local sdesc="$2"
 	local sdata="$3"
 	local script="$4"
+	local tdata="$tmpdir/$(basename $sdata)"
+
+	local ubootenv="$(mktemp --tmpdir=$tmpdir)"
+	gen_ubootenv > $ubootenv
 
 	printf "Generating boot script u-boot image... " >&2
+	sed -e "/@@UBOOT_ENV_EXTRA@@/{
+		s/@@UBOOT_ENV_EXTRA@@//g
+		r $ubootenv
+		}" < $sdata > $tdata
+
 	mkimage -A arm -O linux -T script -C none -a "$saddr" -e "$saddr" \
-		-n "$sdesc" -d "$sdata" "$script" >&2 1>/dev/null
+		-n "$sdesc" -d "$tdata" "$script" >&2 1>/dev/null
 	echo "done." >&2
 }