diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-08-12 09:05:48 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-08-12 09:05:48 +0000 |
| commit | b48fac219880c3a0e50ea63f320a3d13c1a53645 (patch) | |
| tree | 4e88a837d3667d6de5ef2c16b7941854f3ba9790 | |
| parent | f1dec1a4c97152e663d0ff507f2b04d94e77a3b9 (diff) | |
| parent | 333d469bc2eb7b14503c99082d26b6a861bc109e (diff) | |
merge of '2813b5b33a80acca8e53166638a06c31c96fc819'
and '71d106209d375802f4d83fc7eba80d5515b6f572'
| -rw-r--r-- | conf/machine/efika.conf | 1 | ||||
| -rw-r--r-- | conf/machine/ep93xx.conf | 10 | ||||
| -rw-r--r-- | packages/linux/handhelds-pxa-2.6/h5xxx/defconfig | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf index 103bd13e4b..2faf6ebed9 100644 --- a/conf/machine/efika.conf +++ b/conf/machine/efika.conf @@ -2,7 +2,6 @@ #@Name: Genisi EFIKA Development Platform #@DESCRIPTION: Machine configuration for teh EFIKA development platform: http://www.pegasosppc.com/efika.php -INHERIT += "linux_modules" TARGET_ARCH = "powerpc" IPKG_EXTRA_ARCHS = "ppc" diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 4b044e838d..955344344a 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -2,7 +2,6 @@ #@Name: Cirrus Logic EP-93xx Development Platform #@DESCRIPTION: Machine configuration for Cirrus Logic EP-93xx Development Platform -INHERIT += "linux_modules" TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4t" @@ -15,10 +14,11 @@ USE_VT = "0" #ship in rootfs: -EP93XX_MODULES = "apm \ - pcmcia-core \ - ipv6 " -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${EP93XX_MODULES}', d)}" +EP93XX_MODULES = "kernel-module-apm \ + kernel-module-pcmcia-core \ + kernel-module-ipv6 " + +BOOTSTRAP_EXTRA_RRECOMMENDS += "${EP93XX_MODULES}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" diff --git a/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig b/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig index 0034b9142c..82f309c895 100644 --- a/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig +++ b/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-hh5 -# Thu Aug 10 14:18:29 2006 +# Sat Aug 12 10:50:22 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -191,13 +191,13 @@ CONFIG_IPAQ_HANDHELD=y # Compaq/HP iPAQ Drivers # CONFIG_IPAQ_CLOCKS=y -CONFIG_IPAQ_SLEEVE=m +CONFIG_IPAQ_SLEEVE=y CONFIG_IPAQ_SAMCOP=y # CONFIG_IPAQ_HAMCOP is not set CONFIG_IPAQ_SAMCOP_TOUCHSCREEN=y # CONFIG_IPAQ_SAMCOP_FSI is not set # CONFIG_IPAQ_SAMCOP_SLEEVE is not set -# CONFIG_IPAQ_SAMCOP_DMA is not set +CONFIG_IPAQ_SAMCOP_DMA=y CONFIG_DMABOUNCE=y # |