summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-10-11 15:22:13 +0000
committerKoen Kooi <koen@openembedded.org>2006-10-11 15:22:13 +0000
commit5cffc5852aa2fe122b184e818ec828f35eac4da7 (patch)
treeadc470ff1101fdc7e9943e7c7e5b27c8de0b89f5 /conf/machine
parent55b3f87987cad72b9b1aeb1286e7f32d06347c4b (diff)
hx4700.conf: drop task-bootstrap support, add task-base support
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/hx4700.conf26
1 files changed, 14 insertions, 12 deletions
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index f6d4e17389..61e4f5d5c2 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -21,12 +21,20 @@ MODUTILS = "26"
MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget"
PCMCIA_MANAGER = "pcmciautils"
-BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${HX4700_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}"
-BOOTSTRAP_EXTRA_RDEPENDS = "tiinit acx-firmware"
-PXA270_MODULES = "snd_pcm_oss snd_mixer_oss hidp \
- nls_cp437 nls_iso8859-1 nls_utf8 af_key"
+MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
+MACHINE_EXTRA__RRECOMMENDS = " kernel-module-snd_pcm_oss \
+ kernel-module-snd_mixer_oss \
+ kernel-module-hidp \
+ kernel-module-nls_cp437 \
+ kernel-module-nls_iso8859-1 \
+ kernel-module-nls_utf8 \
+ kernel-module-af_key \
+ kernel-module-i2c-pxa \
+ kernel-module-hx4700_voltage \
+ kernel-module-hx4700_acx \
+ kernel-module-snd_hx4700_audio"
+
SERIAL_CONSOLE = "115200 ttyS0"
@@ -40,13 +48,7 @@ include conf/machine/include/tune-xscale.conf
#include conf/machine/include/tune-iwmmxt.conf
-# These modules are now compiled into the kernel:
-#HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \
-# hx4700_pcmcia hx4700_ts hx4700_power"
-
-HX4700_MODULES = "i2c-pxa hx4700_voltage hx4700_acx snd_hx4700_audio"
-
-
+#define which modules to load at boot
module_autoload_evdev = "evdev"
module_autoload_hx4700_power = "hx4700_power"
module_autoload_pcmcia = "pcmcia"