Changes in / [716357f:eef14771] in mainline


Ignore:
Files:
3 added
4 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r716357f reef14771  
    487487! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y)
    488488
    489 % Support for TI AM335x on-chip UART
    490 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_UART (y/n)
    491 
    492489% Support for TI AM335x timers support
    493490! [PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_TIMERS (y)
    494491
    495 % Support for TI AMDM37x on-chip UART
    496 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beagleboardxm] CONFIG_AMDM37X_UART (y/n)
     492% Support for OMAP on-chip UART
     493! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_OMAP_UART (y/n)
    497494
    498495% Support for i8042 controller
    … …  
    515512
    516513% Serial line input module
    517 ! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_AM335X_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_AMDM37X_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
     514! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
    518515
    519516% EGA support

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

    r716357f reef14771  
    6161static struct beagleboard {
    6262        amdm37x_irc_regs_t *irc_addr;
    63         amdm37x_uart_t uart;
     63        omap_uart_t uart;
    6464        amdm37x_gpt_t timer;
    6565} beagleboard;
    … …  
    167167static void bbxm_output_init(void)
    168168{
     169#ifdef CONFIG_OMAP_UART
    169170        /* UART3 is wired to external RS232 connector */
    170         const bool ok = amdm37x_uart_init(&beagleboard.uart,
     171        const bool ok = omap_uart_init(&beagleboard.uart,
    171172            AMDM37x_UART3_IRQ, AMDM37x_UART3_BASE_ADDRESS, AMDM37x_UART3_SIZE);
    172173        if (ok) {
    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) {
    181184                indev_t *sink = stdin_wire();
    182185                indev_t *srln = srln_wire(srln_instance, sink);
    183                 amdm37x_uart_input_wire(&beagleboard.uart, srln);
     186                omap_uart_input_wire(&beagleboard.uart, srln);
    184187                amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
    185188        }
     189#endif
    186190}
    187191

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

    r716357f reef14771  
    6868        am335x_ctrl_module_t  *ctrl_module;
    6969        am335x_timer_t timer;
    70         am335x_uart_t uart;
     70        omap_uart_t uart;
    7171} bbone;
    7272
    … …  
    195195static void bbone_output_init(void)
    196196{
    197         const bool ok = am335x_uart_init(&bbone.uart,
     197#ifdef CONFIG_OMAP_UART
     198        const bool ok = omap_uart_init(&bbone.uart,
    198199            AM335x_UART0_IRQ, AM335x_UART0_BASE_ADDRESS,
    199200            AM335x_UART0_SIZE);
    … …  
    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) {
    209212                indev_t *sink = stdin_wire();
    210213                indev_t *srln = srln_wire(srln_instance, sink);
    211                 am335x_uart_input_wire(&bbone.uart, srln);
     214                omap_uart_input_wire(&bbone.uart, srln);
    212215                am335x_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
    213216        }
     217#endif
    214218}
    215219

  • kernel/genarch/Makefile.inc

    r716357f reef14771  
    105105endif
    106106
    107 ifeq ($(CONFIG_AM335X_UART),y)
     107ifeq ($(CONFIG_OMAP_UART),y)
    108108        GENARCH_SOURCES += \
    109                 genarch/src/drivers/am335x/uart.c
     109                genarch/src/drivers/omap/uart.c
    110110endif
    111111
    … …  
    113113        GENARCH_SOURCES += \
    114114                genarch/src/drivers/am335x/timer.c
    115 endif
    116 
    117 ifeq ($(CONFIG_AMDM37X_UART),y)
    118         GENARCH_SOURCES += \
    119                 genarch/src/drivers/amdm37x/uart.c
    120115endif
    121116

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

    r716357f reef14771  
    3737#define _KERN_AM335X_UART_H_
    3838
    39 #include "uart_regs.h"
     39#include <genarch/drivers/omap/uart.h>
    4040
    4141#define AM335x_UART0_BASE_ADDRESS    0x44E09000
    … …  
    6363#define AM335x_UART5_IRQ             46
    6464
    65 typedef struct {
    66         am335x_uart_regs_t *regs;
    67         indev_t *indev;
    68         outdev_t outdev;
    69         irq_t irq;
    70 } am335x_uart_t;
    71 
    72 #ifdef CONFIG_AM335X_UART
    73 extern bool am335x_uart_init(am335x_uart_t *uart, inr_t interrupt,
    74     uintptr_t addr, size_t size);
    75 
    76 extern void am335x_uart_input_wire(am335x_uart_t *uart, indev_t *indev);
    77 #else
    78 static bool am335x_uart_init(am335x_uart_t *uart, inr_t interrupt,
    79     uintptr_t addr, size_t size)
    80 { return true; }
    81 
    82 static void am335x_uart_input_wire(am335x_uart_t *uart, indev_t *indev) {}
    83 #endif
    84 
    8565#endif
    8666

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

    r716357f reef14771  
    3737#define _AMDM37x_UART_H_
    3838
    39 #include "uart_regs.h"
     39#include <genarch/drivers/omap/uart.h>
    4040
    4141/* AMDM37x TRM p. 2950 */
    … …  
    5656#define AMDM37x_UART4_IRQ   80 /* AMDM37x TRM p. 2418 */
    5757
    58 typedef struct {
    59         amdm37x_uart_regs_t *regs;
    60         indev_t *indev;
    61         outdev_t outdev;
    62         irq_t irq;
    63 } amdm37x_uart_t;
    64 
    65 
    66 bool amdm37x_uart_init(amdm37x_uart_t *, inr_t, uintptr_t, size_t);
    67 void amdm37x_uart_input_wire(amdm37x_uart_t *, indev_t *);
    68 
    6958#endif
    7059
Note: See TracChangeset for help on using the changeset viewer.