Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

There is one kconfig fix in the rc-fixes branch that I forgot to submit
for 3.8, so let's add it to the kconfig branch for 3.9-rc1.

2 files changed, 9 insertions, 8 deletions

diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index ec9ae6708691..14c3f4f1b617 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -1175,15 +1175,16 @@ 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().
 
-        Example:
-                #arch/x86/platform/ce4100/Makefile
-                clean-files := *dtb.S
+        To use this command, simply add *.dtb into obj-y or targets, or make
+        some other target depend on %.dtb
 
-                DTC_FLAGS := -p 1024
-                obj-y += foo.dtb.o
+        A central rule exists to create $(obj)/%.dtb from $(src)/%.dts;
+        architecture Makefiles do no need to explicitly write out that rule.
 
-                $(obj)/%.dtb: $(src)/%.dts
-                        $(call cmd,dtc)
+        Example:
+                targets += $(dtb-y)
+                clean-files += *.dtb
+                DTC_FLAGS ?= -p 1024
 
 --- 6.8 Custom kbuild commands
 
diff --git a/Documentation/kbuild/modules.txt b/Documentation/kbuild/modules.txt
index 3fb39e0116b4..69372fb98cf8 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 spitting out warnings about undefined
+        all symbols to avoid spliitting out warnings about undefined
         symbols. Three solutions exist for this situation.
 
         NOTE: The method with a top-level kbuild file is recommended