1 files changed, 24 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index fc3411e6f071..d3634cd6fe35 100644
--- a/Makefile
+++ b/Makefile
@@ -1174,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:'
@@ -1221,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'
@@ -1240,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