summaryrefslogtreecommitdiff
path: root/conf/machine/triton.conf
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-01-10 03:24:12 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-10 03:24:12 +0000
commit2427fe5ac44f39555ca3b1fee8e0a234917cbe96 (patch)
tree645d2eb99781cb79ea1ddf3514b29cef996b4ea1 /conf/machine/triton.conf
parent931b88d4f952a2fbba63d9cbfbe6e5816cacfa95 (diff)
parent8bc640253e3402ed705484106527fa8f437e99e8 (diff)
merge of 050df893918bae2f4a6a2cb3fcdc9f0ee8e8ee04
and 1819e7c9879b392cfb2bdae2cd3d9d59c7e28a49
Diffstat (limited to 'conf/machine/triton.conf')
-rw-r--r--conf/machine/triton.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf
index aea420907f..cb5c8fb9cd 100644
--- a/conf/machine/triton.conf
+++ b/conf/machine/triton.conf
@@ -6,7 +6,6 @@ TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm armv5te ${MACHINE}"
PREFERRED_PROVIDER_virtual/kernel = "triton-kernel"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel"
BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel"
EXTRA_IMAGECMD_jffs2 = "--pad=0x1dc0000 --little-endian --eraseblock=0x40000 -n"
@@ -15,5 +14,5 @@ SERIAL_CONSOLE = "38400 ttyS0"
KERNEL_CONSOLE = "ttys0,38400"
USE_VT = "0"
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf