[kernel] r13157 - in dists/trunk/linux-2.6/debian: . config/arm config/armel

[Martin Michlmayr]

Author: tbm
Date: Tue Mar 17 17:58:05 2009
New Revision: 13157

Log:
[arm/iop32x, arm/ixp4xx, arm/orion5x] Add a size check to ensure that
the kernel will fit in flash.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/arm/defines
   dists/trunk/linux-2.6/debian/config/armel/defines

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Mar 17 17:58:05 2009
@@ -65,6 +65,8 @@
   * [arm, armel] Enable various V4L USB devices. (Closes: #518582)
   * [arm/orion5x] Build the SENSORS_LM75 module since it's needed on the
     D-Link DNS-323.
+  * [arm/iop32x, arm/ixp4xx, arm/orion5x] Add a size check to ensure that
+    the kernel will fit in flash.
   * Add patches from git.marvell.com to improve Kirkwood support:
     - Orion: make gpio /input/output validation separate
     - Kirkwood: MPP initialization code

Modified: dists/trunk/linux-2.6/debian/config/arm/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/defines	Tue Mar 17 17:58:05 2009
@@ -20,16 +20,37 @@
 class: IOP32x
 longclass: IOP32x based (Thecus N2100, etc)
 
+[iop32x_build]
+image-file: arch/arm/boot/zImage
+
+[iop32x_image]
+# Thecus N2100: 1441792 - 8 = 1441784
+check-size: 1441784
+
 [ixp4xx_base]
 class: IXP4xx
 longclass: IXP4xx based (Linksys NSLU2, etc)
 
+[ixp4xx_build]
+image-file: arch/arm/boot/zImage
+
+[ixp4xx_image]
+# Linksys NSLU2: 1441792 - 16 - 16 = 1441760
+check-size: 1441760
+
 [orion5x_base]
 class: Orion
 longclass: Orion 5181, 5182 and 5281 based (QNAP TS-109/TS-209, etc)
 
+[orion5x_build]
+image-file: arch/arm/boot/zImage
+
 [orion5x_image]
 recommends: uboot-mkimage
+# D-Link DNS-323: 1572864 - 8 - 64 = 1572792
+# HP Media Vault mv2120: ca 2 MB
+# QNAP TS-109/TS-209 & TS-409: 2097152 - 8 - 64 = 2097080
+check-size: 1572792
 
 [versatile_base]
 class: Versatile

Modified: dists/trunk/linux-2.6/debian/config/armel/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/armel/defines	Tue Mar 17 17:58:05 2009
@@ -13,23 +13,40 @@
 class: IOP32x
 longclass: IOP32x based (Thecus N2100, etc)
 
+[iop32x_build]
+image-file: arch/arm/boot/zImage
+
 [iop32x_image]
 configs: arm/config.iop32x
+# Thecus N2100: 1441792 - 8 = 1441784
+check-size: 1441784
 
 [ixp4xx_base]
 class: IXP4xx
 longclass: IXP4xx based (Linksys NSLU2, etc)
 
+[ixp4xx_build]
+image-file: arch/arm/boot/zImage
+
 [ixp4xx_image]
 configs: arm/config.ixp4xx
+# Linksys NSLU2: 1441792 - 16 - 16 = 1441760
+check-size: 1441760
 
 [orion5x_base]
 class: Orion
 longclass: Orion 5181, 5182 and 5281 based (QNAP TS-109/TS-209, etc)
 
+[orion5x_build]
+image-file: arch/arm/boot/zImage
+
 [orion5x_image]
 configs: arm/config.orion5x
 recommends: uboot-mkimage
+# D-Link DNS-323: 1572864 - 8 - 64 = 1572792
+# HP Media Vault mv2120: ca 2 MB
+# QNAP TS-109/TS-209 & TS-409: 2097152 - 8 - 64 = 2097080
+check-size: 1572792
 
 [versatile_base]
 class: Versatile