Changes in HelenOS.config [6bbe470:824208bf] in mainline

File:

• HelenOS.config (modified) (27 diffs)

HelenOS.config

@@ -32 +32 @@
 % Platform
 @ "abs32le" abstract 32-bit little endian
-@ "amd64" AMD64/Intel EM64T (PC)
+@ "amd64" AMD64/EM64T 64-bit (PC)
 @ "arm32" ARM 32-bit
-@ "ia32" Intel IA-32 (PC)
-@ "ia64" Intel IA-64
+@ "ia32" IA-32 32-bit (PC)
+@ "ia64" IA-64 64-bit
 @ "mips32" MIPS 32-bit
-@ "mips64" MIPS 64-bit
-@ "ppc32" PowerPC 32-bit (iMac G4)
-@ "sparc64" Sun UltraSPARC 64-bit
+@ "ppc32" PowerPC 32-bit
+@ "sparc32" SPARCv8 32-bit
+@ "sparc64" SPARCv9 64-bit
 ! PLATFORM (choice)
 
 % Machine type
 @ "msim" MSIM
-@ "bgxemul" GXEmul big endian
-@ "lgxemul" GXEmul little endian
+@ "bmalta" MIPS Malta Development Board big endian
+@ "lmalta" MIPS Malta Development Board little endian
 ! [PLATFORM=mips32] MACHINE (choice)
-
-% Machine type
-@ "msim" MSIM
-! [PLATFORM=mips64] MACHINE (choice)
 
 % Machine type
@@ -62 +58 @@
 
 % Machine type
+@ "leon3" Gaisler Aeroflex LEON3
+! [PLATFORM=sparc32] MACHINE (choice)
+
+% Machine type
 @ "gta02" GTA02 / Neo FreeRunner
-@ "testarm" GXEmul Testarm
 @ "integratorcp" Integratorcp
+@ "beagleboardxm" BeagleBoard-xM
+@ "beaglebone" BeagleBone
+@ "raspberrypi" Raspberry Pi
 ! [PLATFORM=arm32] MACHINE (choice)
 
@@ -81 +83 @@
 
 % CPU type
+@ "leon3" Gaisler Aeroflex LEON3
+! [PLATFORM=sparc32&MACHINE=leon3] PROCESSOR (choice)
+
+% CPU type
 @ "us" UltraSPARC I-II subarchitecture
 @ "us3" UltraSPARC III-IV subarchitecture
 @ "sun4v" Niagara (sun4v)
 ! [PLATFORM=sparc64&MACHINE=generic] PROCESSOR (choice)
+
+% 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)
+
+% CPU type
+@ "arm1176" ARM1176
+! [PLATFORM=arm32&MACHINE=raspberrypi] 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 ARMv6 CPUs
+% CPU arch
+@ "armv6" ARMv6
+! [PLATFORM=arm32&(PROCESSOR=arm1176)] PROCESSOR_ARCH (choice)
+
+# Add more ARMv7-A CPUs
+% CPU arch
+@ "armv7_a" ARMv7-A
+! [PLATFORM=arm32&(PROCESSOR=cortex_a8)] PROCESSOR_ARCH (choice)
+
+% CPU type
+@ "R4000" MIPS R4000
+! [PLATFORM=mips32&MACHINE=msim] PROCESSOR (choice)
+
+% CPU type
+@ "4Kc" MIPS 4Kc
+! [PLATFORM=mips32&(MACHINE=bmalta|MACHINE=lmalta)] PROCESSOR (choice)
 
 % RAM disk format
@@ -124 +174 @@
 
 % Kernel architecture
-@ "mips64"
-! [PLATFORM=mips64] KARCH (choice)
-
-% Kernel architecture
 @ "ppc32"
 ! [PLATFORM=ppc32] KARCH (choice)
@@ -136 +182 @@
 
 % Kernel architecture
+@ "sparc32"
+! [PLATFORM=sparc32] KARCH (choice)
+
+% Kernel architecture
 @ "sparc64"
 ! [PLATFORM=sparc64] KARCH (choice)
@@ -164 +214 @@
 % User space architecture
 @ "mips32"
-! [PLATFORM=mips32&(MACHINE=msim|MACHINE=lgxemul)] UARCH (choice)
+! [PLATFORM=mips32&(MACHINE=msim|MACHINE=lmalta)] UARCH (choice)
 
 % User space architecture
 @ "mips32eb"
-! [PLATFORM=mips32&MACHINE=bgxemul] UARCH (choice)
-
-% User space architecture
-@ "mips64"
-! [PLATFORM=mips64] UARCH (choice)
+! [PLATFORM=mips32&MACHINE=bmalta] UARCH (choice)
 
 % User space architecture
@@ -183 +229 @@
 
 % User space architecture
+@ "sparc32"
+! [PLATFORM=sparc32] UARCH (choice)
+
+% User space architecture
 @ "sparc64"
 ! [PLATFORM=sparc64] UARCH (choice)
@@ -218 +268 @@
 
 % Boot architecture
-@ "mips64"
-! [PLATFORM=mips64] BARCH (choice)
-
-% Boot architecture
 @ "ppc32"
 ! [PLATFORM=ppc32] BARCH (choice)
@@ -228 +274 @@
 @ "ppc64"
 ! [PLATFORM=ppc64] BARCH (choice)
+
+% Boot architecture
+@ "sparc32"
+! [PLATFORM=sparc32] BARCH (choice)
 
 % Boot architecture
@@ -241 +291 @@
 
 % Image format
-@ "ecoff"
-! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] IMAGE (choice)
-
-% Image format
-@ "binary"
-! [PLATFORM=mips64] IMAGE (choice)
+@ "elf"
+! [PLATFORM=mips32&(MACHINE=bmalta|MACHINE=lmalta)] IMAGE (choice)
 
 
 ## Compiler options
+
+% Compiler
+@ "gcc_cross" GNU C Compiler (cross-compiler)
+@ "gcc_native" GNU C Compiler (native)
+@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
+@ "icc" Intel C Compiler
+@ "clang" Clang
+! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
 
 % Compiler
@@ -255 +309 @@
 @ "gcc_native" GNU C Compiler (native)
 @ "icc" Intel C Compiler
-@ "clang" Clang
-! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
+@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
+! [PLATFORM=ia64] COMPILER (choice)
 
 % Compiler
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
-@ "icc" Intel C Compiler
-! [PLATFORM=ia64] COMPILER (choice)
+@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
+! [PLATFORM=mips32|PLATFORM=ppc32] COMPILER (choice)
 
 % Compiler
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=sparc64] COMPILER (choice)
-
-% Compiler
-@ "gcc_cross" GNU C Compiler (cross-compiler)
-@ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] COMPILER (choice)
-
-% Compiler
-@ "gcc_cross" GNU C Compiler (cross-compiler)
-@ "gcc_native" GNU C Compiler (native)
+@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
 @ "clang" Clang
-! [PLATFORM=abs32le] COMPILER (choice)
+! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc32|PLATFORM=sparc64] COMPILER (choice)
 
 
@@ -287 +332 @@
 @ "ia32" Intel IA-32
 @ "mips32" MIPS 32-bit
-! [PLATFORM=abs32le&COMPILER=gcc_cross] CROSS_TARGET (choice)
+! [PLATFORM=abs32le&(COMPILER=gcc_cross|COMPILER=gcc_helenos)] CROSS_TARGET (choice)
 
 
@@ -301 +346 @@
 ! [PLATFORM=amd64] CONFIG_FENCES_P4 (y)
 
+% IOMAP bitmap support
+! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_IOMAP_BITMAP (y)
+
+% IOMAP dummy support
+! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc32|PLATFORM=sparc64] CONFIG_IOMAP_DUMMY (y)
+
 % ACPI support
 ! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_ACPI (y)
 
 % Hierarchical page tables support
-! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_PAGE_PT (y)
+! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc32] CONFIG_PAGE_PT (y)
 
 % Page hash table support
-! [PLATFORM=ia64|PLATFORM=mips64|PLATFORM=sparc64] CONFIG_PAGE_HT (y)
+! [PLATFORM=ia64|PLATFORM=sparc64] CONFIG_PAGE_HT (y)
 
 % Software integer division support
-! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] CONFIG_SOFTINT (y)
+! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc32] CONFIG_SOFTINT (y)
 
 % ASID support
-! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y)
+! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc32|PLATFORM=sparc64] CONFIG_ASID (y)
 
 % ASID FIFO support
-! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
+! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
 
 % OpenFirmware tree support
@@ -332 +383 @@
 
 % FPU support
-! [PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FPU (y)
+! [PLATFORM=ppc32] CONFIG_FPU (n/y)
+
+## ARMv7 made FPU hardware compulsory
+% FPU support
+! [PLATFORM=arm32&PROCESSOR_ARCH=armv7_a] CONFIG_FPU (y)
+
+% FPU support
+! [PLATFORM=arm32&MACHINE=integratorcp] CONFIG_FPU (y)
 
 
@@ -338 +396 @@
 
 % Support for SMP
-! [(PLATFORM=ia32&PROCESSOR!=athlon_xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)|(PLATFORM=mips64&MACHINE=msim)|PLATFORM=abs32le] CONFIG_SMP (y/n)
+! [(PLATFORM=ia32&PROCESSOR!=athlon_xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)|PLATFORM=abs32le] CONFIG_SMP (y/n)
 
 % Debug build
@@ -395 +453 @@
 @ "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=ppc32|PLATFORM=sparc64] CONFIG_HID_IN (choice)
 
 % Input device class
@@ -406 +464 @@
 % Output device class
 @ "generic" Monitor or serial line
-! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp)] CONFIG_HID_OUT (choice)
+! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm|MACHINE=beaglebone|MACHINE=raspberrypi)] CONFIG_HID_OUT (choice)
 
 % Output device class
 @ "generic" Monitor or serial line
 @ "none" No output device
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&MACHINE=msim)|(PLATFORM=mips64&MACHINE=msim)] CONFIG_HID_OUT (choice)
-
-% Output device class
-@ "generic" Monitor or serial line
-@ "monitor" Monitor
-@ "serial" Serial line
-@ "none" No output device
-! [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)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&(MACHINE=msim|MACHINE=bmalta|MACHINE=lmalta))] CONFIG_HID_OUT (choice)
 
 % PC keyboard support
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
+! [CONFIG_HID_IN=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
 
 % PC keyboard support
@@ -436 +480 @@
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_PC_KBD (y/n)
 
-% Support for msim/GXemul keyboard
-! [CONFIG_HID_IN=generic&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_KBD (y/n)
-
-% 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 msim keyboard
+! [CONFIG_HID_IN=generic&MACHINE=msim] CONFIG_MSIM_KBD (y/n)
+
+% Support for msim printer
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&MACHINE=msim] CONFIG_MSIM_PRN (y/n)
 
 % Support for VIA CUDA controller
@@ -457 +495 @@
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial)&PLATFORM=ia64&MACHINE=i460GX] CONFIG_NS16550 (y/n)
 
-% Support for NS16550 controller (kernel console)
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial|CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_NS16550_KCON (y/n)
-
-% Use NS16550 controller as serial input (kernel console)
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial)&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_NS16550_KCON=y] CONFIG_NS16550 (y)
-
-% Use NS16550 controller as dummy serial output (kernel console)
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_NS16550_KCON=y] CONFIG_NS16550_OUT (y)
-
-% Support for ARM926 on-chip UART
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_ARM926_UART (y/n)
+% Support for PL011 UART
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&(MACHINE=integratorcp|MACHINE=raspberrypi)] CONFIG_PL011_UART (y/n)
 
 % Support for Samsung S3C24XX on-chip UART
@@ -475 +504 @@
 ! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y)
 
+% Support for TI AM335x timers support
+! [PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_TIMERS (y)
+
+% Support for OMAP on-chip UART
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_OMAP_UART (y/n)
+
+% Support for GRLIB UART
+! [PLATFORM=sparc32&MACHINE=leon3] CONFIG_GRLIB_UART (y)
+
+% Support for GRLIB IRQMP
+! [PLATFORM=sparc32&MACHINE=leon3] CONFIG_GRLIB_IRQMP (y)
+
+% Support for BCM2835 mailbox
+! [PLATFORM=arm32&MACHINE=raspberrypi] CONFIG_BCM2835_MAILBOX (y/n)
+
 % Support for i8042 controller
 ! [CONFIG_PC_KBD=y] CONFIG_I8042 (y)
@@ -488 +532 @@
 
 % Dummy serial line input
-! [CONFIG_MIPS_KBD=y|CONFIG_ARM_KBD=y] CONFIG_DSRLNIN (y)
+! [CONFIG_MSIM_KBD=y|CONFIG_ARM_KBD=y] CONFIG_DSRLNIN (y)
 
 % Dummy serial line output
-! [CONFIG_MIPS_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y)
+! [CONFIG_MSIM_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y)
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)|(PLATFORM=ia32&CONFIG_NS16550=y)|(PLATFORM=amd64&CONFIG_NS16550=y)] CONFIG_SRLN (y)
+! [CONFIG_DSRLNIN=y|(PLATFORM=sparc32)|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_PL011_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)|(PLATFORM=arm32&MACHINE=raspberrypi&CONFIG_PL011_UART=y)] CONFIG_SRLN (y)
 
 % EGA support
@@ -504 +548 @@
 % Framebuffer support
 ! [CONFIG_HID_OUT=generic&(PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ppc32)] CONFIG_FB (y/n)
-
-% Framebuffer support
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FB (y/n)
 
 % Framebuffer support
@@ -530 +571 @@
 @ "1920x1080"
 @ "1920x1200"
-! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_MODE (choice)
+! [(PLATFORM=ia32|PLATFORM=amd64|MACHINE=beagleboardxm)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_MODE (choice)
 
 % Default framebuffer depth
@@ -536 +577 @@
 @ "16"
 @ "24"
-! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_BPP (choice)
+! [(PLATFORM=ia32|PLATFORM=amd64|MACHINE=beagleboardxm)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_BPP (choice)
 
 % Start AP processors by the loader
@@ -556 +597 @@
 ! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (n/y)
 
-% Load disk drivers on startup
-! CONFIG_START_BD (n/y)
-
-% Mount /data on startup
-! [CONFIG_START_BD=y] CONFIG_MOUNT_DATA (n/y)
-
 % Write core files
 ! CONFIG_WRITE_CORE_FILES (n/y)
 
+% Include userspace unit tests (PCUT)
+! CONFIG_PCUT_TESTS (n/y)
+
+% Include PCUT self-tests
+! CONFIG_PCUT_SELF_TESTS (n/y)
+
 % Include development files (headers, libraries)
 ! CONFIG_DEVEL_FILES (n/y)
@@ -576 +617 @@
 % Barebone build with essential binaries only 
 ! CONFIG_BAREBONE (n/y)
-
-% Build pcc binaries 
-! CONFIG_PCC (n/y)
-
-% Build binutils binaries
-! CONFIG_BINUTILS (n/y)
-
-% Build MSIM binary
-! CONFIG_MSIM (n/y)
 
 % Line debugging information
@@ -604 +636 @@
 @ "efi" GRUB for UEFI
 ! [PLATFORM=ia32|PLATFORM=amd64] GRUB_ARCH (choice)
+
+% uImage OS type
+@ "2" NetBSD stage 2 boot loader
+! [PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] UIMAGE_OS (choice)
+
+% uImage OS type
+@ "5" Linux kernel
+! [PLATFORM=arm32&MACHINE!=beagleboardxm&MACHINE!=beaglebone] UIMAGE_OS (choice)
+
+% uImage OS type
+@ "5" Linux kernel
+! [PLATFORM=sparc32] UIMAGE_OS (choice)