summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/cm-x270.conf1
-rw-r--r--packages/linux/linux_2.6.24.bb1
-rw-r--r--packages/linux/linux_2.6.25.bb2
3 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf
index 0c9578e407..d2c70a0541 100644
--- a/conf/machine/cm-x270.conf
+++ b/conf/machine/cm-x270.conf
@@ -6,7 +6,6 @@ TARGET_ARCH = "arm"
GUI_MACHINE_CLASS ?= "bigscreen"
PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux ?= "2.6.24"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb
index 2dac82fdd5..13f767c56b 100644
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@ -3,7 +3,6 @@ require linux.inc
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_gesbc-9302 = "1"
-DEFAULT_PREFERENCE_cm-x270 = "-1"
DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
DEFAULT_PREFERENCE_simpad = "1"
DEFAULT_PREFERENCE_atngw100 = "1"
diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb
index 0b16209b5e..aea1347767 100644
--- a/packages/linux/linux_2.6.25.bb
+++ b/packages/linux/linux_2.6.25.bb
@@ -26,6 +26,8 @@ SRC_URI_append_cm-x270 = " \
CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
+FILES_kernel-image_cm-x270 = ""
+
python do_compulab_image() {
import os
import os.path