diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-04 03:17:55 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-04 03:17:55 +0300 |
| commit | 606ed721afdbba2f560db87f33cbdb72463a5d7b (patch) | |
| tree | 8eef834b4ca8b20fba8b67dc080ea891f76772be /arch/xtensa/boot/boot-uboot/Makefile | |
| parent | a1a0db36d8c89243d989186108fe9196ad0e2c2d (diff) | |
| parent | b46dcfa378b0cdea1ee832802c9e36750e0fffa9 (diff) | |
| download | linux-606ed721afdbba2f560db87f33cbdb72463a5d7b.tar.xz | |
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-uboot/Makefile')
| -rw-r--r-- | arch/xtensa/boot/boot-uboot/Makefile | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/xtensa/boot/boot-uboot/Makefile b/arch/xtensa/boot/boot-uboot/Makefile deleted file mode 100644 index 0f4c417b4196..000000000000 --- a/arch/xtensa/boot/boot-uboot/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -# This file is subject to the terms and conditions of the GNU General Public -# License. See the file "COPYING" in the main directory of this archive -# for more details. -# - -UIMAGE_LOADADDR = $(CONFIG_KERNEL_LOAD_ADDRESS) -UIMAGE_COMPRESSION = gzip - -$(obj)/../uImage: vmlinux.bin.gz FORCE - $(call if_changed,uimage) - $(Q)$(kecho) ' Kernel: $@ is ready' - -zImage: $(obj)/../uImage |