Changeset 6b781c0 in mainline for kernel/kernel.config

Timestamp:

2007-06-08T15:02:49Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c03ee1c

Parents:

3ee8a075

Message:

Merge arm32 into trunk.

File:

• kernel/kernel.config (modified) (3 diffs)

kernel/kernel.config

@@ -50 +50 @@
 
 # Machine type
-@ "gxemul" GXEmul
-! [ARCH=arm32] MACHINE (choice)
-
-# Machine type
 @ "msim" MSIM Simulator
 @ "simics" Virtutech Simics simulator
@@ -62 +58 @@
 
 # Machine type
+@ "gxemul_testarm" GXEmul testarm
+! [ARCH=arm32] MACHINE (choice)
+
+# Machine type
 @ "ski" Ski ia64 simulator
 @ "i460GX" i460GX chipset machine
@@ -67 +67 @@
 
 # Framebuffer support
-! [(ARCH=mips32&MACHINE=lgxemul)|(ARCH=mips32&MACHINE=bgxemul)|(ARCH=ia32)|(ARCH=amd64)] CONFIG_FB (y/n)
+! [(ARCH=mips32&MACHINE=lgxemul)|(ARCH=mips32&MACHINE=bgxemul)|(ARCH=ia32)|(ARCH=amd64)|(ARCH=arm32&MACHINE=gxemul_testarm)] CONFIG_FB (y/n)
 
 # Framebuffer width