diff options
| -rw-r--r-- | conf/machine/include/simpad-2.4.conf | 7 | ||||
| -rw-r--r-- | conf/machine/include/simpad-2.6.conf | 4 | ||||
| -rw-r--r-- | conf/machine/simpad.conf | 22 |
3 files changed, 16 insertions, 17 deletions
diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf new file mode 100644 index 0000000000..b5fda186ca --- /dev/null +++ b/conf/machine/include/simpad-2.4.conf @@ -0,0 +1,7 @@ +PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0" + +# Later versions are broken on kernel 2.4 +PREFERRED_VERSION_orinoco-modules = "0.13e" + +BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules orinoco-modules \ +orinoco-modules-cs pcmcia-cs apm hostap-utils wpa-supplicant-nossl" diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf new file mode 100644 index 0000000000..a5f4962c75 --- /dev/null +++ b/conf/machine/include/simpad-2.6.conf @@ -0,0 +1,4 @@ +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross" + +BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools" 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 |