hx4700.conf: drop task-bootstrap support, add task-base support

diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index f6d4e17..61e4f5d 100644 (file)
--- 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"