summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/h3900.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 93226435ed..a095f15cdf 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -10,7 +10,8 @@ OVERRIDES_prepend = "${KERNEL}:"
TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm ipaqpxa h3900"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa"
+PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
+PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p"
BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
@@ -25,8 +26,8 @@ H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic h5400_asic pxa_ir h5400_
H3900_MODULES_kernel26 = " h3900_lcd h5400_lcd asic2_adcts g_ether apm h5400_battery h3900_battery pcmcia-core"
# pxa2xx_udc is built in to the kernel
-
SERIAL_CONSOLE = "115200 tts/0 vt100"
+
USE_DEVFS_kernel24 = "1"
USE_VT = "0"