aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-30 20:05:01 -0500
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-01-05 19:46:51 -0500
commit786ac51a48465da56f333652ec1d8b215bb272fe (patch)
treee76aff2088162312d926c1bc445ab08f88ddb1a1
parente9666d10a5677a494260d60d1fa0b73cc7646eb3 (diff)
kbuild: remove UIMAGE_IN and UIMAGE_OUT
The only/last user of UIMAGE_IN/OUT was removed by commit 4722a3e6b716 ("microblaze: fix multiple bugs in arch/microblaze/boot/Makefile"). The input and output should always be $< and $@. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--scripts/Makefile.lib6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 3ceaa2e2a6ce..05a3e4089bb5 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -371,15 +371,13 @@ UIMAGE_TYPE ?= kernel
371UIMAGE_LOADADDR ?= arch_must_set_this 371UIMAGE_LOADADDR ?= arch_must_set_this
372UIMAGE_ENTRYADDR ?= $(UIMAGE_LOADADDR) 372UIMAGE_ENTRYADDR ?= $(UIMAGE_LOADADDR)
373UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)' 373UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)'
374UIMAGE_IN ?= $<
375UIMAGE_OUT ?= $@
376 374
377quiet_cmd_uimage = UIMAGE $(UIMAGE_OUT) 375quiet_cmd_uimage = UIMAGE $@
378 cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \ 376 cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \
379 -C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \ 377 -C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \
380 -T $(UIMAGE_TYPE) \ 378 -T $(UIMAGE_TYPE) \
381 -a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \ 379 -a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \
382 -n $(UIMAGE_NAME) -d $(UIMAGE_IN) $(UIMAGE_OUT) 380 -n $(UIMAGE_NAME) -d $< $@
383 381
384# XZ 382# XZ
385# --------------------------------------------------------------------------- 383# ---------------------------------------------------------------------------