Patched in Tegra support.

5 files changed, 45 insertions, 77 deletions

diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt
index 6466704d47b..68e32bb6bd8 100644
--- a/Documentation/kbuild/kbuild.txt
+++ b/Documentation/kbuild/kbuild.txt
@@ -50,10 +50,6 @@ LDFLAGS_MODULE
 --------------------------------------------------
 Additional options used for $(LD) when linking modules.
 
-LDFLAGS_vmlinux
---------------------------------------------------
-Additional options passed to final link of vmlinux.
-
 KBUILD_VERBOSE
 --------------------------------------------------
 Set the kbuild verbosity. Can be assigned same values as "V=...".
@@ -218,18 +214,3 @@ KBUILD_BUILD_USER, KBUILD_BUILD_HOST
 These two variables allow to override the user@host string displayed during
 boot and in /proc/version. The default value is the output of the commands
 whoami and host, respectively.
-
-KBUILD_LDS
---------------------------------------------------
-The linker script with full path. Assigned by the top-level Makefile.
-
-KBUILD_VMLINUX_INIT
---------------------------------------------------
-All object files for the init (first) part of vmlinux.
-Files specified with KBUILD_VMLINUX_INIT are linked first.
-
-KBUILD_VMLINUX_MAIN
---------------------------------------------------
-All object files for the main part of vmlinux.
-KBUILD_VMLINUX_INIT and KBUILD_VMLINUX_MAIN together specify
-all the object files used to link vmlinux.
diff --git a/Documentation/kbuild/kconfig-language.txt b/Documentation/kbuild/kconfig-language.txt
index a686f9cd69c..44e2649fbb2 100644
--- a/Documentation/kbuild/kconfig-language.txt
+++ b/Documentation/kbuild/kconfig-language.txt
@@ -117,7 +117,7 @@ applicable everywhere (see syntax).
   This attribute is only applicable to menu blocks, if the condition is
   false, the menu block is not displayed to the user (the symbols
   contained there can still be selected by other symbols, though). It is
-  similar to a conditional "prompt" attribute for individual menu
+  similar to a conditional "prompt" attribude for individual menu
   entries. Default value of "visible" is true.
 
 - numerical ranges: "range" <symbol> <symbol> ["if" <expr>]
diff --git a/Documentation/kbuild/kconfig.txt b/Documentation/kbuild/kconfig.txt
index a09f1a6a830..c313d71324b 100644
--- a/Documentation/kbuild/kconfig.txt
+++ b/Documentation/kbuild/kconfig.txt
@@ -28,10 +28,12 @@ new (default) values, so you can use:
 
         grep "(NEW)" conf.new
 
-to see the new config symbols or you can use diffconfig to see the
-differences between the previous and new .config files:
+to see the new config symbols or you can 'diff' the previous and
+new .config files to see the differences:
 
-        scripts/diffconfig .config.old .config | less
+        diff .config.old .config | less
+
+(Yes, we need something better here.)
 
 ______________________________________________________________________
 Environment variables for '*config'
@@ -53,15 +55,15 @@ KCONFIG_ALLCONFIG
 --------------------------------------------------
 (partially based on lkml email from/by Rob Landley, re: miniconfig)
 --------------------------------------------------
-The allyesconfig/allmodconfig/allnoconfig/randconfig variants can also
-use the environment variable KCONFIG_ALLCONFIG as a flag or a filename
-that contains config symbols that the user requires to be set to a
-specific value.  If KCONFIG_ALLCONFIG is used without a filename where
-KCONFIG_ALLCONFIG == "" or KCONFIG_ALLCONFIG == "1", "make *config"
-checks for a file named "all{yes/mod/no/def/random}.config"
-(corresponding to the *config command that was used) for symbol values
-that are to be forced.  If this file is not found, it checks for a
-file named "all.config" to contain forced values.
+The allyesconfig/allmodconfig/allnoconfig/randconfig variants can
+also use the environment variable KCONFIG_ALLCONFIG as a flag or a
+filename that contains config symbols that the user requires to be
+set to a specific value.  If KCONFIG_ALLCONFIG is used without a
+filename, "make *config" checks for a file named
+"all{yes/mod/no/def/random}.config" (corresponding to the *config command
+that was used) for symbol values that are to be forced.  If this file
+is not found, it checks for a file named "all.config" to contain forced
+values.
 
 This enables you to create "miniature" config (miniconfig) or custom
 config files containing just the config symbols that you are interested
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 14c3f4f1b61..f47cdefb4d1 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -33,19 +33,18 @@ This document describes the Linux kernel Makefiles.
 
         === 6 Architecture Makefiles
            --- 6.1 Set variables to tweak the build to the architecture
-           --- 6.2 Add prerequisites to archheaders:
-           --- 6.3 Add prerequisites to archprepare:
-           --- 6.4 List directories to visit when descending
-           --- 6.5 Architecture-specific boot images
-           --- 6.6 Building non-kbuild targets
-           --- 6.7 Commands useful for building a boot image
-           --- 6.8 Custom kbuild commands
-           --- 6.9 Preprocessing linker scripts
-           --- 6.10 Generic header files
+           --- 6.2 Add prerequisites to archprepare:
+           --- 6.3 List directories to visit when descending
+           --- 6.4 Architecture-specific boot images
+           --- 6.5 Building non-kbuild targets
+           --- 6.6 Commands useful for building a boot image
+           --- 6.7 Custom kbuild commands
+           --- 6.8 Preprocessing linker scripts
+           --- 6.9 Generic header files
 
         === 7 Kbuild syntax for exported headers
                 --- 7.1 header-y
-                --- 7.2 genhdr-y
+                --- 7.2 objhdr-y
                 --- 7.3 destination-y
                 --- 7.4 generic-y
 
@@ -253,7 +252,7 @@ more details, with real examples.
         This will create a library lib.a based on delay.o. For kbuild to
         actually recognize that there is a lib.a being built, the directory
         shall be listed in libs-y.
-        See also "6.4 List directories to visit when descending".
+        See also "6.3 List directories to visit when descending".
 
         Use of lib-y is normally restricted to lib/ and arch/*/lib.
 
@@ -975,20 +974,7 @@ When kbuild executes, the following steps are followed (roughly):
         $(KBUILD_ARFLAGS) set by the top level Makefile to "D" (deterministic
         mode) if this option is supported by $(AR).
 
---- 6.2 Add prerequisites to archheaders:
-
-        The archheaders: rule is used to generate header files that
-        may be installed into user space by "make header_install" or
-        "make headers_install_all".  In order to support
-        "make headers_install_all", this target has to be able to run
-        on an unconfigured tree, or a tree configured for another
-        architecture.
-
-        It is run before "make archprepare" when run on the
-        architecture itself.
-
-
---- 6.3 Add prerequisites to archprepare:
+--- 6.2 Add prerequisites to archprepare:
 
         The archprepare: rule is used to list prerequisites that need to be
         built before starting to descend down in the subdirectories.
@@ -1004,7 +990,7 @@ When kbuild executes, the following steps are followed (roughly):
         generating offset header files.
 
 
---- 6.4 List directories to visit when descending
+--- 6.3 List directories to visit when descending
 
         An arch Makefile cooperates with the top Makefile to define variables
         which specify how to build the vmlinux file.  Note that there is no
@@ -1033,7 +1019,7 @@ When kbuild executes, the following steps are followed (roughly):
                 drivers-$(CONFIG_OPROFILE)  += arch/sparc64/oprofile/
 
 
---- 6.5 Architecture-specific boot images
+--- 6.4 Architecture-specific boot images
 
         An arch Makefile specifies goals that take the vmlinux file, compress
         it, wrap it in bootstrapping code, and copy the resulting files
@@ -1084,7 +1070,7 @@ When kbuild executes, the following steps are followed (roughly):
 
         When "make" is executed without arguments, bzImage will be built.
 
---- 6.6 Building non-kbuild targets
+--- 6.5 Building non-kbuild targets
 
     extra-y
 
@@ -1104,7 +1090,7 @@ When kbuild executes, the following steps are followed (roughly):
         shall be built, but shall not be linked as part of built-in.o.
 
 
---- 6.7 Commands useful for building a boot image
+--- 6.6 Commands useful for building a boot image
 
         Kbuild provides a few macros that are useful when building a
         boot image.
@@ -1126,7 +1112,7 @@ When kbuild executes, the following steps are followed (roughly):
         always be built.
         Assignments to $(targets) are without $(obj)/ prefix.
         if_changed may be used in conjunction with custom commands as
-        defined in 6.8 "Custom kbuild commands".
+        defined in 6.7 "Custom kbuild commands".
 
         Note: It is a typical mistake to forget the FORCE prerequisite.
         Another common pitfall is that whitespace is sometimes
@@ -1175,18 +1161,17 @@ When kbuild executes, the following steps are followed (roughly):
         in an init section in the image. Platform code *must* copy the
         blob to non-init memory prior to calling unflatten_device_tree().
 
-        To use this command, simply add *.dtb into obj-y or targets, or make
-        some other target depend on %.dtb
+        Example:
+                #arch/x86/platform/ce4100/Makefile
+                clean-files := *dtb.S
 
-        A central rule exists to create $(obj)/%.dtb from $(src)/%.dts;
-        architecture Makefiles do no need to explicitly write out that rule.
+                DTC_FLAGS := -p 1024
+                obj-y += foo.dtb.o
 
-        Example:
-                targets += $(dtb-y)
-                clean-files += *.dtb
-                DTC_FLAGS ?= -p 1024
+                $(obj)/%.dtb: $(src)/%.dts
+                        $(call cmd,dtc)
 
---- 6.8 Custom kbuild commands
+--- 6.7 Custom kbuild commands
 
         When kbuild is executing with KBUILD_VERBOSE=0, then only a shorthand
         of a command is normally displayed.
@@ -1213,7 +1198,7 @@ When kbuild executes, the following steps are followed (roughly):
         will be displayed with "make KBUILD_VERBOSE=0".
 
 
---- 6.9 Preprocessing linker scripts
+--- 6.8 Preprocessing linker scripts
 
         When the vmlinux image is built, the linker script
         arch/$(ARCH)/kernel/vmlinux.lds is used.
@@ -1243,7 +1228,7 @@ When kbuild executes, the following steps are followed (roughly):
         The kbuild infrastructure for *lds file are used in several
         architecture-specific files.
 
---- 6.10 Generic header files
+--- 6.9 Generic header files
 
         The directory include/asm-generic contains the header files
         that may be shared between individual architectures.
@@ -1283,15 +1268,15 @@ See subsequent chapter for the syntax of the Kbuild file.
 
         Subdirectories are visited before their parent directories.
 
-        --- 7.2 genhdr-y
+        --- 7.2 objhdr-y
 
-        genhdr-y specifies generated files to be exported.
+        objhdr-y specifies generated files to be exported.
         Generated files are special as they need to be looked
         up in another directory when doing 'make O=...' builds.
 
                 Example:
                         #include/linux/Kbuild
-                        genhdr-y += version.h
+                        objhdr-y += version.h
 
         --- 7.3 destination-y
 
diff --git a/Documentation/kbuild/modules.txt b/Documentation/kbuild/modules.txt
index 69372fb98cf..3fb39e0116b 100644
--- a/Documentation/kbuild/modules.txt
+++ b/Documentation/kbuild/modules.txt
@@ -470,7 +470,7 @@ build.
 
         Sometimes, an external module uses exported symbols from
         another external module. kbuild needs to have full knowledge of
-        all symbols to avoid spliitting out warnings about undefined
+        all symbols to avoid spitting out warnings about undefined
         symbols. Three solutions exist for this situation.
 
         NOTE: The method with a top-level kbuild file is recommended