Changes in / [17cc8f4f:b5a3b50] in mainline


Ignore:
Files:
5 added
17 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r17cc8f4f rb5a3b50  
    6565@ "integratorcp" Integratorcp
    6666@ "beagleboardxm" BeogleBoard-xM
    67 @ "beaglebone" BeogleBone
    6867! [PLATFORM=arm32] MACHINE (choice)
    6968
    … …  
    9796% CPU type
    9897@ "armv7_a" ARMv7-A
    99 ! [PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] PROCESSOR (choice)
     98! [PLATFORM=arm32&MACHINE=beagleboardxm] PROCESSOR (choice)
    10099
    101100% RAM disk format
    … …  
    426425% Output device class
    427426@ "generic" Monitor or serial line
    428 ! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_HID_OUT (choice)
     427! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm)] CONFIG_HID_OUT (choice)
    429428
    430429% Output device class
    … …  
    473472! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y)
    474473
    475 % Support for TI AM335x on-chip UART
    476 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_UART (y/n)
    477 
    478 % Support for TI AM335x timers support
    479 ! [PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_TIMERS (y)
    480 
    481 % Support for TI AMDM37x on-chip UART
     474% Support for TI AMDM37X on-chip UART
    482475! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beagleboardxm] CONFIG_AMDM37X_UART (y/n)
    483476
    … …  
    501494
    502495% Serial line input module
    503 ! [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)
     496! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_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)
    504497
    505498% EGA support

  • boot/arch/arm32/Makefile.inc

    r17cc8f4f rb5a3b50  
    3535endif
    3636
    37 ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone))
     37ifeq ($(MACHINE), beagleboardxm)
    3838        BOOT_OUTPUT = image.boot
    3939        POST_OUTPUT = $(ROOT_PATH)/uImage.bin

  • kernel/arch/arm32/Makefile.inc

    r17cc8f4f rb5a3b50  
    8484endif
    8585
    86 ifeq ($(MACHINE),beaglebone)
    87         ARCH_SOURCES += arch/$(KARCH)/src/mach/beaglebone/beaglebone.c
    88 endif
    89 
    9086ifeq ($(CONFIG_PL050),y)
    9187        ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c

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

    r17cc8f4f rb5a3b50  
    3535#include <arch/exception.h>
    3636#include <arch/mach/beagleboardxm/beagleboardxm.h>
    37 #include <genarch/drivers/amdm37x/uart.h>
    38 #include <genarch/drivers/amdm37x/irc.h>
    39 #include <genarch/drivers/amdm37x/gpt.h>
    40 #include <genarch/drivers/amdm37x/dispc.h>
     37#include <genarch/drivers/amdm37x_irc/amdm37x_irc.h>
     38#include <genarch/drivers/amdm37x_uart/amdm37x_uart.h>
     39#include <genarch/drivers/amdm37x_gpt/amdm37x_gpt.h>
     40#include <genarch/drivers/amdm37x_dispc/amdm37x_dispc.h>
    4141#include <genarch/fb/fb.h>
    4242#include <genarch/srln/srln.h>

  • kernel/arch/arm32/src/machine_func.c

    r17cc8f4f rb5a3b50  
    4242#include <arch/mach/integratorcp/integratorcp.h>
    4343#include <arch/mach/beagleboardxm/beagleboardxm.h>
    44 #include <arch/mach/beaglebone/beaglebone.h>
    4544
    4645/** Pointer to machine_ops structure being used. */
    … …  
    5655#elif defined(MACHINE_beagleboardxm)
    5756        machine_ops = &bbxm_machine_ops;
    58 #elif defined(MACHINE_beaglebone)
    59         machine_ops = &bbone_machine_ops;
    6057#else
    6158#error Machine type not defined.

  • kernel/genarch/Makefile.inc

    r17cc8f4f rb5a3b50  
    106106endif
    107107
    108 ifeq ($(CONFIG_AM335X_UART),y)
    109         GENARCH_SOURCES += \
    110                 genarch/src/drivers/am335x/uart.c
    111 endif
    112 
    113 ifeq ($(CONFIG_AM335X_TIMERS),y)
    114         GENARCH_SOURCES += \
    115                 genarch/src/drivers/am335x/timer.c
    116 endif
    117 
    118108ifeq ($(CONFIG_AMDM37X_UART),y)
    119109        GENARCH_SOURCES += \
    120                 genarch/src/drivers/amdm37x/uart.c
     110                genarch/src/drivers/amdm37x_uart/amdm37x_uart.c
    121111endif
    122112
Note: See TracChangeset for help on using the changeset viewer.