1 files changed, 31 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 39516bfad958..d3634cd6fe35 100644
--- a/Makefile
+++ b/Makefile
@@ -507,6 +507,10 @@ else
 KBUILD_CFLAGS   += -O2
 endif
 
+ifneq (CONFIG_FRAME_WARN,0)
+KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
+endif
+
 # Force gcc to behave correct even for buggy distributions
 # Arch Makefiles may override this setting
 KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
@@ -1170,8 +1174,10 @@ rpm: include/config/kernel.release FORCE
 # Brief documentation of the typical targets used
 # ---------------------------------------------------------------------------
 
-boards := $(wildcard $(srctree)/arch/$(ARCH)/configs/*_defconfig)
+boards := $(wildcard $(srctree)/arch/$(SRCARCH)/configs/*_defconfig)
 boards := $(notdir $(boards))
+board-dirs := $(dir $(wildcard $(srctree)/arch/$(SRCARCH)/configs/*/*_defconfig))
+board-dirs := $(sort $(notdir $(board-dirs:/=)))
 
 help:
         @echo  'Cleaning targets:'
@@ -1217,14 +1223,19 @@ help:
         @echo  'Documentation targets:'
         @$(MAKE) -f $(srctree)/Documentation/DocBook/Makefile dochelp
         @echo  ''
-        @echo  'Architecture specific targets ($(ARCH)):'
+        @echo  'Architecture specific targets ($(SRCARCH)):'
         @$(if $(archhelp),$(archhelp),\
-                echo '  No architecture specific help defined for $(ARCH)')
+                echo '  No architecture specific help defined for $(SRCARCH)')
         @echo  ''
         @$(if $(boards), \
                 $(foreach b, $(boards), \
                 printf "  %-24s - Build for %s\\n" $(b) $(subst _defconfig,,$(b));) \
                 echo '')
+        @$(if $(board-dirs), \
+                $(foreach b, $(board-dirs), \
+                printf "  %-16s - Show %s-specific targets\\n" help-$(b) $(b);) \
+                printf "  %-16s - Show all of the above\\n" help-boards; \
+                echo '')
 
         @echo  '  make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
         @echo  '  make V=2   [targets] 2 => give reason for rebuild of target'
@@ -1236,6 +1247,20 @@ help:
         @echo  'For further info see the ./README file'
 
 
+help-board-dirs := $(addprefix help-,$(board-dirs))
+
+help-boards: $(help-board-dirs)
+
+boards-per-dir = $(notdir $(wildcard $(srctree)/arch/$(SRCARCH)/configs/$*/*_defconfig))
+
+$(help-board-dirs): help-%:
+        @echo  'Architecture specific targets ($(SRCARCH) $*):'
+        @$(if $(boards-per-dir), \
+                $(foreach b, $(boards-per-dir), \
+                printf "  %-24s - Build for %s\\n" $*/$(b) $(subst _defconfig,,$(b));) \
+                echo '')
+
+
 # Documentation targets
 # ---------------------------------------------------------------------------
 %docs: scripts_basic FORCE
@@ -1396,7 +1421,7 @@ define xtags
             $(all-kconfigs) | xargs $1 -a \
                 --langdef=kconfig \
                 --language-force=kconfig \
-                --regex-kconfig='/^[[:blank:]]*config[[:blank:]]+([[:alnum:]_]+)/\1/'; \
+                --regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/\2/'; \
             $(all-defconfigs) | xargs -r $1 -a \
                 --langdef=dotconfig \
                 --language-force=dotconfig \
@@ -1404,7 +1429,7 @@ define xtags
         elif $1 --version 2>&1 | grep -iq emacs; then \
             $(all-sources) | xargs $1 -a; \
             $(all-kconfigs) | xargs $1 -a \
-                --regex='/^[ \t]*config[ \t]+\([a-zA-Z0-9_]+\)/\1/'; \
+                --regex='/^[ \t]*(menu|)config[ \t]+\([a-zA-Z0-9_]+\)/\2/'; \
             $(all-defconfigs) | xargs -r $1 -a \
                 --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \
         else \
@@ -1538,8 +1563,7 @@ quiet_cmd_rmdirs = $(if $(wildcard $(rm-dirs)),CLEAN   $(wildcard $(rm-dirs)))
 quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN   $(wildcard $(rm-files)))
       cmd_rmfiles = rm -f $(rm-files)
 
-# Run depmod only is we have System.map and depmod is executable
-# and we build for the host arch
+# Run depmod only if we have System.map and depmod is executable
 quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)
       cmd_depmod = \
         if [ -r System.map -a -x $(DEPMOD) ]; then                              \