Changeset 965dc18 in mainline for kernel/kernel.config

Timestamp:

2008-12-05T19:59:03Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

File:

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

kernel/kernel.config

@@ -77 +77 @@
 ! [ARCH=amd64] MACHINE (choice)
 
+# CPU type
+@ "us" UltraSPARC I-II subarchitecture
+@ "us3" UltraSPARC III-IV subarchitecture
+! [ARCH=sparc64] MACHINE (choice)
+
 # Machine type
 @ "msim" MSIM Simulator
@@ -139 +144 @@
 ! [ARCH=sparc64] CONFIG_Z8530 (y/n)
 
-# Support for NS16550 serial port (On IA64 as a console instead legacy keyboard)
-! [ARCH=sparc64] CONFIG_NS16550 (y/n)
+# Support for NS16550 serial port 
+! [ARCH=sparc64|(ARCH=ia64&MACHINE!=ski)] CONFIG_NS16550 (n/y)
 
-# Support for NS16550 serial port (On IA64 as a console instead legacy keyboard)
-! [ARCH=ia64&MACHINE!=ski] CONFIG_NS16550 (n/y)
+# Support for Serengeti console
+! [ARCH=sparc64] CONFIG_SGCN (y/n)
 
-# IOSapic on default address support (including legacy IRQ)
+# IOSapic on default address support
 ! [ARCH=ia64&MACHINE!=ski] CONFIG_IOSAPIC (y/n)