Changeset 97c7682 in mainline for HelenOS.config

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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:

Merge mainline changes.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• HelenOS.config (modified) (5 diffs)

HelenOS.config

@@ -269 +269 @@
 @ "gcc_native" GNU C Compiler (native)
 @ "icc" Intel C Compiler
-@ "suncc" Sun Studio C Compiler
 @ "clang" Clang
 ! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
@@ -282 +281 @@
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
-@ "suncc" Sun Studio C Compiler
 ! [PLATFORM=sparc64] COMPILER (choice)
 
@@ -573 +571 @@
 
 % Include development files (headers, libraries)
-! [RDFMT=tmpfs|RDFMT=ext2fs] CONFIG_DEVEL_FILES (n/y)
+! CONFIG_DEVEL_FILES (n/y)
 
 % Strip binaries
@@ -590 +588 @@
 ! CONFIG_BINUTILS (n/y)
 
+% Build MSIM binary
+! CONFIG_MSIM (n/y)
+
 % Line debugging information
 ! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y)
@@ -595 +596 @@
 # USB settings
 
-% USB release build (less logging)
-! CONFIG_USB_RELEASE_BUILD (y/n)
+% USB verbose messages
+! CONFIG_USB_VERBOSE (n/y)
 
 % Start virtual USB host controller