kernel: move mv88e6xxx fix to generic backports

[openwrt/openwrt.git] / target / linux / mpc85xx / image / Makefile

diff --git a/target/linux/mpc85xx/image/Makefile b/target/linux/mpc85xx/image/Makefile
index 00eed888740a18460877b492cba59c4d2a31808a..d502650a321c6f92d04bffedd8b07aea87d387ce 100644 (file)
--- a/target/linux/mpc85xx/image/Makefile
+++ b/target/linux/mpc85xx/image/Makefile
@@ -1,82 +1,23 @@
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
+# SPDX-License-Identifier: GPL-2.0-only
+
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT
-
-define rootfs_align
-$(patsubst %-256k,0x40000,$(patsubst %-128k,0x20000,$(patsubst %-64k,0x10000,$(patsubst squashfs%,0x4,$(patsubst root.%,%,$(1))))))
-endef
+DEVICE_VARS += DTB_SIZE
 
-# combine kernel and rootfs into one image
-# mktplinkfw <type> <optional extra arguments to mktplinkfw binary>
-# <type> is "sysupgrade" or "factory"
-#
-# -a align the rootfs start on an <align> bytes boundary
-# -j add jffs2 end-of-filesystem markers
-# -s strip padding from end of the image
-# -X reserve <size> bytes in the firmware image (hexval prefixed with 0x)
-define Build/mktplinkfw
-       -$(STAGING_DIR_HOST)/bin/mktplinkfw \
-               -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) \
-               -k $(IMAGE_KERNEL) \
-               -r $@ \
-               -o $@.new \
-               -j -X 0x40000 \
-               -a $(call rootfs_align,$(FILESYSTEM)) \
-               $(wordlist 2,$(words $(1)),$(1)) \
-               $(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@
+define Build/pad-dtb
+       $(call Image/BuildDTB,$(DTS_DIR)/$(DEVICE_DTS).dts,$(dir $@)/image-$(DEVICE_DTS).dtb,,--space $(DTB_SIZE))
 endef
 
 define Device/Default
   PROFILES := Default
-  DEVICE_DTS := $(1)
+  DEVICE_DTS := $(lastword $(subst _, ,$(1)))
   KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
   KERNEL_ENTRY := 0x00000000
   KERNEL_LOADADDR := 0x00000000
   KERNEL := kernel-bin
 endef
 
-ifeq ($(SUBTARGET),generic)
-
-define Device/tl-wdr4900-v1
-  DEVICE_TITLE := TP-Link TL-WDR4900
-  DEVICE_PACKAGES := kmod-ath9k wpad-basic
-  TPLINK_HWID := 0x49000001
-  TPLINK_HWREV := 1
-  TPLINK_FLASHLAYOUT := 16Mppc
-  KERNEL_NAME := cuImage.tl-wdr4900-v1
-  SUPPORTED_DEVICES:=tl-wdr4900-v1 tplink,tl-wdr4900-v1
-  IMAGES := fdt.bin factory.bin sysupgrade.bin
-  IMAGE/fdt.bin := append-dtb
-  IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade | append-metadata
-  IMAGE/factory.bin := append-rootfs | mktplinkfw factory
-endef
-TARGET_DEVICES += tl-wdr4900-v1
-
-endif
-
-ifeq ($(SUBTARGET),p1020)
-
-define Device/hiveap-330
-  DEVICE_TITLE := Aerohive HiveAP-330
-  DEVICE_PACKAGES := kmod-ath9k wpad-basic kmod-tpm-i2c-atmel
-  BLOCKSIZE := 128k
-  KERNEL_NAME := zImage
-  KERNEL_SIZE := 8m
-  SUPPORTED_DEVICES := aerohive,hiveap-330
-  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 += hiveap-330
-
-endif
+include $(SUBTARGET).mk
 
 $(eval $(call BuildImage))