diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-03-19 20:56:09 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-03-19 20:56:09 +0100 |
| commit | 6a21d65d2840c58cfa7cd749a04669d8f7980646 (patch) | |
| tree | 00b1aa153b69cda8cf9406c4700fd7730c34d3a5 /conf/machine | |
| parent | dcfe7349b369a87881cf1fa43085d9e9c5609fcf (diff) | |
| parent | 6f854d71c347475d53d5080a5490625345d95d12 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/dm355-leopard.conf | 2 | ||||
| -rw-r--r-- | conf/machine/wrap.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/dm355-leopard.conf b/conf/machine/dm355-leopard.conf index a9699499b7..5131488577 100644 --- a/conf/machine/dm355-leopard.conf +++ b/conf/machine/dm355-leopard.conf @@ -13,7 +13,7 @@ UBOOT_ENTRYPOINT = "0x80008000" SERIAL_CONSOLE ?= "115200 ttyS0" -MACHINE_FEATURES = "kernel26 alsa" +MACHINE_FEATURES = "kernel26 alsa ethernet usbhost usbgadget mmc" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf index 92720043f2..1fc75ebe94 100644 --- a/conf/machine/wrap.conf +++ b/conf/machine/wrap.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "i486" PACKAGE_EXTRA_ARCHS = "i386 x86" -PREFERRED_PROVIDER_virtual/kernel = "linux-wrap-geode" +PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" # Serial console settings for sysvinit |