Changes in / [7462674:8f88beb] in mainline
- Files:
-
- 17 added
- 5 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
HelenOS.config
r7462674 r8f88beb 66 66 @ "integratorcp" Integratorcp 67 67 @ "beagleboardxm" BeogleBoard-xM 68 @ "beaglebone" BeogleBone 68 69 ! [PLATFORM=arm32] MACHINE (choice) 69 70 … … 97 98 % CPU type 98 99 @ "armv7_a" ARMv7-A 99 ! [PLATFORM=arm32&MACHINE=beagleboardxm] PROCESSOR (choice) 100 100 ! [PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] PROCESSOR (choice) 101 101 102 102 % RAM disk format … … 420 420 % Output device class 421 421 @ "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) 423 423 424 424 % Output device class … … 480 480 ! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y) 481 481 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 483 489 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beagleboardxm] CONFIG_AMDM37X_UART (y/n) 484 490 … … 502 508 503 509 % Serial line input module 504 ! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebo ardxm&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) 505 511 506 512 % EGA support -
boot/arch/arm32/Makefile.inc
r7462674 r8f88beb 35 35 endif 36 36 37 ifeq ($(MACHINE), beagleboardxm)37 ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone)) 38 38 BOOT_OUTPUT = image.boot 39 39 POST_OUTPUT = $(ROOT_PATH)/uImage.bin -
kernel/arch/arm32/Makefile.inc
r7462674 r8f88beb 78 78 endif 79 79 80 ifeq ($(MACHINE),beaglebone) 81 ARCH_SOURCES += arch/$(KARCH)/src/mach/beaglebone/beaglebone.c 82 endif 83 80 84 ifeq ($(CONFIG_PL050),y) 81 85 ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c -
kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c
r7462674 r8f88beb 35 35 #include <arch/exception.h> 36 36 #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> 41 41 #include <genarch/fb/fb.h> 42 42 #include <genarch/srln/srln.h> -
kernel/arch/arm32/src/machine_func.c
r7462674 r8f88beb 43 43 #include <arch/mach/testarm/testarm.h> 44 44 #include <arch/mach/beagleboardxm/beagleboardxm.h> 45 #include <arch/mach/beaglebone/beaglebone.h> 45 46 46 47 /** Pointer to machine_ops structure being used. */ … … 58 59 #elif defined(MACHINE_beagleboardxm) 59 60 machine_ops = &bbxm_machine_ops; 61 #elif defined(MACHINE_beaglebone) 62 machine_ops = &bbone_machine_ops; 60 63 #else 61 64 #error Machine type not defined. -
kernel/genarch/Makefile.inc
r7462674 r8f88beb 106 106 endif 107 107 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 108 118 ifeq ($(CONFIG_AMDM37X_UART),y) 109 119 GENARCH_SOURCES += \ 110 genarch/src/drivers/amdm37x _uart/amdm37x_uart.c120 genarch/src/drivers/amdm37x/uart.c 111 121 endif 112 122
Note:
See TracChangeset
for help on using the changeset viewer.