Changeset 69483af in mainline

Timestamp:

2013-05-01T23:04:34Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

eef14771

Parents:

9d504072

Message:

Fix build when CONFIG_OMAP_UART is not defined

Location:

kernel

Files:

• arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (3 diffs)
• arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (3 diffs)
• genarch/include/genarch/drivers/omap/uart.h (modified) (1 diff)

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

@@ -167 +167 @@
 static void bbxm_output_init(void)
 {
+#ifdef CONFIG_OMAP_UART
         /* UART3 is wired to external RS232 connector */
         const bool ok = omap_uart_init(&beagleboard.uart,
@@ -173 +174 @@
                 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) {
@@ -184 +187 @@
                 amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
         }
+#endif
 }
 

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

@@ -195 +195 @@
 static void bbone_output_init(void)
 {
+#ifdef CONFIG_OMAP_UART
         const bool ok = omap_uart_init(&bbone.uart,
             AM335x_UART0_IRQ, AM335x_UART0_BASE_ADDRESS,
@@ -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) {
@@ -212 +215 @@
                 am335x_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
         }
+#endif
 }
 

kernel/genarch/include/genarch/drivers/omap/uart.h

@@ -46 +46 @@
 } omap_uart_t;
 
-#ifdef CONFIG_OMAP_UART
 extern bool omap_uart_init(omap_uart_t *uart, inr_t interrupt,
     uintptr_t addr, size_t size);
 
 extern void omap_uart_input_wire(omap_uart_t *uart, indev_t *indev);
-#else
-static bool omap_uart_init(omap_uart_t *uart, inr_t interrupt,
-    uintptr_t addr, size_t size)
-{ return true; }
-
-static void omap_uart_input_wire(omap_uart_t *uart, indev_t *indev) {}
-#endif
 
 #endif