h6300: Convert to task-base, organize machine settings per logical groups.

1 files changed, 22 insertions, 23 deletions

diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 18d08ebfcc..bffe1a97e1 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -2,22 +2,34 @@
 #@NAME: OMAP1510 cpu on iPAQ h6315, h6340 and h6365
 #@DESCRIPTION: Machine configuration for the OMAP1510 based HP iPAQ h6300 series devices.
 
+#
+# Hardware-based properties
+#
 TARGET_ARCH = "arm"
 PACKAGE_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4"
 
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+#Use OMAP 1510 cpu specifig arm9tdmi options for gcc
+require conf/machine/include/tune-arm9tdmi.conf
+
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget"
+
+#
+# Software/packages selection
+#
 PREFERRED_PROVIDER_virtual/kernel = "linux-h6300-omap1"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-H6300_MODULES	= "omapts omap-keypad bluetooth rfcomm bnep l2cap hci_uart h6300_bt i2c-dev"
-#common alsa sound modules
-H6300_MODULES  += "snd snd_timer snd_pcm snd_seq_device snd_seq_midi_event snd_page_alloc"
-#h6300 specific alsa sound module
-H6300_MODULES  += "snd-omap-alsa-tsc2101"
-#oss compatibility alsa sound modules
-H6300_MODULES  += "snd_pcm_oss snd_mixer_oss snd_seq_oss"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-omapts \
+                             kernel-module-omap-keypad \
+                             kernel-module-h6300-bt"
 
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+
+#
+# Modules autoload and other boot properties
+#
 module_autoload_omapts = "omapts"
 module_autoload_omap-keypad = "omap-keypad"
 module_autoload_hci_uart = "hci_uart"
@@ -28,17 +40,4 @@ module_autoload_snd-omap-alsa-tsc2101 = "snd-omap-alsa-tsc2101"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils console-tools module-init-tools"
-BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${H6300_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd alsa-utils"
-BOOTSTRAP_EXTRA_RDEPENDS += "alsa-utils-aconnect alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-amixer alsa-utils-aplay"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "scap minicom nano gdb strace network-suspend-scripts pciutils usbutils"
-
-GPE_EXTRA_INSTALL += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator gpe-tetris gpe-othello gpe-go gstreamer"
-
-SERIAL_CONSOLE ?= "115200 ttyS0"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
-
-#Use OMAP 1510 cpu specifig arm9tdmi options for gcc
-require conf/machine/include/tune-arm9tdmi.conf
+SERIAL_CONSOLE = "115200 ttyS0"