merge of '4d01e12fde33f43c99f3c6215f4514d9f9d24479'

     and 'aa44d626baaae40ee498aea453176a8aea90d9fc'

1 files changed, 3 insertions, 77 deletions

diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index 9857108472..99d85977b9 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -2,43 +2,15 @@
 #@NAME: Palm LifeDrive
 #@DESCRIPTION: Machine configuration for the Palm LifeDrive
 
-#
-# Hardware-based properties
-#
-
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+require conf/machine/include/palm.conf
 
 ROOT_FLASH_SIZE = "100"
 
-SERIAL_CONSOLE = "115200 ttyS0"
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth pcmcia irda wifi ext2 usbgadget screen"
-
-#
-# Software/packages selection
-#
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
+MACHINE_FEATURES += "pcmcia wifi"
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
-MACHINE_EXTRA_RRECOMMENDS = "\
-	kernel-module-ac97-bus \
-	kernel-module-apm-power \
-	kernel-module-backlight \
-	kernel-module-battery \
+MACHINE_EXTRA_RRECOMMENDS += "\
 	kernel-module-bcm2035-uart \
-	kernel-module-external-power \
-	kernel-module-gpioed \
-	kernel-module-gpioed-ng \
-	kernel-module-lcd \
-	kernel-module-led-class \
 	kernel-module-leds-palmld \
 	kernel-module-ledtrig-heartbeat \
 	kernel-module-ledtrig-hwtimer \
@@ -50,18 +22,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 	kernel-module-pda-power \
 	kernel-module-pxa2xx-core \
 	kernel-module-pxapwm-bl \
-	kernel-module-snd \
-	kernel-module-snd-ac97-codec \
-	kernel-module-snd-page-alloc \
-	kernel-module-snd-pcm \
 	kernel-module-snd-pxa2xx-ac97 \
 	kernel-module-snd-pxa2xx-pcm \
-	kernel-module-snd-seq \
-	kernel-module-snd-seq-device \
-	kernel-module-snd-seq-midi-event \
-	kernel-module-snd-seq-oss \
-	kernel-module-snd-timer \
-	kernel-module-soundcore \
 	kernel-module-wm97xx-ts \		
 	"
 
@@ -71,39 +33,3 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 
 module_conf_wm97xx-ts = "options wm97xx-ts pil=2"
 
-module_autoload_snd-ac97-bus = "snd-ac97-bus"
-module_autoload_apm_power = "apm_power"
-module_autoload_backlight = "backlight"
-module_autoload_battery = "battery"
-module_autoload_bcm2035_uart = "bcm2035_uart"
-module_autoload_gpioed = "gpioed"
-module_autoload_gpioed-ng = "gpioed-ng"
-module_autoload_lcd = "lcd"
-module_autoload_led-class = "led-class"
-module_autoload_leds-palmld = "leds-palmld"
-module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat"
-module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer"
-module_autoload_ledtrig-timer = "ledtrig-timer"
-module_autoload_palmld_battery = "palmld-battery"
-module_autoload_palmld_ide = "palmld-ide"
-module_autoload_palmld_pcmcia = "palmld-pcmcia"
-module_autoload_pcmcia = "pcmcia"
-module_autoload_pcmcia_core = "pcmcia-core"
-module_autoload_pda_power = "pda_power"
-module_autoload_pxa2xx_core = "pxa2xx-core"
-module_autoload_pxapwm_bl = "pxapwm_bl"
-module_autoload_snd = "snd"
-module_autoload_snd-ac97-codec = "snd-ac97-codec"
-module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_snd-page-alloc = "snd-page-alloc"
-module_autoload_snd-pcm = "snd-pcm"
-module_autoload_snd-pcm-oss = "snd-pcm-oss"
-module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm"
-module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
-module_autoload_snd-seq = "snd-seq"
-module_autoload_snd-seq-device = "snd-seq-device"
-module_autoload_seq-midi-event = "seq-midi-event"
-module_autoload_snd-seq-oss = "snd-seq-oss"
-module_autoload_snd-timer = "snd-timer"
-module_autoload_soundcore = "soundcore"
-module_autoload_wm97xx-ts = "wm97xx-ts"