[oe-commits] Andrea Adami : zaurus-2.6.inc: require kexecboot for all Zaurus models
GIT User account
git at amethyst.openembedded.net
Sat Jan 31 12:26:17 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 1f1bc17bae24493ef5a7baedc7866664596c2bdc
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1f1bc17bae24493ef5a7baedc7866664596c2bdc
Author: Andrea Adami <andrea.adami at gmail.com>
Date: Sat Jan 31 13:19:37 2009 +0100
zaurus-2.6.inc: require kexecboot for all Zaurus models
- delete the same line in tosa-collie-poodle.conf (pioneers !)
---
conf/machine/collie.conf | 1 -
conf/machine/include/zaurus-2.6.inc | 2 ++
conf/machine/poodle.conf | 1 -
conf/machine/tosa.conf | 1 -
4 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index b1635c0..92651f6 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 985370f..8fb36f7 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 c7c81c9..4e8f011 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 edea47a..593ceab 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"
More information about the Openembedded-commits
mailing list