[OpenWrt-Devel] [PATCH 2/2] mpc85xx: restructure image receipts
David Bauer
mail at david-bauer.net
Tue May 5 13:42:31 EDT 2020
Move the image receipts into separate per-subtarget files like it is
done on most other targets.
Signed-off-by: David Bauer <mail at david-bauer.net>
---
target/linux/mpc85xx/image/Makefile | 100 +---------------------------
target/linux/mpc85xx/image/p1010.mk | 36 ++++++++++
target/linux/mpc85xx/image/p1020.mk | 41 ++++++++++++
target/linux/mpc85xx/image/p2020.mk | 15 +++++
4 files changed, 95 insertions(+), 97 deletions(-)
create mode 100644 target/linux/mpc85xx/image/p1010.mk
create mode 100644 target/linux/mpc85xx/image/p1020.mk
create mode 100644 target/linux/mpc85xx/image/p2020.mk
diff --git a/target/linux/mpc85xx/image/Makefile b/target/linux/mpc85xx/image/Makefile
index 225f871699..a0e00c982a 100644
--- a/target/linux/mpc85xx/image/Makefile
+++ b/target/linux/mpc85xx/image/Makefile
@@ -5,8 +5,6 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
-DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION
-
define Build/copy-file
cat "$(1)" > "$@"
endef
@@ -22,107 +20,15 @@ define Device/Default
endef
ifeq ($(SUBTARGET),p1010)
-
-define Device/tplink_tl-wdr4900-v1
- DEVICE_VENDOR := TP-Link
- DEVICE_MODEL := TL-WDR4900
- DEVICE_VARIANT := v1
- TPLINK_HEADER_VERSION := 1
- TPLINK_HWID := 0x49000001
- TPLINK_HWREV := 1
- TPLINK_FLASHLAYOUT := 16Mppc
- KERNEL_SIZE := 2684k
- KERNEL_NAME := simpleImage.tl-wdr4900-v1
- KERNEL_INITRAMFS :=
- KERNEL := kernel-bin | uImage none
- KERNEL_ENTRY := 0x1000000
- KERNEL_LOADADDR := 0x1000000
- SUPPORTED_DEVICES += tl-wdr4900-v1
- ARTIFACTS := fdt.bin
- ARTIFACT/fdt.bin := append-dtb
- IMAGES := fdt.bin factory.bin sysupgrade.bin
- IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade | append-metadata
- IMAGE/factory.bin := tplink-v1-image factory
-endef
-TARGET_DEVICES += tplink_tl-wdr4900-v1
-
-define Device/sophos_red-15w-rev1
- DEVICE_VENDOR := Sophos
- DEVICE_MODEL := RED 15w
- DEVICE_VARIANT := Rev.1
- # Original firmware uses a dedicated DTB-partition.
- # The bootloader however supports FIT-images.
- KERNEL = kernel-bin | gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb
- IMAGES := sysupgrade.bin
- IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-endef
-TARGET_DEVICES += sophos_red-15w-rev1
-
+include p1010.mk
endif
ifeq ($(SUBTARGET),p1020)
-
-define Device/aerohive_hiveap-330
- DEVICE_VENDOR := Aerohive
- DEVICE_MODEL := HiveAP-330
- DEVICE_PACKAGES := kmod-tpm-i2c-atmel
- BLOCKSIZE := 128k
- KERNEL := kernel-bin | gzip | uImage gzip
- KERNEL_SIZE := 8m
- KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs | uImage none
- IMAGES := fdt.bin sysupgrade.bin
- IMAGE/fdt.bin := append-dtb
- IMAGE/sysupgrade.bin := append-dtb | pad-to 256k | check-size 256k | \
- append-uImage-fakehdr ramdisk | pad-to 256k | check-size 512k | \
- append-rootfs | pad-rootfs $$(BLOCKSIZE) | pad-to 41216k | check-size 41216k | \
- append-kernel | append-metadata
-endef
-TARGET_DEVICES += aerohive_hiveap-330
-
-define Device/enterasys_ws-ap3710i
- DEVICE_VENDOR := Enterasys
- DEVICE_MODEL := WS-AP3710i
- BLOCKSIZE := 128k
- KERNEL = kernel-bin | lzma | fit lzma $(KDIR)/image-$$(DEVICE_DTS).dtb
- IMAGES := sysupgrade.bin
- IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
-endef
-TARGET_DEVICES += enterasys_ws-ap3710i
-
-define Device/ocedo_panda
- DEVICE_VENDOR := OCEDO
- DEVICE_MODEL := Panda
- DEVICE_PACKAGES := kmod-rtc-ds1307 uboot-envtools
- KERNEL = kernel-bin | gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb
- PAGESIZE := 2048
- SUBPAGESIZE := 512
- BLOCKSIZE := 128k
- IMAGES := fdt.bin sysupgrade.bin
- IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
- IMAGE/fdt.bin := append-dtb
-endef
-TARGET_DEVICES += ocedo_panda
-
+include p1020.mk
endif
ifeq ($(SUBTARGET),p2020)
-
-define Device/freescale_p2020rdb
- DEVICE_VENDOR := Freescale
- DEVICE_MODEL := P2020RDB
- DEVICE_DTS_DIR := $(DTS_DIR)/fsl
- DEVICE_PACKAGES := kmod-hwmon-lm90 kmod-rtc-ds1307 \
- kmod-gpio-pca953x kmod-eeprom-at24
- BLOCKSIZE := 128k
- KERNEL := kernel-bin | gzip | \
- fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
- SUPPORTED_DEVICES := fsl,P2020RDB
- IMAGES := sysupgrade.bin
- IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
- pad-rootfs $$(BLOCKSIZE) | append-metadata
-endef
-TARGET_DEVICES += freescale_p2020rdb
-
+include p2020.mk
endif
$(eval $(call BuildImage))
diff --git a/target/linux/mpc85xx/image/p1010.mk b/target/linux/mpc85xx/image/p1010.mk
new file mode 100644
index 0000000000..e12621e82c
--- /dev/null
+++ b/target/linux/mpc85xx/image/p1010.mk
@@ -0,0 +1,36 @@
+DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION
+
+define Device/tplink_tl-wdr4900-v1
+ DEVICE_VENDOR := TP-Link
+ DEVICE_MODEL := TL-WDR4900
+ DEVICE_VARIANT := v1
+ TPLINK_HEADER_VERSION := 1
+ TPLINK_HWID := 0x49000001
+ TPLINK_HWREV := 1
+ TPLINK_FLASHLAYOUT := 16Mppc
+ KERNEL_SIZE := 2684k
+ KERNEL_NAME := simpleImage.tl-wdr4900-v1
+ KERNEL_INITRAMFS :=
+ KERNEL := kernel-bin | uImage none
+ KERNEL_ENTRY := 0x1000000
+ KERNEL_LOADADDR := 0x1000000
+ SUPPORTED_DEVICES += tl-wdr4900-v1
+ ARTIFACTS := fdt.bin
+ ARTIFACT/fdt.bin := append-dtb
+ IMAGES := fdt.bin factory.bin sysupgrade.bin
+ IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade | append-metadata
+ IMAGE/factory.bin := tplink-v1-image factory
+endef
+TARGET_DEVICES += tplink_tl-wdr4900-v1
+
+define Device/sophos_red-15w-rev1
+ DEVICE_VENDOR := Sophos
+ DEVICE_MODEL := RED 15w
+ DEVICE_VARIANT := Rev.1
+ # Original firmware uses a dedicated DTB-partition.
+ # The bootloader however supports FIT-images.
+ KERNEL = kernel-bin | gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb
+ IMAGES := sysupgrade.bin
+ IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+endef
+TARGET_DEVICES += sophos_red-15w-rev1
diff --git a/target/linux/mpc85xx/image/p1020.mk b/target/linux/mpc85xx/image/p1020.mk
new file mode 100644
index 0000000000..a127723e89
--- /dev/null
+++ b/target/linux/mpc85xx/image/p1020.mk
@@ -0,0 +1,41 @@
+define Device/aerohive_hiveap-330
+ DEVICE_VENDOR := Aerohive
+ DEVICE_MODEL := HiveAP-330
+ DEVICE_PACKAGES := kmod-tpm-i2c-atmel
+ BLOCKSIZE := 128k
+ KERNEL := kernel-bin | gzip | uImage gzip
+ KERNEL_SIZE := 8m
+ KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs | uImage none
+ IMAGES := fdt.bin sysupgrade.bin
+ IMAGE/fdt.bin := append-dtb
+ IMAGE/sysupgrade.bin := append-dtb | pad-to 256k | check-size 256k | \
+ append-uImage-fakehdr ramdisk | pad-to 256k | check-size 512k | \
+ append-rootfs | pad-rootfs $$(BLOCKSIZE) | pad-to 41216k | check-size 41216k | \
+ append-kernel | append-metadata
+endef
+TARGET_DEVICES += aerohive_hiveap-330
+
+define Device/enterasys_ws-ap3710i
+ DEVICE_VENDOR := Enterasys
+ DEVICE_MODEL := WS-AP3710i
+ BLOCKSIZE := 128k
+ KERNEL = kernel-bin | lzma | fit lzma $(KDIR)/image-$$(DEVICE_DTS).dtb
+ IMAGES := sysupgrade.bin
+ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
+endef
+TARGET_DEVICES += enterasys_ws-ap3710i
+
+define Device/ocedo_panda
+ DEVICE_VENDOR := OCEDO
+ DEVICE_MODEL := Panda
+ DEVICE_PACKAGES := kmod-rtc-ds1307 uboot-envtools
+ KERNEL = kernel-bin | gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb
+ PAGESIZE := 2048
+ SUBPAGESIZE := 512
+ BLOCKSIZE := 128k
+ IMAGES := fdt.bin sysupgrade.bin
+ IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+ IMAGE/fdt.bin := append-dtb
+endef
+TARGET_DEVICES += ocedo_panda
+
diff --git a/target/linux/mpc85xx/image/p2020.mk b/target/linux/mpc85xx/image/p2020.mk
new file mode 100644
index 0000000000..79b5fa660c
--- /dev/null
+++ b/target/linux/mpc85xx/image/p2020.mk
@@ -0,0 +1,15 @@
+define Device/freescale_p2020rdb
+ DEVICE_VENDOR := Freescale
+ DEVICE_MODEL := P2020RDB
+ DEVICE_DTS_DIR := $(DTS_DIR)/fsl
+ DEVICE_PACKAGES := kmod-hwmon-lm90 kmod-rtc-ds1307 \
+ kmod-gpio-pca953x kmod-eeprom-at24
+ BLOCKSIZE := 128k
+ KERNEL := kernel-bin | gzip | \
+ fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
+ SUPPORTED_DEVICES := fsl,P2020RDB
+ IMAGES := sysupgrade.bin
+ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
+ pad-rootfs $$(BLOCKSIZE) | append-metadata
+endef
+TARGET_DEVICES += freescale_p2020rdb
--
2.26.2
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list