diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 19:21:24 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 19:21:24 +0000 |
| commit | 86d1d8cd13335c4dca722ac398c69a105fc9ac8f (patch) | |
| tree | bf7433f99e0fc0ffbdbddd24c2201d21a9dd60e8 /conf/machine/collie.conf | |
| parent | 249a5476b2d2ec15e71b126bb02bc885b29604ee (diff) | |
| parent | 45e1048fb2a2fc047c8a903966ca5cc9d1e03112 (diff) | |
explicit_merge of '93b8d4a095a60dfe2b4b6e82f4ce68721a1d4f11'
and 'd5130c6d17c31fa91dee51b0074c7e5e8c87717c'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'conf/machine/collie.conf')
| -rw-r--r-- | conf/machine/collie.conf | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 4af42deb24..3e95848a35 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support altboot" BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \ sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \ kernel-module-usbdcore kernel-module-usbdmonitor \ @@ -15,15 +14,14 @@ altboot" # kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied # This is needed for the ramdisk script to work -BOOTSTRAP_EXTRA_DEPENDS += "e2fsprogs" BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" IMAGE_LINGUAS = "" -include conf/machine/handheld-common.conf -include conf/machine/tune-strongarm.conf +include conf/machine/include/handheld-common.conf +include conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttyS0" |