2 files changed, 35 insertions, 1 deletions

diff --git a/Documentation/kbuild/kconfig-language.txt b/Documentation/kbuild/kconfig-language.txt
index fe8b0c4892cf..616043a6da99 100644
--- a/Documentation/kbuild/kconfig-language.txt
+++ b/Documentation/kbuild/kconfig-language.txt
@@ -77,7 +77,12 @@ applicable everywhere (see syntax).
   Optionally, dependencies only for this default value can be added with
   "if".
 
-- dependencies: "depends on"/"requires" <expr>
+- type definition + default value:
+        "def_bool"/"def_tristate" <expr> ["if" <expr>]
+  This is a shorthand notation for a type definition plus a value.
+  Optionally dependencies for this default value can be added with "if".
+
+- dependencies: "depends on" <expr>
   This defines a dependency for this menu entry. If multiple
   dependencies are defined, they are connected with '&&'. Dependencies
   are applied to all other options within this menu entry (which also
@@ -289,3 +294,10 @@ source:
         "source" <prompt>
 
 This reads the specified configuration file. This file is always parsed.
+
+mainmenu:
+
+        "mainmenu" <prompt>
+
+This sets the config program's title bar if the config program chooses
+to use it.
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index f099b814d383..6166e2d7da76 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -518,6 +518,28 @@ more details, with real examples.
         In this example for a specific GCC version the build will error out explaining
         to the user why it stops.
 
+    cc-cross-prefix
+        cc-cross-prefix is used to check if there exist a $(CC) in path with
+        one of the listed prefixes. The first prefix where there exist a
+        prefix$(CC) in the PATH is returned - and if no prefix$(CC) is found
+        then nothing is returned.
+        Additional prefixes are separated by a single space in the
+        call of cc-cross-prefix.
+        This functionality is usefull for architecture Makefile that try
+        to set CROSS_COMPILE to well know values but may have several
+        values to select between.
+        It is recommended only to try to set CROSS_COMPILE is it is a cross
+        build (host arch is different from target arch). And is CROSS_COMPILE
+        is already set then leave it with the old value.
+
+        Example:
+                #arch/m68k/Makefile
+                ifneq ($(SUBARCH),$(ARCH))
+                        ifeq ($(CROSS_COMPILE),)
+                               CROSS_COMPILE := $(call cc-cross-prefix, m68k-linux-gnu-)
+                        endif
+                endif
+
 === 4 Host Program support
 
 Kbuild supports building executables on the host for use during the