5 files changed, 9 insertions, 17 deletions
diff --git a/board/avionic-design/common/tamonten.c b/board/avionic-design/common/tamonten.c
index 93f12ea4f19..e6a932ec3c7 100644
--- a/board/avionic-design/common/tamonten.c
+++ b/board/avionic-design/common/tamonten.c
@@ -27,27 +27,19 @@
 #include <ns16550.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
-#include <asm/arch/board.h>
-#include <asm/arch/tegra20.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/arch/clk_rst.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
-#include <asm/arch/uart.h>
-#include <asm/arch/mmc.h>
-
+#include <asm/arch/tegra.h>
+#include <asm/arch-tegra/board.h>
+#include <asm/arch-tegra/clk_rst.h>
+#include <asm/arch-tegra/mmc.h>
+#include <asm/arch-tegra/sys_proto.h>
+#include <asm/arch-tegra/uart.h>
 #ifdef CONFIG_TEGRA_MMC
 #include <mmc.h>
 #endif
 
-/*
- * Routine: gpio_config_uart
- * Description: Does nothing on Tamonten - no conflict w/SPI.
- */
-void gpio_config_uart(void)
-{
-}
 
 #ifdef CONFIG_BOARD_EARLY_INIT_F
 void gpio_early_init(void)
diff --git a/board/avionic-design/dts/tegra20-medcom.dts b/board/avionic-design/dts/tegra20-medcom-wide.dts
index fc52f9ce4e1..f916122421a 100644
--- a/board/avionic-design/dts/tegra20-medcom.dts
+++ b/board/avionic-design/dts/tegra20-medcom-wide.dts
@@ -4,7 +4,7 @@
 
 / {
 	model = "Avionic Design Medcom-Wide";
-	compatible = "avionic-design,medcom", "nvidia,tegra20";
+	compatible = "ad,medcom-wide", "nvidia,tegra20";
 
 	aliases {
 		usb0 = "/usb@c5008000";
diff --git a/board/avionic-design/dts/tegra20-plutux.dts b/board/avionic-design/dts/tegra20-plutux.dts
index cef49ad8048..78c394f9358 100644
--- a/board/avionic-design/dts/tegra20-plutux.dts
+++ b/board/avionic-design/dts/tegra20-plutux.dts
@@ -4,7 +4,7 @@
 
 / {
 	model = "Avionic Design Plutux";
-	compatible = "avionic-design,plutux", "nvidia,tegra20";
+	compatible = "ad,plutux", "nvidia,tegra20";
 
 	aliases {
 		usb0 = "/usb@c5008000";
diff --git a/board/avionic-design/dts/tegra20-tec.dts b/board/avionic-design/dts/tegra20-tec.dts
index bb3851b57d1..50ea3b51e4a 100644
--- a/board/avionic-design/dts/tegra20-tec.dts
+++ b/board/avionic-design/dts/tegra20-tec.dts
@@ -4,7 +4,7 @@
 
 / {
 	model = "Avionic Design Tamonten Evaluation Carrier";
-	compatible = "avionic-design,tec", "nvidia,tegra20";
+	compatible = "ad,tec", "nvidia,tegra20";
 
 	aliases {
 		usb0 = "/usb@c5008000";
diff --git a/board/avionic-design/medcom/Makefile b/board/avionic-design/medcom-wide/Makefile
index 864bc0ec01c..864bc0ec01c 100644
--- a/board/avionic-design/medcom/Makefile
+++ b/board/avionic-design/medcom-wide/Makefile