git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
xtensa
/
Makefile
diff --git
a/arch/xtensa/Makefile
b/arch/xtensa/Makefile
index e54189427b315159ed00e5f7d4c2ae81d8c78773..7ee02fe4a63df78d00ea42501b45c091e9dcae1f 100644
(file)
--- a/
arch/xtensa/Makefile
+++ b/
arch/xtensa/Makefile
@@
-93,11
+93,7
@@
endif
boot := arch/xtensa/boot
boot := arch/xtensa/boot
-all: zImage
-
-bzImage : zImage
-
-zImage: vmlinux
+all Image zImage uImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $@
%.dtb:
$(Q)$(MAKE) $(build)=$(boot) $@
%.dtb:
@@
-107,6
+103,8
@@
dtbs: scripts
$(Q)$(MAKE) $(build)=$(boot)/dts
define archhelp
$(Q)$(MAKE) $(build)=$(boot)/dts
define archhelp
+ @echo '* Image - Kernel ELF image with reset vector'
@echo '* zImage - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'
@echo '* zImage - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'
+ @echo '* uImage - U-Boot wrapped image'
@echo ' dtbs - Build device tree blobs for enabled boards'
endef
@echo ' dtbs - Build device tree blobs for enabled boards'
endef