From f9d23bc86e43d4414287c8aadbf89ebcf2797ddb Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 13 Jun 2006 22:33:26 +0000 Subject: simpad configurations: add some sanity --- conf/machine/simpad.conf | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'conf/machine/simpad.conf') diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 43097d871e..b928c72ca7 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -2,24 +2,12 @@ #@NAME: SIEMENS SIMpad SL4, SIEMENS SIMpad CL4, SIEMENS SIMpad SLC, Telekom T-Sinus PAD #@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices -KERNEL ?= "kernel24" -#KERNEL ?= "kernel26" - -OVERRIDES =. "${KERNEL}:" +ZKERNEL_VERSION ?= "2.4" +require conf/include/simpad-${ZKERNEL_VERSION}.conf TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel_kernel24 = "opensimpad-64+0" -PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6" -PREFERRED_PROVIDERS_kernel26 += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules_kernel24 = "0.13e" - -BOOTSTRAP_EXTRA_RDEPENDS = "kernel" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 += "udev module-init-tools" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 += "hostap-modules orinoco-modules \ -orinoco-modules-cs pcmcia-cs apm hostap-utils wpa-supplicant-nossl" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel" BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs orinoco-modules-cs \ kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ @@ -38,6 +26,6 @@ ROOT_FLASH_SIZE = "16" USE_VT = "0" GPE_EXTRA_INSTALL += "suspend-desktop" -include conf/machine/include/handheld-common.conf -include conf/machine/include/tune-strongarm.conf +require conf/machine/include/handheld-common.conf +require conf/machine/include/tune-strongarm.conf -- cgit 1.2.3-korg