浏览代码

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 <[email protected]>
Signed-off-by: Felix Fietkau <[email protected]>
Ian Pozella 9 年之前
父节点
当前提交
859693509f
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      include/image-commands.mk
  2. 1 1
      include/image.mk

+ 1 - 1
include/image-commands.mk

@@ -59,7 +59,7 @@ define Build/fit
 		-D $(DEVICE_NAME) -o [email protected] -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 [email protected] [email protected]
 	@mv [email protected] $@
 endef

+ 1 - 1
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