Changes in / [eef14771:716357f] in mainline


Ignore:
Files:
4 added
3 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    reef14771 r716357f  
    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
    489492% Support for TI AM335x timers support
    490493! [PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_TIMERS (y)
    491494
    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)
     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)
    494497
    495498% Support for i8042 controller
    … …  
    512515
    513516% Serial line input module
    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)
     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)
    515518
    516519% EGA support

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

    reef14771 r716357f  
    6161static struct beagleboard {
    6262        amdm37x_irc_regs_t *irc_addr;
    63         omap_uart_t uart;
     63        amdm37x_uart_t uart;
    6464        amdm37x_gpt_t timer;
    6565} beagleboard;
    … …  
    167167static void bbxm_output_init(void)
    168168{
    169 #ifdef CONFIG_OMAP_UART
    170169        /* UART3 is wired to external RS232 connector */
    171         const bool ok = omap_uart_init(&beagleboard.uart,
     170        const bool ok = amdm37x_uart_init(&beagleboard.uart,
    172171            AMDM37x_UART3_IRQ, AMDM37x_UART3_BASE_ADDRESS, AMDM37x_UART3_SIZE);
    173172        if (ok) {
    174173                stdout_wire(&beagleboard.uart.outdev);
    175174        }
    176 #endif
    177175}
    178176
    179177static void bbxm_input_init(void)
    180178{
    181 #ifdef CONFIG_OMAP_UART
    182179        srln_instance_t *srln_instance = srln_init();
    183180        if (srln_instance) {
    184181                indev_t *sink = stdin_wire();
    185182                indev_t *srln = srln_wire(srln_instance, sink);
    186                 omap_uart_input_wire(&beagleboard.uart, srln);
     183                amdm37x_uart_input_wire(&beagleboard.uart, srln);
    187184                amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
    188185        }
    189 #endif
    190186}
    191187

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

    reef14771 r716357f  
    6868        am335x_ctrl_module_t  *ctrl_module;
    6969        am335x_timer_t timer;
    70         omap_uart_t uart;
     70        am335x_uart_t uart;
    7171} bbone;
    7272
    … …  
    195195static void bbone_output_init(void)
    196196{
    197 #ifdef CONFIG_OMAP_UART
    198         const bool ok = omap_uart_init(&bbone.uart,
     197        const bool ok = am335x_uart_init(&bbone.uart,
    199198            AM335x_UART0_IRQ, AM335x_UART0_BASE_ADDRESS,
    200199            AM335x_UART0_SIZE);
    … …  
    202201        if (ok)
    203202                stdout_wire(&bbone.uart.outdev);
    204 #endif
    205203}
    206204
    207205static void bbone_input_init(void)
    208206{
    209 #ifdef CONFIG_OMAP_UART
    210207        srln_instance_t *srln_instance = srln_init();
    211208        if (srln_instance) {
    212209                indev_t *sink = stdin_wire();
    213210                indev_t *srln = srln_wire(srln_instance, sink);
    214                 omap_uart_input_wire(&bbone.uart, srln);
     211                am335x_uart_input_wire(&bbone.uart, srln);
    215212                am335x_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
    216213        }
    217 #endif
    218214}
    219215

  • kernel/genarch/Makefile.inc

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

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

    reef14771 r716357f  
    3737#define _KERN_AM335X_UART_H_
    3838
    39 #include <genarch/drivers/omap/uart.h>
     39#include "uart_regs.h"
    4040
    4141#define AM335x_UART0_BASE_ADDRESS    0x44E09000
    … …  
    6363#define AM335x_UART5_IRQ             46
    6464
     65typedef 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
     73extern bool am335x_uart_init(am335x_uart_t *uart, inr_t interrupt,
     74    uintptr_t addr, size_t size);
     75
     76extern void am335x_uart_input_wire(am335x_uart_t *uart, indev_t *indev);
     77#else
     78static bool am335x_uart_init(am335x_uart_t *uart, inr_t interrupt,
     79    uintptr_t addr, size_t size)
     80{ return true; }
     81
     82static void am335x_uart_input_wire(am335x_uart_t *uart, indev_t *indev) {}
     83#endif
     84
    6585#endif
    6686

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

    reef14771 r716357f  
    3737#define _AMDM37x_UART_H_
    3838
    39 #include <genarch/drivers/omap/uart.h>
     39#include "uart_regs.h"
    4040
    4141/* AMDM37x TRM p. 2950 */
    … …  
    5656#define AMDM37x_UART4_IRQ   80 /* AMDM37x TRM p. 2418 */
    5757
     58typedef 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
     66bool amdm37x_uart_init(amdm37x_uart_t *, inr_t, uintptr_t, size_t);
     67void amdm37x_uart_input_wire(amdm37x_uart_t *, indev_t *);
     68
    5869#endif
    5970
Note: See TracChangeset for help on using the changeset viewer.