Changes in kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c [a14f346:69483af] in mainline

File:

• kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (3 diffs)

kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c

@@ -35 +35 @@
 #include <arch/exception.h>
 #include <arch/mach/beagleboardxm/beagleboardxm.h>
-#include <genarch/drivers/amdm37x_irc/amdm37x_irc.h>
-#include <genarch/drivers/amdm37x_uart/amdm37x_uart.h>
-#include <genarch/drivers/amdm37x_gpt/amdm37x_gpt.h>
+#include <genarch/drivers/amdm37x/uart.h>
+#include <genarch/drivers/amdm37x/irc.h>
+#include <genarch/drivers/amdm37x/gpt.h>
 #include <genarch/fb/fb.h>
 #include <genarch/srln/srln.h>
@@ -61 +61 @@
 static struct beagleboard {
         amdm37x_irc_regs_t *irc_addr;
-        amdm37x_uart_t uart;
+        omap_uart_t uart;
         amdm37x_gpt_t timer;
 } beagleboard;
@@ -167 +167 @@
 static void bbxm_output_init(void)
 {
+#ifdef CONFIG_OMAP_UART
         /* UART3 is wired to external RS232 connector */
-        const bool ok = amdm37x_uart_init(&beagleboard.uart,
+        const bool ok = omap_uart_init(&beagleboard.uart,
             AMDM37x_UART3_IRQ, AMDM37x_UART3_BASE_ADDRESS, AMDM37x_UART3_SIZE);
         if (ok) {
                 stdout_wire(&beagleboard.uart.outdev);
         }
+#endif
 }
 
 static void bbxm_input_init(void)
 {
+#ifdef CONFIG_OMAP_UART
         srln_instance_t *srln_instance = srln_init();
         if (srln_instance) {
                 indev_t *sink = stdin_wire();
                 indev_t *srln = srln_wire(srln_instance, sink);
-                amdm37x_uart_input_wire(&beagleboard.uart, srln);
+                omap_uart_input_wire(&beagleboard.uart, srln);
                 amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
         }
+#endif
 }