[oe-commits] org.oe.dev simpad config cleanup - close #1950

[woglinde commit]

simpad config cleanup - close #1950

Author: woglinde
Branch: org.openembedded.dev
Revision: f64f76da145d0ecd8967b8f45a684d465d56b6c2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f64f76da145d0ecd8967b8f45a684d465d56b6c2
Files:
1
conf/machine/include/simpad-2.4.conf
conf/machine/include/simpad-2.6.conf
conf/machine/simpad.conf
Diffs:

#
# mt diff -r3a51adfd6b864785d470a244c3f1a14e5853f2a6 -rf64f76da145d0ecd8967b8f45a684d465d56b6c2
#
# 
# 
# patch "conf/machine/include/simpad-2.4.conf"
#  from [989ffcdb129c870a1269d69b98ac3e9e2fa2a3ac]
#    to [1931b4fd4ae6111267be01b1e4d4df99c54f1111]
# 
# patch "conf/machine/include/simpad-2.6.conf"
#  from [65902ed1df852b649649ab8c3980198a2cd6323b]
#    to [46ce551694fb75f46d97c4b3b0d76c7c6be5afe7]
# 
# patch "conf/machine/simpad.conf"
#  from [11dbee8a2dbdab8fa0b0ef34aa7f21c727adf284]
#    to [2fa87fbc706c45942023af28317edc8c4aff82f6]
# 
============================================================
--- conf/machine/include/simpad-2.4.conf	989ffcdb129c870a1269d69b98ac3e9e2fa2a3ac
+++ conf/machine/include/simpad-2.4.conf	1931b4fd4ae6111267be01b1e4d4df99c54f1111
@@ -1,9 +1,14 @@ PREFERRED_PROVIDER_virtual/kernel = "ope
 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"
============================================================
--- conf/machine/include/simpad-2.6.conf	65902ed1df852b649649ab8c3980198a2cd6323b
+++ conf/machine/include/simpad-2.6.conf	46ce551694fb75f46d97c4b3b0d76c7c6be5afe7
@@ -1,4 +1,5 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
 
+PCMCIA_MANAGER ?= "pcmciautils"
+
+MACHINE_FEATURES_append = "kernel26"
-BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools"
============================================================
--- conf/machine/simpad.conf	11dbee8a2dbdab8fa0b0ef34aa7f21c727adf284
+++ conf/machine/simpad.conf	2fa87fbc706c45942023af28317edc8c4aff82f6
@@ -1,29 +1,23 @@ MACHINE_KERNEL_VERSION ?= "2.4"
 #@TYPE: Machine
 #@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
 
 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 "
 
-# This is needed for the ramdisk script to work
-BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
+include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf
+require conf/machine/include/tune-strongarm.conf
 
+
+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"
 
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-require conf/machine/include/tune-strongarm.conf
-