[oe-commits] org.oe.dev poodle/tosa: drop 2.4 support

[hrw commit]

poodle/tosa: drop 2.4 support

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: a51a2e5532264f836e170c84dbb2f4a509afa26a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a51a2e5532264f836e170c84dbb2f4a509afa26a
Files:
1
conf/machine/include/poodle-2.4.conf
conf/machine/include/tosa-2.4.conf
conf/machine/include/zaurus-clamshell-2.4.conf
conf/machine/poodle.conf
conf/machine/tosa.conf
Diffs:

#
# mt diff -rb0f2d6bbf93ca249d8e78fdc53fbf483e6b818f7 -ra51a2e5532264f836e170c84dbb2f4a509afa26a
#
# 
# 
# delete "conf/machine/include/poodle-2.4.conf"
# 
# delete "conf/machine/include/tosa-2.4.conf"
# 
# delete "conf/machine/include/zaurus-clamshell-2.4.conf"
# 
# patch "conf/machine/poodle.conf"
#  from [ae931cc5d1c572a2a1b316c630e8707c5f5620b7]
#    to [98d691b84ca32adabb38692269c609d583154022]
# 
# patch "conf/machine/tosa.conf"
#  from [06c4ee3d28f4accbb2906bcc26a12dc8a7fe90ef]
#    to [e35f703089600002a8a2d8d1bd940331841ffba5]
# 
============================================================
--- conf/machine/poodle.conf	ae931cc5d1c572a2a1b316c630e8707c5f5620b7
+++ conf/machine/poodle.conf	98d691b84ca32adabb38692269c609d583154022
@@ -5,8 +5,8 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
-MACHINE_KERNEL_VERSION ?= "2.4"
-include conf/machine/include/poodle-${MACHINE_KERNEL_VERSION}.conf
+MACHINE_KERNEL_VERSION = "2.6"
+require conf/machine/include/zaurus-2.6.conf
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
 
============================================================
--- conf/machine/tosa.conf	06c4ee3d28f4accbb2906bcc26a12dc8a7fe90ef
+++ conf/machine/tosa.conf	e35f703089600002a8a2d8d1bd940331841ffba5
@@ -5,9 +5,13 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
-MACHINE_KERNEL_VERSION ?= "2.6"
-include conf/machine/include/tosa-${MACHINE_KERNEL_VERSION}.conf
+MACHINE_KERNEL_VERSION = "2.6"
 
+include conf/machine/include/zaurus-2.6.conf
+
+# wlan-ng Modules
+MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
+
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"