Merge lp:~dannf/flash-kernel/armadaxp into lp:ubuntu/quantal/flash-kernel

[dann frazier]

This rebases the armadaxp support on top of the new flash-kernel architecture. I've tested it in a quantal install w/ a hacked mirror & things went fine.

I'd like to push these changes into Debian as well - but I think the boot script needs some work first. Low-hanging fruit is to trim the Ubuntu/Canonical references, but I also wonder if the boot.scr (which is what we shipped in precise) works as expected on this platform. It seems to assume that load addresses are preset in the environment, which they don't appear to be on the board I'm using. That probably needs further investigation, but this change is enough to avoid precise->quantal regressions.

[Robie Basak (racb)]

I think bootscript/bootscr.armadaxp needs to have the mkimage header stripped from the start; it's gone in as a binary, but the others in there are text and presumably flash-kernel runs mkimage on them first. Just strip the first 64 bytes.

review: Needs Fixing

[Oliver Grawert (ogra)]

i'll merge this with omitting the binary bits later today

review: Approve

=== modified file 'README'
--- README	2012-03-11 14:51:15 +0000
+++ README	2012-05-30 22:03:17 +0000
@@ -26,6 +26,7 @@
  - 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-30 22:03:17 +0000 differ
=== modified file 'db/all.db'
--- db/all.db	2012-03-10 01:17:09 +0000
+++ db/all.db	2012-05-30 22:03:17 +0000
@@ -137,6 +137,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-30 22:03:17 +0000
@@ -1,3 +1,10 @@
+flash-kernel (3.0~rc.4ubuntu1) UNRELEASED; urgency=low
+
+  [ dann frazier ]
+  * Re-add support for Marvell ArmadaXP
+
+ -- dann frazier <[e-mail]>  Wed, 30 May 2012 15:20:00 -0600
+
 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-30 22:03:17 +0000
@@ -29,7 +29,7 @@
 Priority: standard
 XC-Package-Type: udeb
 Architecture: arm armel armeb armhf
-XB-Subarchitecture: iop32x ixp4xx kirkwood orion5x s3c24xx mx5
+XB-Subarchitecture: armadaxp 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-30 22:03:17 +0000
@@ -2,6 +2,9 @@
 set -e
 
 case "`archdetect`" in
+	arm*/armadaxp)
+		exit 0
+	;;
 	arm*/iop32x)
 		exit 0
 	;;