treewide: remove redundant KERNEL_PREFIX definitions

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 <mail@aparcar.org>
[also cover imx6]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile
index f6dc461f7dd2bbe6e35ac7c456c14345b5408215..b520c1f778a9cd04d6d88c6293692165ab8343a5 100644 (file)
--- 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 2be262936f7247da780e6673d1acae43b607b459..a7710cfe0556a92e1555c38d0b39d81c43867017 100644 (file)
--- 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 bab1da0090b5c603a8de872ef50b00197f7e1a2e..cb4058f4a1f06b23679a1a57ed5afb496f405b77 100644 (file)
--- 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 3eb508d7c7d37dd7aaa640b18d3ad08c56e6f264..0931871624e96db2d066c0fc911de89f1a960f69 100644 (file)
--- 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