Changeset c2efbb4 in mainline for HelenOS.config

Timestamp:

2010-02-20T20:54:53Z (16 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

721d4e85, 95c4776

Parents:

f516bc2 (diff), b03a666 (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:

Synchronize with head.

File:

• HelenOS.config (modified) (4 diffs)

HelenOS.config

@@ -258 +258 @@
 
 % Compiler
+@ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
 @ "clang" Clang
@@ -263 +264 @@
 
 
+## Cross-compiler target for abstract architecture
+
+% Cross-compiler target
+@ "arm32" ARM 32-bit
+@ "ia32" Intel IA-32
+@ "mips32" MIPS 32-bit
+! [PLATFORM=abs32le&COMPILER=gcc_cross] CROSS_TARGET (choice)
+
+
 ## Kernel configuration
 
@@ -284 +294 @@
 
 % Software integer division support
-! [PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_SOFTINT (y)
+! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_SOFTINT (y)
 
 % ASID support
@@ -508 +518 @@
 % Write core files
 ! CONFIG_WRITE_CORE_FILES (n/y)
+
+% Networking architecture
+@ "none" No networking
+@ "modular" Modular
+@ "module" One module
+! NETWORKING (choice)
+
+% DP8390 (NE2k) network interface
+! [NETWORKING=modular|NETWORKING=module] CONFIG_NETIF_DP8390 (y/n)
+