disapproval of revision 2c7d22fd4425878d42417193c1900d5174f3024a

diff --git a/conf/machine/simpad-2.4.conf b/conf/machine/simpad-2.4.conf
deleted file mode 100644 (file)
index a26bc5c..0000000
--- a/conf/machine/simpad-2.4.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
-
-# Later versions are broken on kernel 2.4
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules \
-pcmcia-cs apmd hostap-utils \
-wpa-supplicant-nossl"
-
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules \
-orinoco-modules-cs pcmcia-cs apm hostap-utils \
-wpa-supplicant-nossl"
-
-BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \
-kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
-kernel-module-pcnet-cs kernel-module-8390"

diff --git a/conf/machine/simpad-2.6.conf b/conf/machine/simpad-2.6.conf
deleted file mode 100644 (file)
index 1a5bd38..0000000
--- a/conf/machine/simpad-2.6.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
-
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
-
-BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel hostap-modules hostap-utils orinoco-modules wpa-supplicant-nossl"
-BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel"
-BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \
-kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
-kernel-module-pcnet-cs kernel-module-8390"

diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 0447099..119e11b 100644 (file)
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -5,9 +5,14 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
 
-KERNEL_VERSION ?= "2.4"
-include conf/machine/simpad-${KERNEL_VERSION}.conf
+BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel hostap-modules orinoco-modules "
+BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel"
+BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \
+kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
+kernel-module-pcnet-cs kernel-module-8390"
 
 # This is needed for the ramdisk script to work
 BOOTSTRAP_EXTRA_DEPENDS  += "e2fsprogs"
@@ -21,8 +26,6 @@ USE_DEVFS = "1"
 GUI_MACHINE_CLASS = "bigscreen"
 ROOT_FLASH_SIZE = "24"
 USE_VT = "0"
-GPE_EXTRA_DEPENDS += "gaim sylpheed"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
 
 include conf/machine/handheld-common.conf
 include conf/machine/tune-strongarm.conf