diff options
author | Koen Kooi <koen@openembedded.org> | 2006-10-16 13:58:07 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2006-10-16 13:58:07 +0000 |
commit | 00a1aa7d8aa69edfcde4cbb2c96597c1f63e6a43 (patch) | |
tree | 8917adef007f771d78742db1c72dd36dde5a04c3 /conf/machine/collie.conf | |
parent | f8e702ad4d191eeb23dc78bd2db3c2ed023aa00e (diff) | |
parent | 7810352ab397b66e7c4f46bddd09bd68e7a0cadf (diff) |
merge of '3a72c4b2962d909444aaaee9569be3bb90169577'
and '514b31d89c294ce11810ee76a2138d455216409b'
Diffstat (limited to 'conf/machine/collie.conf')
-rw-r--r-- | conf/machine/collie.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 0363f05e6b..fcaa2ff046 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -5,8 +5,9 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \ -sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \ +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs \ +sharp-sdmmc-support" +BOOTSTRAP_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \ kernel-module-usbdcore kernel-module-usbdmonitor \ altboot" @@ -19,7 +20,6 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" IMAGE_LINGUAS = "" -include conf/machine/include/handheld-common.conf include conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttyS0" |