From 3aad240431ca5d8021050e14591a4d11e7c9dac5 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sat, 20 Nov 2004 13:17:34 +0000
Subject: start merging kernel 2.6 support into h3900.conf

BKrev: 419f43ee5ebwTTswpc0bvYCa3HbSdg
---
 conf/machine/h3900.conf | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 907437c857..cc3843ea44 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -2,17 +2,25 @@
 #@NAME: Compaq iPAQ 39xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
 #@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
 
+KERNEL = "kernel24"
+#KERNEL = "kernel26"
+
+OVERRIDES_prepend = "${KERNEL}:"
+
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ipaqpxa h3900"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa"
 EXTRA_IMAGECMD_h3900 = "-e 0x40000 -p"
-BOOTSTRAP_EXTRA_DEPENDS = "handhelds-pxa at76c503a-modules"
+BOOTSTRAP_EXTRA_DEPENDS_kernel24 = "handhelds-pxa at76c503a-modules"
+# at76c503a-modules not working with kernel26 yet
+BOOTSTRAP_EXTRA_DEPENDS_kernel26 = "handhelds-pxa-2.6"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ${@linux_module_packages('${H3900_MODULES}')} at76c503a-modules"
 H3900_MODULES = "h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio"
+H3900_MODULES_append_kernel26 = "h3900_lcd asic2_ts"
 
 SERIAL_CONSOLE = "115200 tts/0 vt100"
-USE_DEVFS = "1"
+USE_DEVFS_kernel24 = "1"
 
 include conf/machine/ipaq-common.conf
 include conf/machine/handheld-common.conf
-- 
cgit v1.2.3