diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 19:19:08 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 19:19:08 +0000 |
| commit | 45e1048fb2a2fc047c8a903966ca5cc9d1e03112 (patch) | |
| tree | 6f5c507ceb9741a5598d2531b980c2f6d7ddf7f0 /conf/machine/omap1510inn.conf | |
| parent | edbb148535f63e58a8e10ed5c68b7aecb983602e (diff) | |
| parent | ce0af9851e5a2231b9ed9fcfecfd10cc4b7794c3 (diff) | |
explicit_merge of '85da89c673cc2faec29d5ea692e6e7638f4c1b5e'
and '5f32961e5d0f4132f4513cbeac7fe59dc5ae5315'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'conf/machine/omap1510inn.conf')
| -rw-r--r-- | conf/machine/omap1510inn.conf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf index 40aaa2917a..9c460b44b8 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -9,10 +9,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf |