Changeset 2b95d13 in mainline for HelenOS.config

Timestamp:

2013-03-12T21:07:15Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

606f6a1

Parents:

976c434 (diff), eceff5f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• HelenOS.config (modified) (7 diffs)

HelenOS.config

@@ -64 +64 @@
 @ "gta02" GTA02 / Neo FreeRunner
 @ "integratorcp" Integratorcp
-@ "beagleboardxm" BeogleBoard-xM
+@ "beagleboardxm" BeagleBoard-xM
+@ "beaglebone" BeagleBone
 ! [PLATFORM=arm32] MACHINE (choice)
 
@@ -87 +88 @@
 
 % CPU type
+@ "cortex_a8" ARM Cortex A-8
+! [PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] PROCESSOR (choice)
+
+% CPU type
+@ "arm920t" ARM920T
+! [PLATFORM=arm32&MACHINE=gta02] PROCESSOR (choice)
+
+% CPU type
+@ "arm926ej_s" ARM926EJ-S
+! [PLATFORM=arm32&MACHINE=integratorcp] PROCESSOR (choice)
+
+
+# Add more ARMv4 CPUs
+% CPU arch
 @ "armv4" ARMv4
-! [PLATFORM=arm32&(MACHINE=gta02)] PROCESSOR (choice)
-
-% CPU type
+! [PLATFORM=arm32&(PROCESSOR=arm920t)] PROCESSOR_ARCH (choice)
+
+# Add more ARMv5 CPUs
+% CPU arch
 @ "armv5" ARMv5
-! [PLATFORM=arm32&MACHINE=integratorcp] PROCESSOR (choice)
-
-% CPU type
+! [PLATFORM=arm32&(PROCESSOR=arm926ej_s)] PROCESSOR_ARCH (choice)
+
+# Add more ARMv7-A CPUs
+% CPU arch
 @ "armv7_a" ARMv7-A
-! [PLATFORM=arm32&MACHINE=beagleboardxm] PROCESSOR (choice)
+! [PLATFORM=arm32&(PROCESSOR=cortex_a8)] PROCESSOR_ARCH (choice)
 
 % CPU type
@@ -353 +370 @@
 ## armv7 made fpu hardware compulsory
 % FPU support
-! [PLATFORM=arm32&PROCESSOR=armv7_a] CONFIG_FPU (y)
+! [PLATFORM=arm32&PROCESSOR_ARCH=armv7_a] CONFIG_FPU (y)
 
 % FPU support
@@ -430 +447 @@
 % Output device class
 @ "generic" Monitor or serial line
-! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm)] CONFIG_HID_OUT (choice)
+! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_HID_OUT (choice)
 
 % Output device class
@@ -470 +487 @@
 ! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y)
 
-% Support for TI AMDM37X on-chip UART
+% Support for TI AM335x on-chip UART
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_UART (y/n)
+
+% Support for TI AM335x timers support
+! [PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_TIMERS (y)
+
+% Support for TI AMDM37x on-chip UART
 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beagleboardxm] CONFIG_AMDM37X_UART (y/n)
 
@@ -492 +515 @@
 
 % Serial line input module
-! [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)
+! [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)
 
 % EGA support
@@ -602 +625 @@
 % uImage OS type
 @ "2" NetBSD stage 2 boot loader
-! [PLATFORM=arm32&MACHINE=beagleboardxm] UIMAGE_OS (choice)
+! [PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] UIMAGE_OS (choice)
 
 % uImage OS type
 @ "5" Linux kernel
-! [PLATFORM=arm32&MACHINE!=beagleboardxm] UIMAGE_OS (choice)
+! [PLATFORM=arm32&MACHINE!=beagleboardxm&MACHINE!=beaglebone] UIMAGE_OS (choice)