h3600: Upgrade machine config to use 2.6 kernel.

* 2.6 support in HH.org reached level of usability (keys, TS, battery, flash
work)
* It was decided to switch to 2.6, as that general direction where OE moves,
and to not clutter repository. Dear 2.4 users, please upgrade, or use SCM to
fetch old version (no longer supported thus).
* Approved by Koen Kooi.

diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 104d518..6297e07 100644 (file)
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -6,45 +6,53 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "ipaqsa"
+PACKAGE_EXTRA_ARCHS = "armv4 ipaqsa"
 
 require conf/machine/include/tune-strongarm.conf
 
-# h3700, h3800 have 32, but let that be bonus
+# h3700, h3800 have 32, but let that be the bonus
 ROOT_FLASH_SIZE = "16"
 # h3630 have 32Mb only
 VOLATILE_STORAGE_SIZE = "64"
 GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget"
 
 #
 # Software/packages selection
 #
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa"
-PREFERRED_VERSION_handhelds-sa ?= "2.4.19-rmk6-pxa1-hh42"
-BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}"
+
+MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
+                             kernel-module-micro"
+
 EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p"
 
-H3600_MODULES = "\
-h3600-asic \
-h3600-micro \
-hwtimer \
-nvrd \
-sa1100-cs \
-sa1100-ir \
-sa1100-wdt \
-sa1100-audio \
-sa1100-rtc \
-sa1100usb-core \
-sd-mod \
-serial-h3800 \
-usb-char \
-usb-eth"
+
+
+# TODO: see if any of these modules have 2.6 counterparts
+# and need to be RRECOMMENDED
+#
+#H3600_MODULES = "\
+#h3600-asic \
+#hwtimer \
+#nvrd \
+#sa1100-cs \
+#sa1100-ir \
+#sa1100-wdt \
+#sa1100-audio \
+#sa1100-rtc \
+#sa1100usb-core \
+#sd-mod \
+#serial-h3800 \
+#"
+
+
 
 #
 # Modules autoload and other boot properties
 #
-USE_DEVFS = "1"
+SERIAL_CONSOLE = "115200 ttySA0 vt100"
 USE_VT = "0"
-
-SERIAL_CONSOLE = "115200 ttySA0"