From: Tomasz Maciej Nowak Date: Wed, 16 Aug 2023 18:28:01 +0000 (+0200) Subject: ath79: image: allow changing kernel option in mkubntimage X-Git-Tag: v22.03.6~13 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=7901fec6b8faf56b59e123437146f73819a95034;p=openwrt%2Fopenwrt.git ath79: image: allow changing kernel option in mkubntimage Backport didn't include changes to mkubntimage invocation, which allowed to pass arguments. This in result produces broken routerstation factory images, which have kernel embedded as kernel partition instead of LZMA loader. Fixes: #13260 Fixes: 8e09f9ffc3cc ("ath79: switch some RedBoot based devices to OKLI loader") Signed-off-by: Tomasz Maciej Nowak --- diff --git a/target/linux/ath79/image/common-ubnt.mk b/target/linux/ath79/image/common-ubnt.mk index 625f0b4f3f..76d6de000b 100644 --- a/target/linux/ath79/image/common-ubnt.mk +++ b/target/linux/ath79/image/common-ubnt.mk @@ -10,7 +10,7 @@ UBNT_REVISION := $(VERSION_DIST)-$(REVISION) define Build/mkubntimage -$(STAGING_DIR_HOST)/bin/mkfwimage -B $(UBNT_BOARD) \ -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \ - -k $(IMAGE_KERNEL) -r $@ -o $@ + -k $(if $(1),$(1),$(IMAGE_KERNEL)) -r $@ -o $@ endef define Build/mkubntimage2