Merge lp:~racb/ubuntu/quantal/flash-kernel/highbank2 into lp:ubuntu/quantal/flash-kernel

[Robie Basak]

Add highbank support.

[Oliver Grawert (ogra)]

looks fine apart from teh binary stuff (carried over from merge 108070 which this merge is based on) and the README entry that should say more than simply "highbank" i will fix both of these during merge ...

review: Approve

=== modified file 'README'
--- README	2012-03-11 14:51:15 +0000
+++ README	2012-05-31 14:37:29 +0000
@@ -22,10 +22,12 @@
  - Genesi Efika Smartbook
  - GLAN Tank
  - GuruPlug
+ - Highbank
  - HP t5325 Thin Client
  - HP Media Vault mv2120
  - Intel SS4000-E
  - Linksys NSLU2
+ - Marvell Armada XP Development Board (Ubuntu)
  - Marvell DB-78x00-BP Development Board
  - Marvell OpenRD-Base
  - Marvell OpenRD-Client

=== added file 'bootscript/bootscr.armadaxp'
Binary files bootscript/bootscr.armadaxp	1970-01-01 00:00:00 +0000 and bootscript/bootscr.armadaxp	2012-05-31 14:37:29 +0000 differ
=== added file 'bootscript/bootscr.highbank'
--- bootscript/bootscr.highbank	1970-01-01 00:00:00 +0000
+++ bootscript/bootscr.highbank	2012-05-31 14:37:29 +0000
@@ -0,0 +1,7 @@
+echo Starting Ubuntu...
+setenv bootargs console=ttyAMA0 nosplash
+mw.l 800000 0 10000
+scsi scan
+ext2load scsi 0 0x800000 vmlinuz
+ext2load scsi 0 0x1000000 initrd.img
+bootz 0x800000 0x1000000:${filesize} 0x1000

=== modified file 'db/all.db'
--- db/all.db	2012-03-10 01:17:09 +0000
+++ db/all.db	2012-05-31 14:37:29 +0000
@@ -97,6 +97,12 @@
 Required-packages: u-boot-tools
 Bootloader-sets-root: yes
 
+Machine: Highbank
+Kernel-Flavors: highbank
+Required-Packages: u-boot-tools
+Boot-Script-Path: /boot/boot.scr
+U-Boot-Script-Name: bootscr.highbank
+
 Machine: HP Media Vault mv2120
 Kernel-Flavors: orion5x
 Machine-Id: 1693
@@ -137,6 +143,17 @@
 Required-packages: apex-nslu2 nslu2-utils
 Bootloader-sets-root: no
 
+Machine: Marvell Armada XP Development Board
+Kernel-Flavors: armadaxp
+U-Boot-Kernel-Address: 0x02000000
+U-Boot-Initrd-Address: 0x20000000
+U-Boot-Script-Address: 0x1000
+U-Boot-Script-Name: bootscr.armadaxp
+Boot-Kernel-Path: /boot/uImage
+Boot-Initrd-Path: /boot/uInitrd
+Required-Packages: u-boot-tools
+Bootloader-sets-root: no
+
 Machine: Marvell DB-78x00-BP Development Board
 U-Boot-Kernel-Address: 0x8000
 U-Boot-Initrd-Address: 0x0

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-11 14:51:15 +0000
+++ debian/changelog	2012-05-31 14:37:29 +0000
@@ -1,3 +1,13 @@
+flash-kernel (3.0~rc.4ubuntu1) quantal; urgency=low
+
+  [ dann frazier ]
+  * Re-add support for Marvell ArmadaXP
+
+  [ Robie Basak ]
+  * Add support for Calxeda Highbank
+
+ -- Robie Basak <[e-mail]>  Thu, 31 May 2012 10:09:53 +0100
+
 flash-kernel (3.0~rc.4) unstable; urgency=low
 
   * Upload to unstable 

=== modified file 'debian/control'
--- debian/control	2012-03-11 14:51:15 +0000
+++ debian/control	2012-05-31 14:37:29 +0000
@@ -1,7 +1,8 @@
 Source: flash-kernel
 Section: utils
 Priority: optional
-Maintainer: Debian Install System Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Install System Team <[e-mail]>
 Uploaders: Loïc Minier <[e-mail]>,
            Hector Oron <[e-mail]>,
            Wouter Verhelst <[e-mail]>
@@ -29,7 +30,7 @@
 Priority: standard
 XC-Package-Type: udeb
 Architecture: arm armel armeb armhf
-XB-Subarchitecture: iop32x ixp4xx kirkwood orion5x s3c24xx mx5
+XB-Subarchitecture: armadaxp highbank iop32x ixp4xx kirkwood orion5x s3c24xx mx5
 Provides: bootable-system
 Depends: cdebconf-udeb, installed-base
 XB-Installer-Menu-Item: 7300

=== modified file 'debian/flash-kernel-installer.isinstallable'
--- debian/flash-kernel-installer.isinstallable	2012-03-11 14:51:15 +0000
+++ debian/flash-kernel-installer.isinstallable	2012-05-31 14:37:29 +0000
@@ -2,6 +2,12 @@
 set -e
 
 case "`archdetect`" in
+	arm*/armadaxp)
+		exit 0
+	;;
+	arm*/highbank)
+		exit 0
+	;;
 	arm*/iop32x)
 		exit 0
 	;;