Changeset e1a27be in mainline for HelenOS.config

Timestamp:

2012-12-29T10:48:35Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

17cc8f4f

Parents:

8f88beb7 (diff), c928bb7 (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) (6 diffs)

HelenOS.config

@@ -63 +63 @@
 % Machine type
 @ "gta02" GTA02 / Neo FreeRunner
-@ "testarm" GXEmul Testarm
 @ "integratorcp" Integratorcp
 @ "beagleboardxm" BeogleBoard-xM
@@ -90 +89 @@
 % CPU type
 @ "armv4" ARMv4
-! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=testarm)] PROCESSOR (choice)
+! [PLATFORM=arm32&(MACHINE=gta02)] PROCESSOR (choice)
 
 % CPU type
@@ -348 +347 @@
 ! [PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FPU (y)
 
+## armv7 made fpu hardware compulsory
+% FPU support
+! [PLATFORM=arm32&PROCESSOR=armv7_a] CONFIG_FPU (y)
+
+% FPU support
+! [PLATFORM=arm32&MACHINE=integratorcp] CONFIG_FPU (y)
+
 
 ## Kernel features options
@@ -409 +415 @@
 @ "generic" Keyboard or serial line
 @ "none" No input device
-! [PLATFORM=ia32|(PLATFORM=arm32&MACHINE=testarm)|PLATFORM=amd64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_HID_IN (choice)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_HID_IN (choice)
 
 % Input device class
@@ -434 +440 @@
 ! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] CONFIG_HID_OUT (choice)
 
-% Output device class
-@ "generic" Monitor or serial line
-@ "monitor" Monitor
-@ "serial" Serial line
-@ "none" No output device
-! [PLATFORM=arm32&MACHINE=testarm] CONFIG_HID_OUT (choice)
-
 % PC keyboard support
 ! [CONFIG_HID_IN=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
@@ -455 +454 @@
 % Support for msim/GXemul printer
 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_PRN (y/n)
-
-% Support for GXemul keyboard
-! [CONFIG_HID_IN=generic&PLATFORM=arm32&MACHINE=testarm] CONFIG_ARM_KBD (y/n)
-
-% Support for GXemul printer
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=testarm] CONFIG_ARM_PRN (y/n)
 
 % Support for VIA CUDA controller