[source] image.mk: use LINUX_KARCH rather than ARCH for mkits

LEDE Commits lede-commits at lists.infradead.org
Fri Jan 13 05:54:39 PST 2017


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/859693509f33a90c3eae29190b6f7b7533a5fff0

commit 859693509f33a90c3eae29190b6f7b7533a5fff0
Author: Ian Pozella <Ian.Pozella at imgtec.com>
AuthorDate: Mon Sep 26 15:06:10 2016 +0100

    image.mk: use LINUX_KARCH rather than ARCH for mkits
    
    The generated 'its' is passed to mkimage which expects linux arch
    strings rather than the full arch (e.g. mips not mipsel).
    
    It currently works in some cases where LINUX_KARCH == ARCH but
    otherwise you get an unknown arch build error.
    
    Signed-off-by: Ian Pozella <Ian.Pozella at imgtec.com>
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 include/image-commands.mk | 2 +-
 include/image.mk          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/image-commands.mk b/include/image-commands.mk
index a7acd0e..04fa853 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -59,7 +59,7 @@ define Build/fit
 		-D $(DEVICE_NAME) -o $@.its -k $@ \
 		$(if $(word 2,$(1)),-d $(word 2,$(1))) -C $(word 1,$(1)) \
 		-a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-		-A $(ARCH) -v $(LINUX_VERSION)
+		-A $(LINUX_KARCH) -v $(LINUX_VERSION)
 	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new
 	@mv $@.new $@
 endef
diff --git a/include/image.mk b/include/image.mk
index 3daee35..ab5b816 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -143,7 +143,7 @@ endef
 define Image/BuildKernel/MkFIT
 	$(TOPDIR)/scripts/mkits.sh \
 		-D $(1) -o $(KDIR)/fit-$(1).its -k $(2) $(if $(3),-d $(3)) -C $(4) -a $(5) -e $(6) \
-		-A $(ARCH) -v $(LINUX_VERSION)
+		-A $(LINUX_KARCH) -v $(LINUX_VERSION)
 	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $(KDIR)/fit-$(1).its $(KDIR)/fit-$(1)$(7).itb
 endef
 



More information about the lede-commits mailing list