diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-11 13:40:08 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-11 13:40:08 +0000 |
| commit | 435b0558b6623957fa2cee67a32c9a23441d4718 (patch) | |
| tree | 2820700a90fca027b34085c0e56cbef148033162 /conf/machine | |
| parent | 5fe7407d409eda9fd6edfc751c9f2966a11fb5fa (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/06/11 15:17:56+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded
2005/06/11 15:17:43+02:00 utwente.nl!koen
h3900.conf: fix h3900 modules confusion
BKrev: 42aae9b8Ai-LIsWqBmpU4PrVBIrZAw
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/h3900.conf | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index d49cd63e7b..9360d6bbb9 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices KERNEL ?= "kernel24" -#KERNEL = "kernel26" +#KERNEL ?= "kernel26" OVERRIDES_prepend = "${KERNEL}:" @@ -12,16 +12,18 @@ IPKG_ARCHS = "all arm ipaqpxa h3900" 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" -# at76c503a-modules not working with kernel26 yet BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " handhelds-pxa-2.6 udev module-init-tools" + 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_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" + +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" + SERIAL_CONSOLE = "115200 tts/0 vt100" USE_DEVFS_kernel24 = "1" |