Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux into...

[~andy/linux] / arch / sparc / Makefile

diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 113225b241e0151f435a8a91dd41a79e8b0aaee4..ad1fb5d969f314823db89f4ea470edef1ac252ea 100644 (file)
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -88,7 +88,7 @@ boot := arch/sparc/boot
 # Default target
 all: zImage
 
-image zImage tftpboot.img vmlinux.aout: vmlinux
+image zImage uImage tftpboot.img vmlinux.aout: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 archclean:
@@ -102,6 +102,7 @@ ifeq ($(ARCH),sparc)
 define archhelp
   echo  '* image        - kernel image ($(boot)/image)'
   echo  '* zImage       - stripped kernel image ($(boot)/zImage)'
+  echo  '  uImage       - U-Boot SPARC32 Image (only for LEON)'
   echo  '  tftpboot.img - image prepared for tftp'
 endef
 else