diff options
author | Rob Herring <robh@kernel.org> | 2018-10-04 14:16:15 -0500 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2018-10-04 14:16:15 -0500 |
commit | 4355151de47c2b4bc72c026ee743bd9ed7f71ba3 (patch) | |
tree | 159451d359e3154734e1fb3205556f1c421f878e /arch/xtensa | |
parent | 5d5a0ab1a7918fce5ca5c0fb1871a3e2000f85de (diff) | |
parent | 92f687f40ee511e0ea6046bf63ceb48ff3ad1494 (diff) | |
download | linux-4355151de47c2b4bc72c026ee743bd9ed7f71ba3.tar.bz2 |
Merge branch 'all-dtbs' into dt/next
Diffstat (limited to 'arch/xtensa')
-rw-r--r-- | arch/xtensa/Makefile | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 295c120ed099..13fd3301c517 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -84,28 +84,18 @@ LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) head-y := arch/xtensa/kernel/head.o core-y += arch/xtensa/kernel/ arch/xtensa/mm/ core-y += $(buildvar) $(buildplf) +core-y += arch/xtensa/boot/dts/ libs-y += arch/xtensa/lib/ $(LIBGCC) drivers-$(CONFIG_OPROFILE) += arch/xtensa/oprofile/ -ifneq ($(CONFIG_BUILTIN_DTB),"") -core-$(CONFIG_OF) += arch/xtensa/boot/dts/ -endif - boot := arch/xtensa/boot all Image zImage uImage: vmlinux $(Q)$(MAKE) $(build)=$(boot) $@ -%.dtb: - $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ - -dtbs: scripts - $(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 '* uImage - U-Boot wrapped image' - @echo ' dtbs - Build device tree blobs for enabled boards' endef |