clean up override mess and header

diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 9470fe0..58a1788 100644 (file)
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -1,28 +1,21 @@
 #@TYPE: Machine
-#@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
+#@NAME: iPAQ hx47xx hx2xxx
+#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU  devices
 
-KERNEL ?= "kernel24"
-#KERNEL ?= "kernel26"
-
-OVERRIDES := "${KERNEL}:${OVERRIDES}"
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ipaqpxa h3900"
+IPKG_ARCHS = "all arm ipaqpxa hx4700"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa"
 EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p"
 
 BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
-BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 = " handhelds-pxa at76c503a-modules"
-BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " handhelds-pxa-2.6 udev module-init-tools"
+BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
 
-H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio h3900-uda1380"
-H3900_MODULES_kernel26 = " h3900_lcd asic2_ts g_ether pxa2xx_udc"
+PXA270_MODULES = "g_ether pxa2xx_udc"
 
 
 SERIAL_CONSOLE = "115200 tts/0 vt100"
@@ -32,7 +25,7 @@ USE_VT = "0"
 include conf/machine/ipaq-common.conf
 include conf/machine/handheld-common.conf
 
-GUI_MACHINE_CLASS = "smallscreen"
+GUI_MACHINE_CLASS = "largescreen"
 
 # not using tune-xscale so as to retain backwards compatibility
 include conf/machine/tune-strongarm.conf