Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/01 17:36:00+02:00 utwente.nl!koen
  clean up h3900.conf a bit

BKrev: 429dd6dc_G5bK8u8cGA2cTFWtNJfng

diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 246e296..d49cd63 100644 (file)
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -2,7 +2,7 @@
 #@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 ?= "kernel24"
 #KERNEL = "kernel26"
 
 OVERRIDES_prepend = "${KERNEL}:"
@@ -11,7 +11,7 @@ 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"
+EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p"
 BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
 BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 = " handhelds-pxa at76c503a-modules"
 # at76c503a-modules not working with kernel26 yet
@@ -19,7 +19,7 @@ BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " handhelds-pxa-2.6 udev module-init-t
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}')}"
 BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"
 BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
-H3900_MODULES = "h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio h3900-uda1380"
+H3900_MODULES_kernel24 = "h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio h3900-uda1380"
 H3900_MODULES_append_kernel24 = " g_ether pxa2xx_udc"
 H3900_MODULES_append_kernel26 = " h3900_lcd asic2_ts"