diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-07-26 22:35:09 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-07-26 22:35:09 +0000 |
| commit | 3eb6f4614079df0b36b54164d6d6bc34ca7ce9ee (patch) | |
| tree | 97062df0d4a0a1021993e11bf72d649acfe9db0a /conf | |
| parent | 1a6c39c1b8b1b70afd800b82e5aea83be700a692 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages
2004/07/27 00:28:12+02:00 vanille.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into allanon.vanille.de:/usr/local/projects/packages
2004/07/27 00:25:53+02:00 vanille.de!mickeyl
reduce duplicated modules in machine configurations
2004/07/26 22:55:52+01:00 nexus.co.uk!pb
set DEFAULT_PREFERENCE=1 so that oemake prefers it over version 2.0
2004/07/26 22:08:47+01:00 nexus.co.uk!pb
Merge bk://openembedded@openembedded.bkbits.net/packages
into workhouse.nexus.co.uk:/home/pb/oe/oe-packages
2004/07/26 22:07:37+01:00 nexus.co.uk!pb
update gtk to 2.4.4
2004/07/26 21:48:34+01:00 (none)!pb
add --export-dynamic to LDFLAGS
2004/07/26 21:47:42+01:00 (none)!pb
set ORBIT_IDL in do_compile
BKrev: 4105871divQBk4byqxFye_T1td67Zw
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/beagle.conf | 7 | ||||
| -rw-r--r-- | conf/collie.conf | 3 | ||||
| -rw-r--r-- | conf/zaurus-pxa.conf | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/conf/beagle.conf b/conf/beagle.conf index 39808c09d2..ee09262cb7 100644 --- a/conf/beagle.conf +++ b/conf/beagle.conf @@ -8,9 +8,10 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "montavista-sa" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules" BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral hostap-modules orinoco-modules \ -kernel-module-gpio kernel-module-ip-gre kernel-module-ipip kernel-module-irnet \ -kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor " +kernel-module-net-fd \ +kernel-module-sa1100-bi kernel-module-usbdcore kernel-module-usbdmonitor " + +#kernel-module-gpio kernel-module-registers EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" diff --git a/conf/collie.conf b/conf/collie.conf index 17cc50adde..f84f1cd77d 100644 --- a/conf/collie.conf +++ b/conf/collie.conf @@ -8,8 +8,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support" BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support \ -kernel-module-devinfo kernel-module-gpio kernel-module-ip-gre \ -kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \ +kernel-module-devinfo kernel-module-gpio kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \ kernel-module-usbdcore kernel-module-usbdmonitor " EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" diff --git a/conf/zaurus-pxa.conf b/conf/zaurus-pxa.conf index 160bb3c386..eda4ea9a30 100644 --- a/conf/zaurus-pxa.conf +++ b/conf/zaurus-pxa.conf @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support chkhinge" BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules sharp-sdmmc-support \ -kernel-module-ip-gre kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ +kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral chkhinge" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n" |