diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-04 01:17:55 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-04 01:17:55 +0100 |
| commit | 606ed721afdbba2f560db87f33cbdb72463a5d7b (patch) | |
| tree | 8eef834b4ca8b20fba8b67dc080ea891f76772be /arch/xtensa/boot/boot-elf/Makefile | |
| parent | Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/... (diff) | |
| parent | xtensa: allow merging vectors into .text section (diff) | |
| download | linux-606ed721afdbba2f560db87f33cbdb72463a5d7b.tar.xz linux-606ed721afdbba2f560db87f33cbdb72463a5d7b.zip | |
Merge tag 'xtensa-20170303' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa updates from Max Filippov:
- clean up bootable image build targets: provide separate 'Image',
'zImage' and 'uImage' make targets that only build corresponding
image type. Make 'all' build all images appropriate for a platform
- allow merging vectors code into .text section as a preparation step
for XIP support
- fix handling external FDT when the kernel is built without
BLK_DEV_INITRD support
* tag 'xtensa-20170303' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: allow merging vectors into .text section
xtensa: clean up bootable image build targets
xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD
Diffstat (limited to 'arch/xtensa/boot/boot-elf/Makefile')
| -rw-r--r-- | arch/xtensa/boot/boot-elf/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/boot/boot-elf/Makefile b/arch/xtensa/boot/boot-elf/Makefile index 89db089f5a12..521471981356 100644 --- a/arch/xtensa/boot/boot-elf/Makefile +++ b/arch/xtensa/boot/boot-elf/Makefile @@ -31,4 +31,4 @@ $(obj)/../Image.elf: $(obj)/Image.o $(obj)/boot.lds -o $@ $(obj)/Image.o $(Q)$(kecho) ' Kernel: $@ is ready' -zImage: $(obj)/../Image.elf +all Image: $(obj)/../Image.elf |