From 9509a6df0bff483fc165bc5da98f03d2d736622f Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Sat, 11 May 2019 19:37:31 +0200 Subject: mvebu: image: improve readability of device recipes Drop overly complex amount of defines wich are referenced in the same devices pool and move image recipes to common define, since devices not using them overwrite it. Signed-off-by: Tomasz Maciej Nowak --- target/linux/mvebu/image/Makefile | 21 +++++-------------- target/linux/mvebu/image/cortex-a9.mk | 39 +++++++++++++---------------------- 2 files changed, 19 insertions(+), 41 deletions(-) (limited to 'target') diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index 95d4d5a79b..108b569c07 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -80,7 +80,11 @@ define Device/Default BOARD_NAME = $$(DEVICE_DTS) KERNEL_NAME := zImage KERNEL := kernel-bin | append-dtb | uImage none - SUPPORTED_DEVICES = $$(DEVICE_DTS) + IMAGES := sysupgrade.bin + IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | pad-to $$$$(PAGESIZE) + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata + SUPPORTED_DEVICES = $$(firstword $$(DEVICE_DTS)) + UBINIZE_OPTS := -E 5 UBOOT := BOOT_SCRIPT := endef @@ -95,20 +99,7 @@ define Device/Default-arm64 KERNEL := kernel-bin endef -define Device/UBI - IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata -endef - -define Device/UBI-factory - $(Device/UBI) - UBINIZE_OPTS := -E 5 - IMAGES += factory.img - IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | pad-to $$$$(PAGESIZE) -endef - define Device/NAND-128K - $(Device/UBI) BLOCKSIZE := 128k PAGESIZE := 2048 SUBPAGESIZE := 512 @@ -116,13 +107,11 @@ define Device/NAND-128K endef define Device/NAND-256K - $(Device/UBI) BLOCKSIZE := 256k PAGESIZE := 4096 endef define Device/NAND-512K - $(Device/UBI) BLOCKSIZE := 512k PAGESIZE := 4096 endef diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk index 8e9ef41fb6..252300b942 100644 --- a/target/linux/mvebu/image/cortex-a9.mk +++ b/target/linux/mvebu/image/cortex-a9.mk @@ -9,19 +9,15 @@ ifeq ($(SUBTARGET),cortexa9) define Device/linksys - DEVICE_TITLE := Linksys $(1) - DEVICE_PACKAGES := kmod-mwlwifi wpad-basic swconfig -endef - -define Device/armada-385-linksys $(Device/NAND-128K) - $(Device/UBI-factory) + DEVICE_TITLE := Linksys $(1) + DEVICE_PACKAGES := kmod-mwlwifi swconfig wpad-basic + IMAGES += factory.img KERNEL_SIZE := 6144k endef define Device/linksys-wrt1200ac $(call Device/linksys,WRT1200AC (Caiman)) - $(Device/armada-385-linksys) DEVICE_DTS := armada-385-linksys-caiman DEVICE_PACKAGES += mwlwifi-firmware-88w8864 endef @@ -29,7 +25,6 @@ TARGET_DEVICES += linksys-wrt1200ac define Device/linksys-wrt1900acv2 $(call Device/linksys,WRT1900ACv2 (Cobra)) - $(Device/armada-385-linksys) DEVICE_DTS := armada-385-linksys-cobra DEVICE_PACKAGES += mwlwifi-firmware-88w8864 endef @@ -37,7 +32,6 @@ TARGET_DEVICES += linksys-wrt1900acv2 define Device/linksys-wrt3200acm $(call Device/linksys,WRT3200ACM (Rango)) - $(Device/armada-385-linksys) DEVICE_DTS := armada-385-linksys-rango DEVICE_PACKAGES += kmod-btmrvl kmod-mwifiex-sdio mwlwifi-firmware-88w8964 endef @@ -45,17 +39,15 @@ TARGET_DEVICES += linksys-wrt3200acm define Device/linksys-wrt1900acs $(call Device/linksys,WRT1900ACS (Shelby)) - $(Device/armada-385-linksys) DEVICE_DTS := armada-385-linksys-shelby DEVICE_PACKAGES += mwlwifi-firmware-88w8864 endef TARGET_DEVICES += linksys-wrt1900acs define Device/linksys-wrt32x -$(call Device/linksys,WRT32X (Venom)) + $(call Device/linksys,WRT32X (Venom)) DEVICE_DTS := armada-385-linksys-venom DEVICE_PACKAGES += kmod-btmrvl kmod-mwifiex-sdio mwlwifi-firmware-88w8964 - $(Device/armada-385-linksys) KERNEL_SIZE := 3072k KERNEL := kernel-bin | append-dtb endef @@ -65,18 +57,16 @@ define Device/linksys-wrt1900ac $(call Device/linksys,WRT1900AC (Mamba)) DEVICE_DTS := armada-xp-linksys-mamba DEVICE_PACKAGES += mwlwifi-firmware-88w8864 - $(Device/NAND-128K) - $(Device/UBI-factory) KERNEL_SIZE := 3072k endef TARGET_DEVICES += linksys-wrt1900ac define Device/openblocks-ax3-4 - $(Device/UBI-factory) DEVICE_DTS := armada-xp-openblocks-ax3-4 SUPPORTED_DEVICES := $(1) BLOCKSIZE := 128k PAGESIZE := 1 + IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$(BLOCKSIZE) | append-ubi DEVICE_TITLE := Plat'Home OpenBlocks AX3 endef @@ -84,34 +74,33 @@ TARGET_DEVICES += openblocks-ax3-4 define Device/armada-385-db-ap $(Device/NAND-256K) - $(Device/UBI-factory) + IMAGES += factory.img KERNEL_SIZE := 8192k DEVICE_TITLE := Marvell Armada 385 DB AP (DB-88F6820-AP) endef TARGET_DEVICES += armada-385-db-ap -define Device/marvell-nand - $(Device/NAND-512K) - DEVICE_TITLE := Marvell Armada $(1) -endef - define Device/armada-370-db - $(call Device/marvell-nand,370 DB (DB-88F6710-BP-DDR3)) + $(Device/NAND-512K) + DEVICE_TITLE := Marvell Armada 370 DB (DB-88F6710-BP-DDR3) endef TARGET_DEVICES += armada-370-db define Device/armada-370-rd - $(call Device/marvell-nand,370 RD (RD-88F6710-A1)) + $(Device/NAND-512K) + DEVICE_TITLE := Marvell Armada 370 RD (RD-88F6710-A1) endef TARGET_DEVICES += armada-370-rd define Device/armada-xp-db - $(call Device/marvell-nand,XP DB (DB-78460-BP)) + $(Device/NAND-512K) + DEVICE_TITLE := Marvell Armada XP DB (DB-78460-BP) endef TARGET_DEVICES += armada-xp-db define Device/armada-xp-gp - $(call Device/marvell-nand,XP GP (DB-MV784MP-GP)) + $(Device/NAND-512K) + DEVICE_TITLE := Marvell Armada XP GP (DB-MV784MP-GP) endef TARGET_DEVICES += armada-xp-gp -- cgit v1.2.3