aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-03-17 11:13:25 -0700
committerTom Rini <tom_rini@mentor.com>2011-03-17 11:13:25 -0700
commitb45c4ccfc40cbde0f5d1b9511320dea1726cb105 (patch)
treec42f0fad8bac713df5b377278f5d0e0654055e13 /conf
parent568e0abfc6cec940dfa9dbe83e7d91e68bfbc59c (diff)
parent02599c18956925b256c1f4c29785d2b033596890 (diff)
downloadopenembedded-b45c4ccfc40cbde0f5d1b9511320dea1726cb105.tar.gz
openembedded-b45c4ccfc40cbde0f5d1b9511320dea1726cb105.tar.bz2
openembedded-b45c4ccfc40cbde0f5d1b9511320dea1726cb105.zip
Merge branch '2011.03-maintenance' of git://dominion.thruhere.net/var/cache/git/openembedded into 2011.03-maintenance
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2008.1.conf3
-rw-r--r--conf/machine/dm368-evm.conf8
2 files changed, 11 insertions, 0 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 0d7c45ddb0..ae1ed4cc0d 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -132,6 +132,9 @@ ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough"
ANGSTROM_BLACKLIST_pn-ipkg = "ipkg has been superseded by opkg"
+ANGSTROM_BLACKLIST_pn-bash-noemu = "doesn't work on the target"
+PREFERRED_PROVIDER_bash = "bash"
+
ANGSTROMLIBC ?= "glibc"
require conf/distro/include/angstrom.inc
diff --git a/conf/machine/dm368-evm.conf b/conf/machine/dm368-evm.conf
new file mode 100644
index 0000000000..f916b36e8a
--- /dev/null
+++ b/conf/machine/dm368-evm.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: DM368 CPUs on a Davinci DM368 EVM board
+#@DESCRIPTION: Machine configuration for the TI Davinci DM368 EVM board
+
+require conf/machine/include/davinci.inc
+require conf/machine/include/dm365.inc
+
+UBOOT_MACHINE = "davinci_dm365_evm_config"