Switch back to included device trees - possibly it was a regression on upgraded 7.11.

Author: Matthew West

source/c_uart.c

@@ -38,11 +38,11 @@ BBIO_err uart_setup(const char *dt)
 BBIO_err uart_cleanup(void)
 {
     BBIO_err e1, e2, e3, e4, e5;
-    e1 = unload_device_tree("BB-UART1");
-    e2 = unload_device_tree("BB-UART2");
-    e3 = unload_device_tree("BB-UART3");
-    e4 = unload_device_tree("BB-UART4");
-    e5 = unload_device_tree("BB-UART5");
+    e1 = unload_device_tree("ADAFRUIT-UART1");
+    e2 = unload_device_tree("ADAFRUIT-UART2");
+    e3 = unload_device_tree("ADAFRUIT-UART3");
+    e4 = unload_device_tree("ADAFRUIT-UART4");
+    e5 = unload_device_tree("ADAFRUIT-UART5");
     if (e1 != BBIO_OK)
         return e1;
     if (e2 != BBIO_OK)

source/common.c

@@ -158,11 +158,11 @@ typedef struct uart_t {
 } uart_t;
 
 uart_t uart_table[] = {
-  { "UART1", "/dev/ttyO1", "BB-UART1", "P9_26", "P9_24"},
-  { "UART2", "/dev/ttyO2", "BB-UART2", "P9_22", "P9_21"},
-  { "UART3", "/dev/ttyO3", "BB-UART3", "P9_42", ""},
-  { "UART4", "/dev/ttyO4", "BB-UART4", "P9_11", "P9_13"},
-  { "UART5", "/dev/ttyO5", "BB-UART5", "P8_38", "P8_37"},
+  { "UART1", "/dev/ttyO1", "ADAFRUIT-UART1", "P9_26", "P9_24"},
+  { "UART2", "/dev/ttyO2", "ADAFRUIT-UART2", "P9_22", "P9_21"},
+  { "UART3", "/dev/ttyO3", "ADAFRUIT-UART3", "P9_42", ""},
+  { "UART4", "/dev/ttyO4", "ADAFRUIT-UART4", "P9_11", "P9_13"},
+  { "UART5", "/dev/ttyO5", "ADAFRUIT-UART5", "P8_38", "P8_37"},
   { NULL, NULL, 0 }
 };