Changes in kernel/arch/arm32/src/mach/beaglebone/beaglebone.c [9c56996:69483af] in mainline

File:

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

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

@@ -68 +68 @@
         am335x_ctrl_module_t  *ctrl_module;
         am335x_timer_t timer;
-        am335x_uart_t uart;
+        omap_uart_t uart;
 } bbone;
 
@@ -195 +195 @@
 static void bbone_output_init(void)
 {
-        const bool ok = am335x_uart_init(&bbone.uart,
+#ifdef CONFIG_OMAP_UART
+        const bool ok = omap_uart_init(&bbone.uart,
             AM335x_UART0_IRQ, AM335x_UART0_BASE_ADDRESS,
             AM335x_UART0_SIZE);
@@ -201 +202 @@
         if (ok)
                 stdout_wire(&bbone.uart.outdev);
+#endif
 }
 
 static void bbone_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);
-                am335x_uart_input_wire(&bbone.uart, srln);
+                omap_uart_input_wire(&bbone.uart, srln);
                 am335x_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
         }
+#endif
 }