Changes in / [7462674:8f88beb] in mainline


Ignore:
Files:
17 added
5 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • HelenOS.config

    r7462674 r8f88beb  
    6666@ "integratorcp" Integratorcp
    6767@ "beagleboardxm" BeogleBoard-xM
     68@ "beaglebone" BeogleBone
    6869! [PLATFORM=arm32] MACHINE (choice)
    6970
     
    9798% CPU type
    9899@ "armv7_a" ARMv7-A
    99 ! [PLATFORM=arm32&MACHINE=beagleboardxm] PROCESSOR (choice)
    100 
     100! [PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] PROCESSOR (choice)
    101101
    102102% RAM disk format
     
    420420% Output device class
    421421@ "generic" Monitor or serial line
    422 ! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm)] CONFIG_HID_OUT (choice)
     422! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_HID_OUT (choice)
    423423
    424424% Output device class
     
    480480! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y)
    481481
    482 % Support for TI AMDM37X on-chip UART
     482% Support for TI AM335x on-chip UART
     483! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_UART (y/n)
     484
     485% Support for TI AM335x timers support
     486! [PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_TIMERS (y)
     487
     488% Support for TI AMDM37x on-chip UART
    483489! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beagleboardxm] CONFIG_AMDM37X_UART (y/n)
    484490
     
    502508
    503509% Serial line input module
    504 ! [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)
     510! [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)
    505511
    506512% EGA support
  • boot/arch/arm32/Makefile.inc

    r7462674 r8f88beb  
    3535endif
    3636
    37 ifeq ($(MACHINE), beagleboardxm)
     37ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone))
    3838        BOOT_OUTPUT = image.boot
    3939        POST_OUTPUT = $(ROOT_PATH)/uImage.bin
  • kernel/arch/arm32/Makefile.inc

    r7462674 r8f88beb  
    7878endif
    7979
     80ifeq ($(MACHINE),beaglebone)
     81        ARCH_SOURCES += arch/$(KARCH)/src/mach/beaglebone/beaglebone.c
     82endif
     83
    8084ifeq ($(CONFIG_PL050),y)
    8185        ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c
  • kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c

    r7462674 r8f88beb  
    3535#include <arch/exception.h>
    3636#include <arch/mach/beagleboardxm/beagleboardxm.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>
     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>
    4141#include <genarch/fb/fb.h>
    4242#include <genarch/srln/srln.h>
  • kernel/arch/arm32/src/machine_func.c

    r7462674 r8f88beb  
    4343#include <arch/mach/testarm/testarm.h>
    4444#include <arch/mach/beagleboardxm/beagleboardxm.h>
     45#include <arch/mach/beaglebone/beaglebone.h>
    4546
    4647/** Pointer to machine_ops structure being used. */
     
    5859#elif defined(MACHINE_beagleboardxm)
    5960        machine_ops = &bbxm_machine_ops;
     61#elif defined(MACHINE_beaglebone)
     62        machine_ops = &bbone_machine_ops;
    6063#else
    6164#error Machine type not defined.
  • kernel/genarch/Makefile.inc

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