Changeset 69483af in mainline


Ignore:
Timestamp:
2013-05-01T23:04:34Z (12 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:
3 edited

Legend:

Unmodified
Added
Removed

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

    r9d504072 r69483af  
    167167static void bbxm_output_init(void)
    168168{
     169#ifdef CONFIG_OMAP_UART
    169170        /* UART3 is wired to external RS232 connector */
    170171        const bool ok = omap_uart_init(&beagleboard.uart,
    … …  
    173174                stdout_wire(&beagleboard.uart.outdev);
    174175        }
     176#endif
    175177}
    176178
    177179static void bbxm_input_init(void)
    178180{
     181#ifdef CONFIG_OMAP_UART
    179182        srln_instance_t *srln_instance = srln_init();
    180183        if (srln_instance) {
    … …  
    184187                amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
    185188        }
     189#endif
    186190}
    187191

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

    r9d504072 r69483af  
    195195static void bbone_output_init(void)
    196196{
     197#ifdef CONFIG_OMAP_UART
    197198        const bool ok = omap_uart_init(&bbone.uart,
    198199            AM335x_UART0_IRQ, AM335x_UART0_BASE_ADDRESS,
    … …  
    201202        if (ok)
    202203                stdout_wire(&bbone.uart.outdev);
     204#endif
    203205}
    204206
    205207static void bbone_input_init(void)
    206208{
     209#ifdef CONFIG_OMAP_UART
    207210        srln_instance_t *srln_instance = srln_init();
    208211        if (srln_instance) {
    … …  
    212215                am335x_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
    213216        }
     217#endif
    214218}
    215219

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

    r9d504072 r69483af  
    4646} omap_uart_t;
    4747
    48 #ifdef CONFIG_OMAP_UART
    4948extern bool omap_uart_init(omap_uart_t *uart, inr_t interrupt,
    5049    uintptr_t addr, size_t size);
    5150
    5251extern void omap_uart_input_wire(omap_uart_t *uart, indev_t *indev);
    53 #else
    54 static bool omap_uart_init(omap_uart_t *uart, inr_t interrupt,
    55     uintptr_t addr, size_t size)
    56 { return true; }
    57 
    58 static void omap_uart_input_wire(omap_uart_t *uart, indev_t *indev) {}
    59 #endif
    6052
    6153#endif
Note: See TracChangeset for help on using the changeset viewer.