h4000.conf: changes from #1266

diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index bf653d9..410de9a 100644 (file)
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -2,13 +2,16 @@
 #@NAME: HP iPAQ h4xxx
 #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx
 
+INHERIT += "linux_modules"
+
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h4000"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
 ROOT_FLASH_SIZE = "32"
+PCMCIA_MANAGER = "pcmciautils"
 
 BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RRECOMMENDS = " ${BOOT_MODULES}"
@@ -21,16 +24,15 @@ H4000_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_g_ether = "g_ether"
 
-SERIAL_CONSOLE = "115200 tts/0 vt100"
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
 
 USE_VT = "0"
 
-include conf/machine/ipaq-common.conf
-include conf/machine/handheld-common.conf
+include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "smallscreen"
 
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 # LAB can only resolve relative symlinks
 ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "