Move image-file definitions from flavour to arch level

The image-file path could potentially vary between flavours but
currently doesn't.  buildcheck.py works either way.

svn path=/dists/trunk/linux/; revision=21251

3 files changed, 9 insertions, 24 deletions

diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index f719c47c1ffe..ed74d6b3b648 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -7,6 +7,9 @@ flavours:
  versatile
 kernel-arch: arm
 
+[build]
+image-file: arch/arm/boot/zImage
+
 [image]
 suggests: fdutils
 configs:
@@ -16,9 +19,6 @@ configs:
 [relations]
 headers%gcc-4.8: linux-compiler-gcc-4.8-arm
 
-[ixp4xx_build]
-image-file: arch/arm/boot/zImage
-
 [ixp4xx_description]
 hardware: IXP4xx
 hardware-long: IXP4xx based systems (Linksys NSLU2, etc)
@@ -30,9 +30,6 @@ configs:
  armel/config-reduced
  armel/config.ixp4xx
 
-[kirkwood_build]
-image-file: arch/arm/boot/zImage
-
 [kirkwood_description]
 hardware: Marvell Kirkwood
 hardware-long: Marvell Kirkwood based systems (SheevaPlug, QNAP TS-119/TS-219, etc)
@@ -43,16 +40,10 @@ recommends: uboot-mkimage
 # QNAP TS-119/TS-219: 2097152 - 8 - 64 = 2097080
 check-size: 2097080
 
-[mv78xx0_build]
-image-file: arch/arm/boot/zImage
-
 [mv78xx0_description]
 hardware: Marvell 78xx0
 hardware-long: Marvell DB-78xx0-BP Development Board
 
-[orion5x_build]
-image-file: arch/arm/boot/zImage
-
 [orion5x_description]
 hardware: Marvell Orion
 hardware-long: Marvell Orion 5181, 5182 and 5281 based systems (QNAP TS-109/TS-209, etc)
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index 82ba7d77a456..0083168fa108 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -4,6 +4,9 @@ flavours:
  armmp-lpae
 kernel-arch: arm
 
+[build]
+image-file: arch/arm/boot/zImage
+
 [image]
 suggests: fdutils
 configs:
@@ -13,16 +16,10 @@ configs:
 [relations]
 headers%gcc-4.8: linux-compiler-gcc-4.8-arm
 
-[armmp_build]
-image-file: arch/arm/boot/zImage
-
 [armmp_description]
 hardware: ARMv7 multiplatform compatible SoCs
 hardware-long: ARMv7 multiplatform kernel for Marvell Armada 370/xp, Freescale iMX5x/iMX6
 
-[armmp-lpae_build]
-image-file: arch/arm/boot/zImage
-
 [armmp-lpae_description]
 hardware: ARMv7 multiplatform compatible SoCs supporting LPAE
 hardware-long: ARMv7 multiplatform kernel supporting LPAE
diff --git a/debian/config/sh4/defines b/debian/config/sh4/defines
index 1661800ddff1..22a935314ed6 100644
--- a/debian/config/sh4/defines
+++ b/debian/config/sh4/defines
@@ -5,19 +5,16 @@ flavours:
 kernel-arch: sh
 compiler: gcc-4.7
 
+[build]
+image-file: arch/sh/boot/zImage
+
 [image]
 suggests: fdutils
 
-[sh7751r_build]
-image-file: arch/sh/boot/zImage
-
 [sh7751r_description]
 hardware: sh7751r
 hardware-long: Renesas SH7751R R2D plus board
 
-[sh7785lcr_build]
-image-file: arch/sh/boot/zImage
-
 [sh7785lcr_description]
 hardware: sh7785lcr
 hardware-long: Renesas SH7785 reference board