[oe-commits] org.oe.dev linux_2.6.24/25: clean up cm-x270 preferred version and make consistent

[cbrake commit]

linux_2.6.24/25: clean up cm-x270 preferred version and make consistent

Author: cbrake at openembedded.org
Branch: org.openembedded.dev
Revision: 9fc7b2b9f8ac87da78a518a8614a4770bb15b7e3
ViewMTN: http://monotone.openembedded.org/revision/info/9fc7b2b9f8ac87da78a518a8614a4770bb15b7e3
Files:
1
conf/machine/cm-x270.conf
packages/linux/linux_2.6.24.bb
packages/linux/linux_2.6.25.bb
Diffs:

#
# mt diff -r771dc60afe6dcffba8ca0ec048d5ce53d85d1d3e -r9fc7b2b9f8ac87da78a518a8614a4770bb15b7e3
#
#
#
# patch "conf/machine/cm-x270.conf"
#  from [263d992b212de2d80b20d1541d198511ceaf4c60]
#    to [538e33e1822b7e284ea57e0c6d550addae73f8cf]
# 
# patch "packages/linux/linux_2.6.24.bb"
#  from [5140922314a6b7a562cfc145b5cd8bef1a115424]
#    to [d00d1d26eff1df7f8f4b4e251972025636b93a0a]
# 
# patch "packages/linux/linux_2.6.25.bb"
#  from [dfb7619f1379579633ca1e76392a661f4a29aafc]
#    to [ed037c79f846e5b7c53db483560819488aadcdcf]
#
============================================================
--- conf/machine/cm-x270.conf	263d992b212de2d80b20d1541d198511ceaf4c60
+++ conf/machine/cm-x270.conf	538e33e1822b7e284ea57e0c6d550addae73f8cf
@@ -6,7 +6,6 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 GUI_MACHINE_CLASS ?= "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux ?= "2.6.24"
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
============================================================
--- packages/linux/linux_2.6.24.bb	5140922314a6b7a562cfc145b5cd8bef1a115424
+++ packages/linux/linux_2.6.24.bb	d00d1d26eff1df7f8f4b4e251972025636b93a0a
@@ -3,7 +3,6 @@ DEFAULT_PREFERENCE_gesbc-9302 = "1"
 # 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"
============================================================
--- packages/linux/linux_2.6.25.bb	dfb7619f1379579633ca1e76392a661f4a29aafc
+++ packages/linux/linux_2.6.25.bb	ed037c79f846e5b7c53db483560819488aadcdcf
@@ -26,6 +26,8 @@ CMDLINE_cm-x270 = "console=${CMX270_CONS
 
 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