zaurus-2.6.inc: require kexecboot for all Zaurus models

- delete the same line in tosa-collie-poodle.conf (pioneers !)

4 files changed, 2 insertions, 3 deletions

diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index b1635c022c..92651f60f1 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -6,7 +6,6 @@ TARGET_ARCH = "arm"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
 require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
-require conf/machine/include/kexecboot.inc
 require conf/machine/include/tune-strongarm.inc
 
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 985370fdcd..8fb36f78be 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -80,3 +80,5 @@ zaurus_make_installkit () {
 }
 
 KERNEL_IMAGETYPE ?= "zImage"
+
+require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index c7c81c9f9a..4e8f011a1e 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
 require conf/machine/include/zaurus-2.6.inc
-require conf/machine/include/kexecboot.inc
 require conf/machine/include/tune-xscale.inc
 
 IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index edea47a2d4..593ceab33d 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -4,7 +4,6 @@
 
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/tune-xscale.inc
-require conf/machine/include/kexecboot.inc
 
 IMAGE_FSTYPES += "jffs2 tar.gz"