From: Paul Spooren <m...@aparcar.org>
The variables KERNEL_INITRAMFS_PREFIX and KERNEL_PREFIX are already
defined in include/image.mk and don't have to be redefined in the
target Makefiles.
Signed-off-by: Paul Spooren <m...@aparcar.org>
[also cover imx6]
Signed-off-by: Adrian Schmutzler <freif...@adrianschmutzler.de>
---
target/linux/imx6/image/Makefile | 1 -
target/linux/ipq40xx/image/Makefile | 2 --
target/linux/ipq806x/image/Makefile | 2 --
target/linux/zynq/image/Makefile | 2 --
4 files changed, 7 deletions(-)
diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile
index f6dc461f7d..b520c1f778 100644
--- a/target/linux/imx6/image/Makefile
+++ b/target/linux/imx6/image/Makefile
@@ -123,7 +123,6 @@ define Device/Default
KERNEL_INSTALL := 1
KERNEL_SUFFIX := -uImage
KERNEL_NAME := zImage
- KERNEL_PREFIX := $$(IMAGE_PREFIX)
KERNEL := kernel-bin | uImage none
IMAGES :=
endef
diff --git a/target/linux/ipq40xx/image/Makefile
b/target/linux/ipq40xx/image/Makefile
index 2be262936f..a7710cfe05 100644
--- a/target/linux/ipq40xx/image/Makefile
+++ b/target/linux/ipq40xx/image/Makefile
@@ -4,8 +4,6 @@ include $(INCLUDE_DIR)/image.mk
define Device/Default
PROFILES := Default
KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
- KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs
- KERNEL_PREFIX := $$(IMAGE_PREFIX)
KERNEL_LOADADDR := 0x80208000
DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
IMAGES := sysupgrade.bin
diff --git a/target/linux/ipq806x/image/Makefile
b/target/linux/ipq806x/image/Makefile
index bab1da0090..cb4058f4a1 100644
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -26,8 +26,6 @@ endef
define Device/Default
PROFILES := Default
KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
- KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs
- KERNEL_PREFIX := $$(IMAGE_PREFIX)
KERNEL_LOADADDR = 0x42208000
DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
IMAGES := sysupgrade.bin
diff --git a/target/linux/zynq/image/Makefile b/target/linux/zynq/image/Makefile
index 3eb508d7c7..0931871624 100644
--- a/target/linux/zynq/image/Makefile
+++ b/target/linux/zynq/image/Makefile
@@ -31,8 +31,6 @@ define Device/Default
PROFILES := Default
DEVICE_DTS := $(lastword $(subst _, ,$(1)))
KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
- KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs
- KERNEL_PREFIX := $$(IMAGE_PREFIX)
KERNEL_LOADADDR := 0x8000
IMAGES := sdcard.img.gz
IMAGE/sdcard.img.gz := zynq-sdcard | gzip
--
2.20.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
