diff options
| author |   Henning Heinold <heinold@inf.fu-berlin.de> | 2007-03-11 13:37:44 +0000 |
|---|---|---|
| committer |   Marcin Juszkiewicz <hrw@openembedded.org> | 2007-03-11 13:37:44 +0000 |
| commit | 4c096adeff825b37801e1179991ee82b98edc98c (patch) | |
| tree | 324febc3854b1e846620f2ada3534b4eb783db6e /conf | |
| parent | 17bbf166d3c92685475cd5b883296bff8b19f42d (diff) | |
| download | openembedded-4c096adeff825b37801e1179991ee82b98edc98c.tar.gz | |
simpad config cleanup - close #1950
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/simpad-2.4.conf | 13 | ||||
| -rw-r--r-- | conf/machine/include/simpad-2.6.conf | 5 | ||||
| -rw-r--r-- | conf/machine/simpad.conf | 22 |
3 files changed, 20 insertions, 20 deletions
diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf index 06eb56d2b6..06f12f532f 100644 --- a/conf/machine/include/simpad-2.4.conf +++ b/conf/machine/include/simpad-2.4.conf @@ -1,9 +1,14 @@ PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0" +MACHINE_FEATURES_append = "kernel24" +MACHINE_EXTRA_RRECOMMENDS = " kernel-module-sa1100-ir \ + kernel-module-sa1100usb-core kernel-module-usb-eth \ + kernel-module-pcnet-cs kernel-module-8390 " + +USE_DEVFS = "1" + +PREFERRED_PROVIDER_hostap-modules = "hostap-modules" + # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules \ - pcmcia-cs apm hostap-utils wpa-supplicant-nossl" - -USE_DEVFS = "1" diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf index 69f04f0730..e485c7bf2a 100644 --- a/conf/machine/include/simpad-2.6.conf +++ b/conf/machine/include/simpad-2.6.conf @@ -1,4 +1,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross" -BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools" +PCMCIA_MANAGER ?= "pcmciautils" + +MACHINE_FEATURES_append = "kernel26" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 2478ce17c9..f99d509c86 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -3,27 +3,21 @@ #@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices MACHINE_KERNEL_VERSION ?= "2.4" -require conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf TARGET_ARCH = "arm" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -BOOTSTRAP_EXTRA_RDEPENDS += "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" +MACHINE_TASK_PROVIDER = "task-base" +MACHINE_FEATURES = " apm pcmcia irda screen touchscreen " + +include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf +require conf/machine/include/tune-strongarm.conf -# This is needed for the ramdisk script to work -BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" +ROOT_FLASH_SIZE = "16" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" -EXTRA_IMAGEDEPENDS = "" -SERIAL_CONSOLE = "ttySA0 115200 vt100" GUI_MACHINE_CLASS = "bigscreen" -ROOT_FLASH_SIZE = "16" +SERIAL_CONSOLE = "ttySA0 115200 vt100" USE_VT = "0" -GPE_EXTRA_INSTALL += "suspend-desktop" - -require conf/machine/include/tune-strongarm.conf +PREFERRED_PROVIDER_xserver = "xserver-kdrive" |