* Remove 2.4 machine support for c7x0, akita, spitz and borzoi.

* Remove borzoi machine entirely as its now equal to spitz. 
* For remaining 2.4/2.6 split machines use ZKERNEL_VERSION instead of KERNEL_VERSION 
  to fix a long standing bug - people will need to update local.conf. 
* Add dummy terrier MACHINE to point at spitz.

9 files changed, 11 insertions, 37 deletions

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index da699e7258..89c0d031ee 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -2,9 +2,7 @@
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
-KERNEL_VERSION ?= "2.6"
-
 include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell-2.6.conf
 
 ROOT_FLASH_SIZE = "58"
diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf
index 10ffb80c32..d037a1f779 100644
--- a/conf/machine/borzoi.conf
+++ b/conf/machine/borzoi.conf
@@ -1,21 +1,2 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-C3100
-#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3100 device
-
-KERNEL_VERSION ?= "2.6"
-
-include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
-
-PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
-PIVOTBOOT_EXTRA_RRECOMMENDS += ""
-
-# Useful things for the built-in Harddisk
-BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
-
-IMAGE_FSTYPES = "jffs2 tar.gz"
-
-ROOT_FLASH_SIZE = "100"
-# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
-# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte
-
+WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Sharp SL-C3100,\n*    because \
+its very similar to the SL-C3000. Use MACHINE = \"spitz\".\n*\n*\n')}"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index af1c9dad1c..0bd9623526 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -2,10 +2,8 @@
 #@NAME: Sharp Zaurus SL-C7x0
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
 
-KERNEL_VERSION ?= "2.6"
-
 include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell-2.6.conf
 
 ROOT_FLASH_SIZE = "25"
 # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
index 95f3c528e8..97030e66a7 100644
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -46,5 +46,4 @@ BOOTSTRAP_EXTRA_SOUND 	  = "kernel-module-soundcore kernel-module-snd kernel-mod
 			     
 BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 "
 BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
-BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
 BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index a1bf5fbec3..8c83416919 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -5,8 +5,8 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv4 armv5te poodle"
 
-KERNEL_VERSION ?= "2.4"
-include conf/machine/include/poodle-${KERNEL_VERSION}.conf
+ZKERNEL_VERSION ?= "2.4"
+include conf/machine/include/poodle-${ZKERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
 
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 7a558a731d..f3edef9890 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -2,8 +2,6 @@
 #@NAME: qemu ARM Emulator setup
 #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
 
-KERNEL_VERSION ?= "2.6"
-
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv4 armv5te qemuarm"
 
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 212da52587..f78dd7a3b9 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -2,10 +2,8 @@
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
-KERNEL_VERSION ?= "2.6"
-
 include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell-2.6.conf
 
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 PIVOTBOOT_EXTRA_RRECOMMENDS += ""
diff --git a/conf/machine/terrier.conf b/conf/machine/terrier.conf
new file mode 100644
index 0000000000..ca6a20daf5
--- /dev/null
+++ b/conf/machine/terrier.conf
@@ -0,0 +1,2 @@
+WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Sharp SL-C3200,\n*    because \
+its very similar to the SL-C3000/SL-C3100. Use MACHINE = \"spitz\".\n*\n*\n')}"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index b573f5721d..3485937186 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -5,8 +5,8 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv4 armv5te tosa"
 
-KERNEL_VERSION ?= "2.4"
-include conf/machine/include/tosa-${KERNEL_VERSION}.conf
+ZKERNEL_VERSION ?= "2.4"
+include conf/machine/include/tosa-${ZKERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"