Commit f6e7a024 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents aa35e45c 3a71e423

arch/arc/Makefile

+13 −7
Original line number Diff line number Diff line
@@ -102,16 +102,22 @@ libs-y += arch/arc/lib/ $(LIBGCC) 


boot		:= arch/arc/boot



#default target for make without any arguments.

KBUILD_IMAGE	:= $(boot)/bootpImage



all:	bootpImage

bootpImage: vmlinux



boot_targets += uImage uImage.bin uImage.gz

boot_targets := uImage.bin uImage.gz uImage.lzma



PHONY += $(boot_targets)

$(boot_targets): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



uimage-default-y			:= uImage.bin

uimage-default-$(CONFIG_KERNEL_GZIP)	:= uImage.gz

uimage-default-$(CONFIG_KERNEL_LZMA)	:= uImage.lzma



PHONY += uImage

uImage: $(uimage-default-y)

	@ln -sf $< $(boot)/uImage

	@$(kecho) '  Image $(boot)/uImage is ready'



CLEAN_FILES += $(boot)/uImage



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

arch/arc/boot/Makefile

+4 −14
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

targets := vmlinux.bin vmlinux.bin.gz uImage



# uImage build relies on mkimage being availble on your host for ARC target

# You will need to build u-boot for ARC, rename mkimage to arc-elf32-mkimage
@@ -7,23 +6,18 @@ targets := vmlinux.bin vmlinux.bin.gz uImage 


OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S



LINUX_START_TEXT = $$(readelf -h vmlinux | \

LINUX_START_TEXT = $$($(READELF) -h vmlinux | \

			grep "Entry point address" | grep -o 0x.*)



UIMAGE_LOADADDR    = $(CONFIG_LINUX_LINK_BASE)

UIMAGE_ENTRYADDR   = $(LINUX_START_TEXT)



suffix-y := bin

suffix-$(CONFIG_KERNEL_GZIP)	:= gz

suffix-$(CONFIG_KERNEL_LZMA)	:= lzma



targets += uImage

targets += vmlinux.bin

targets += vmlinux.bin.gz

targets += vmlinux.bin.lzma

targets += uImage.bin

targets += uImage.gz

targets += uImage.lzma

extra-y += vmlinux.bin

extra-y += vmlinux.bin.gz

extra-y += vmlinux.bin.lzma



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)
@@ -42,7 +36,3 @@ $(obj)/uImage.gz: $(obj)/vmlinux.bin.gz FORCE 


$(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma FORCE

	$(call if_changed,uimage,lzma)
 


$(obj)/uImage: $(obj)/uImage.$(suffix-y)

	@ln -sf $(notdir $<) $@

	@echo '  Image $@ is ready'