tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'arc-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

Pull ARC updates from Vineet Gupta:
"Things are quieter on upstreaming front as we are mostly focusing on
ARCv3/ARC64 port.

This contains just build system updates from Masahiro Yamada"

* tag 'arc-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: build: use $(READELF) instead of hard-coded readelf
ARC: build: remove unneeded extra-y
ARC: build: move symlink creation to arch/arc/Makefile to avoid race
ARC: build: add boot_targets to PHONY
ARC: build: add uImage.lzma to the top-level target
ARC: build: remove non-existing bootpImage from KBUILD_IMAGE

Linus Torvalds f6e7a024 aa35e45c

+17 -21
+13 -7
arch/arc/Makefile
··· 102 102 103 103 boot := arch/arc/boot 104 104 105 - #default target for make without any arguments. 106 - KBUILD_IMAGE := $(boot)/bootpImage 105 + boot_targets := uImage.bin uImage.gz uImage.lzma 107 106 108 - all: bootpImage 109 - bootpImage: vmlinux 110 - 111 - boot_targets += uImage uImage.bin uImage.gz 112 - 107 + PHONY += $(boot_targets) 113 108 $(boot_targets): vmlinux 114 109 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ 110 + 111 + uimage-default-y := uImage.bin 112 + uimage-default-$(CONFIG_KERNEL_GZIP) := uImage.gz 113 + uimage-default-$(CONFIG_KERNEL_LZMA) := uImage.lzma 114 + 115 + PHONY += uImage 116 + uImage: $(uimage-default-y) 117 + @ln -sf $< $(boot)/uImage 118 + @$(kecho) ' Image $(boot)/uImage is ready' 119 + 120 + CLEAN_FILES += $(boot)/uImage 115 121 116 122 archclean: 117 123 $(Q)$(MAKE) $(clean)=$(boot)
+4 -14
arch/arc/boot/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - targets := vmlinux.bin vmlinux.bin.gz uImage 3 2 4 3 # uImage build relies on mkimage being availble on your host for ARC target 5 4 # You will need to build u-boot for ARC, rename mkimage to arc-elf32-mkimage ··· 6 7 7 8 OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S 8 9 9 - LINUX_START_TEXT = $$(readelf -h vmlinux | \ 10 + LINUX_START_TEXT = $$($(READELF) -h vmlinux | \ 10 11 grep "Entry point address" | grep -o 0x.*) 11 12 12 13 UIMAGE_LOADADDR = $(CONFIG_LINUX_LINK_BASE) 13 14 UIMAGE_ENTRYADDR = $(LINUX_START_TEXT) 14 15 15 - suffix-y := bin 16 - suffix-$(CONFIG_KERNEL_GZIP) := gz 17 - suffix-$(CONFIG_KERNEL_LZMA) := lzma 18 - 19 - targets += uImage 16 + targets += vmlinux.bin 17 + targets += vmlinux.bin.gz 18 + targets += vmlinux.bin.lzma 20 19 targets += uImage.bin 21 20 targets += uImage.gz 22 21 targets += uImage.lzma 23 - extra-y += vmlinux.bin 24 - extra-y += vmlinux.bin.gz 25 - extra-y += vmlinux.bin.lzma 26 22 27 23 $(obj)/vmlinux.bin: vmlinux FORCE 28 24 $(call if_changed,objcopy) ··· 36 42 37 43 $(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma FORCE 38 44 $(call if_changed,uimage,lzma) 39 - 40 - $(obj)/uImage: $(obj)/uImage.$(suffix-y) 41 - @ln -sf $(notdir $<) $@ 42 - @echo ' Image $@ is ready'