Changes in HelenOS.config [e7b0b85:f9ab562] in mainline

File:

• HelenOS.config (modified) (2 diffs)

HelenOS.config

@@ -87 +87 @@
 
 % CPU type
-@ "cortex_a8" ARM Cortex A-8
+@ "armv4" ARMv4
+! [PLATFORM=arm32&(MACHINE=gta02)] PROCESSOR (choice)
+
+% CPU type
+@ "armv5" ARMv5
+! [PLATFORM=arm32&MACHINE=integratorcp] PROCESSOR (choice)
+
+% CPU type
+@ "armv7_a" ARMv7-A
 ! [PLATFORM=arm32&MACHINE=beagleboardxm] 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&(PROCESSOR=arm920t)] PROCESSOR_ARCH (choice)
-
-# Add more ARMv5 CPUs
-% CPU arch
-@ "armv5" ARMv5
-! [PLATFORM=arm32&(PROCESSOR=arm926ej_s)] PROCESSOR_ARCH (choice)
-
-# Add more ARMv7-A CPUs
-% CPU arch
-@ "armv7_a" ARMv7-A
-! [PLATFORM=arm32&(PROCESSOR=cortex_a8)] PROCESSOR_ARCH (choice)
 
 % RAM disk format
@@ -364 +348 @@
 ## armv7 made fpu hardware compulsory
 % FPU support
-! [PLATFORM=arm32&PROCESSOR_ARCH=armv7_a] CONFIG_FPU (y)
+! [PLATFORM=arm32&PROCESSOR=armv7_a] CONFIG_FPU (y)
 
 % FPU support