summaryrefslogtreecommitdiffstats
path: root/board/avionic-design/dts/tegra20-plutux.dts
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-03-15 20:50:43 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-03-15 20:50:43 +0100
commitb27673ccbd3d5435319b5c09c3e7061f559f925d (patch)
tree24c58f5a1e950ec107f40690032ac89c62d3ad83 /board/avionic-design/dts/tegra20-plutux.dts
parent6579d15c58e2b6b051f126ea8b77dd767252aa14 (diff)
parent477393e7875cf4261f107fdfb8887309ea7fc3f7 (diff)
downloadtalos-obmc-uboot-b27673ccbd3d5435319b5c09c3e7061f559f925d.tar.gz
talos-obmc-uboot-b27673ccbd3d5435319b5c09c3e7061f559f925d.zip
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/avionic-design/dts/tegra20-plutux.dts')
-rw-r--r--board/avionic-design/dts/tegra20-plutux.dts3
1 files changed, 2 insertions, 1 deletions
diff --git a/board/avionic-design/dts/tegra20-plutux.dts b/board/avionic-design/dts/tegra20-plutux.dts
index 3e6cce013e..20016f29bb 100644
--- a/board/avionic-design/dts/tegra20-plutux.dts
+++ b/board/avionic-design/dts/tegra20-plutux.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ ARCH_CPU_DTS
+#include "tegra20-tamonten.dtsi"
/ {
model = "Avionic Design Plutux";
@@ -8,6 +8,7 @@
aliases {
usb0 = "/usb@c5008000";
+ sdhci0 = "/sdhci@c8000600";
};
memory {
OpenPOWER on IntegriCloud