Changes in / [40ad375:d085df10] in mainline

Files:

• HelenOS.config (modified) (2 diffs)
• boot/arch/arm32/Makefile.inc (modified) (1 diff)
• defaults/arm32/beaglebone/Makefile.config (added)
• kernel/arch/arm32/Makefile.inc (modified) (1 diff)
• kernel/arch/arm32/include/mach/beaglebone/beaglebone.h (added)
• kernel/arch/arm32/src/mach/beaglebone/beaglebone.c (added)
• kernel/arch/arm32/src/machine_func.c (modified) (2 diffs)
• kernel/genarch/include/drivers/am335x_ctrlmod/am335x_ctrlmod_iomux.h (added)
• kernel/genarch/include/drivers/am335x_irc/am335x_irc.h (added)

HelenOS.config

@@ -66 +66 @@
 @ "integratorcp" Integratorcp
 @ "beagleboardxm" BeogleBoard-xM
+@ "beaglebone" BeogleBone
 ! [PLATFORM=arm32] MACHINE (choice)
 
@@ -97 +98 @@
 % CPU type
 @ "armv7_a" ARMv7-A
-! [PLATFORM=arm32&MACHINE=beagleboardxm] PROCESSOR (choice)
-
+! [PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] PROCESSOR (choice)
 
 % RAM disk format

boot/arch/arm32/Makefile.inc

@@ -35 +35 @@
 endif
 
-ifeq ($(MACHINE), beagleboardxm)
+ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone))
         BOOT_OUTPUT = image.boot
         POST_OUTPUT = $(ROOT_PATH)/uImage.bin

kernel/arch/arm32/Makefile.inc

@@ -78 +78 @@
 endif
 
+ifeq ($(MACHINE),beaglebone)
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/beaglebone/beaglebone.c
+endif
+
 ifeq ($(CONFIG_PL050),y)
         ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c

kernel/arch/arm32/src/machine_func.c

@@ -43 +43 @@
 #include <arch/mach/testarm/testarm.h>
 #include <arch/mach/beagleboardxm/beagleboardxm.h>
+#include <arch/mach/beaglebone/beaglebone.h>
 
 /** Pointer to machine_ops structure being used. */
@@ -58 +59 @@
 #elif defined(MACHINE_beagleboardxm)
         machine_ops = &bbxm_machine_ops;
+#elif defined(MACHINE_beaglebone)
+        machine_ops = &bbone_machine_ops;
 #else
 #error Machine type not defined.