From 5d4b04495502b326592c94a364bcd2cde65439ba Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 19 Jul 2016 16:38:25 +0200 Subject: [PATCH] kirkwood: clean up redundant variables in the image building code Signed-off-by: Felix Fietkau --- target/linux/kirkwood/image/Makefile | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 5776c2ee69..a532b482e7 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -23,18 +23,20 @@ define Device/Default KERNEL_NAME := zImage KERNEL_SUFFIX := -uImage KERNEL_INSTALL := 1 -endef -define Device/dockstar - DEVICE_DTS := kirkwood-dockstar PAGESIZE := 2048 SUBPAGESIZE := 512 BLOCKSIZE := 128KiB + IMAGES := sysupgrade.tar + IMAGE/sysupgrade.tar := sysupgrade-nand +endef + +define Device/dockstar + DEVICE_DTS := kirkwood-dockstar FILESYSTEMS := squashfs PROFILES := Generic DOCKSTAR - IMAGES := factory.bin sysupgrade.tar + IMAGES += factory.bin IMAGE/factory.bin := append-ubi - IMAGE/sysupgrade.tar := sysupgrade-nand KERNEL_IN_UBI := 1 KERNEL := kernel-bin | append-dtb endef @@ -53,28 +55,20 @@ endef define Device/linksys-audi DEVICE_DTS := kirkwood-linksys-audi - PAGESIZE := 512 - SUBPAGESIZE := 256 - BLOCKSIZE := 16KiB KERNEL_SIZE := 2624k FILESYSTEMS := squashfs PROFILES := Generic AUDI - IMAGES := factory.bin sysupgrade.tar + IMAGES += factory.bin IMAGE/factory.bin := append-kernel $$$$(KERNEL_SIZE) | append-ubi - IMAGE/sysupgrade.tar := sysupgrade-nand endef define Device/linksys-viper DEVICE_DTS := kirkwood-linksys-viper - PAGESIZE := 2048 - SUBPAGESIZE := 512 - BLOCKSIZE := 128KiB KERNEL_SIZE := 2688k FILESYSTEMS := squashfs PROFILES := Generic VIPER - IMAGES := factory.bin sysupgrade.tar + IMAGES += factory.bin IMAGE/factory.bin := append-kernel $$$$(KERNEL_SIZE) | append-ubi - IMAGE/sysupgrade.tar := sysupgrade-nand endef define Image/BuildKernel/Template