diff options
author | L. D. Pinney <ldpinney@gmail.com> | 2017-08-26 09:49:45 +0800 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2017-08-30 17:05:10 +0200 |
commit | 3e36ca4b436510a6e411484db47f7df35ebaf86d (patch) | |
tree | 4da1aa1d6c869a299512988328a678c99c97d63e /target/linux/ramips/image | |
parent | 40213cc15469fe5953e3d586ecb5870a382ee1ea (diff) | |
download | mtk-20170518-3e36ca4b436510a6e411484db47f7df35ebaf86d.zip mtk-20170518-3e36ca4b436510a6e411484db47f7df35ebaf86d.tar.gz mtk-20170518-3e36ca4b436510a6e411484db47f7df35ebaf86d.tar.bz2 |
ramips: merge mt7628/mt7688 into mt76x8
The ramips subtargets of mt7628 and mt7688 dts files all #include "mt7628an.dtsi"
They are essentially a single subtarget.
This patch merges the ramips subtargets mt7628 and mt7688 into a single subtarget mt76x8.
Signed-off-by: L. D. Pinney <ldpinney@gmail.com>
Diffstat (limited to 'target/linux/ramips/image')
-rw-r--r-- | target/linux/ramips/image/Makefile | 8 | ||||
-rw-r--r-- | target/linux/ramips/image/mt7688.mk | 60 | ||||
-rw-r--r-- | target/linux/ramips/image/mt76x8.mk (renamed from target/linux/ramips/image/mt7628.mk) | 141 |
3 files changed, 99 insertions, 110 deletions
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 7196a46..c70761b 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -212,12 +212,8 @@ ifeq ($(SUBTARGET),mt7621) include mt7621.mk endif -ifeq ($(SUBTARGET),mt7628) -include mt7628.mk -endif - -ifeq ($(SUBTARGET),mt7688) -include mt7688.mk +ifeq ($(SUBTARGET),mt76x8) +include mt76x8.mk endif ifdef LEGACY_DEVICES diff --git a/target/linux/ramips/image/mt7688.mk b/target/linux/ramips/image/mt7688.mk deleted file mode 100644 index 2c181fc..0000000 --- a/target/linux/ramips/image/mt7688.mk +++ /dev/null @@ -1,60 +0,0 @@ -# -# MT7688 Profiles -# - -define Device/LinkIt7688 - DTS := LINKIT7688 - IMAGE_SIZE := $(ralink_default_fw_size_32M) - SUPPORTED_DEVICES := linkits7688 linkits7688d - DEVICE_TITLE := MediaTek LinkIt Smart 7688 - DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci uboot-envtools -endef -TARGET_DEVICES += LinkIt7688 - -define Device/pbr-d1 - DTS := PBR-D1 - IMAGE_SIZE := $(ralink_default_fw_size_16M) - DEVICE_TITLE := PBR-D1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci -endef -TARGET_DEVICES += pbr-d1 - -define Device/vocore2lite - DTS := VOCORE2LITE - IMAGE_SIZE := $(ralink_default_fw_size_8M) - DEVICE_TITLE := VoCore VoCore2-Lite - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci kmod-sdhci-mt7620 -endef -TARGET_DEVICES += vocore2lite - -define Device/wrtnode2r - DTS := WRTNODE2R - IMAGE_SIZE := $(ralink_default_fw_size_16M) - DEVICE_TITLE := WRTnode 2R - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci -endef -TARGET_DEVICES += wrtnode2r - -define Device/widora-neo - DTS := WIDORA-NEO - IMAGE_SIZE := $(ralink_default_fw_size_16M) - DEVICE_TITLE := Widora-NEO - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci -endef -TARGET_DEVICES += widora-neo - -define Device/omega2 - DTS := OMEGA2 - IMAGE_SIZE := $(ralink_default_fw_size_16M) - DEVICE_TITLE := Onion Omega2 - DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci uboot-envtools -endef -TARGET_DEVICES += omega2 - -define Device/omega2p - DTS := OMEGA2P - IMAGE_SIZE := $(ralink_default_fw_size_32M) - DEVICE_TITLE := Onion Omega2+ - DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci uboot-envtools kmod-sdhci-mt7620 -endef -TARGET_DEVICES += omega2p diff --git a/target/linux/ramips/image/mt7628.mk b/target/linux/ramips/image/mt76x8.mk index 693e64f..f4b3171 100644 --- a/target/linux/ramips/image/mt7628.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -1,17 +1,23 @@ # -# MT7628 Profiles +# MT76x8 Profiles # DEVICE_VARS += TPLINK_BOARD_ID -define Device/mt7628 - DTS := MT7628 - BLOCKSIZE := 64k - IMAGE_SIZE := $(ralink_default_fw_size_4M) - DEVICE_TITLE := MediaTek MT7628 EVB +define Device/duzun-dm06 + DTS := DUZUN-DM06 + DEVICE_TITLE := DuZun DM06 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport endef -TARGET_DEVICES += mt7628 +TARGET_DEVICES += duzun-dm06 + +define Device/gl-mt300n-v2 + DTS := GL-MT300N-V2 + IMAGE_SIZE := 16064k + DEVICE_TITLE := GL-iNet GL-MT300N-V2 + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci +endef +TARGET_DEVICES += gl-mt300n-v2 define Device/hc5661a DTS := HC5661A @@ -20,6 +26,22 @@ define Device/hc5661a endef TARGET_DEVICES += hc5661a +define Device/LinkIt7688 + DTS := LINKIT7688 + IMAGE_SIZE := $(ralink_default_fw_size_32M) + SUPPORTED_DEVICES := linkits7688 linkits7688d + DEVICE_TITLE := MediaTek LinkIt Smart 7688 + DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci uboot-envtools +endef +TARGET_DEVICES += LinkIt7688 + +define Device/mac1200r-v2 + DTS := MAC1200RV2 + DEVICE_TITLE := Mercury MAC1200R v2.0 + SUPPORTED_DEVICES := mac1200rv2 +endef +TARGET_DEVICES += mac1200r-v2 + define Device/miwifi-nano DTS := MIWIFI-NANO IMAGE_SIZE := $(ralink_default_fw_size_16M) @@ -28,6 +50,37 @@ define Device/miwifi-nano endef TARGET_DEVICES += miwifi-nano +define Device/mt7628 + DTS := MT7628 + BLOCKSIZE := 64k + IMAGE_SIZE := $(ralink_default_fw_size_4M) + DEVICE_TITLE := MediaTek MT7628 EVB + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport +endef + +define Device/omega2 + DTS := OMEGA2 + IMAGE_SIZE := $(ralink_default_fw_size_16M) + DEVICE_TITLE := Onion Omega2 + DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci uboot-envtools +endef + +define Device/omega2p + DTS := OMEGA2P + IMAGE_SIZE := $(ralink_default_fw_size_32M) + DEVICE_TITLE := Onion Omega2+ + DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci uboot-envtools kmod-sdhci-mt7620 +endef +TARGET_DEVICES += omega2 omega2p + +define Device/pbr-d1 + DTS := PBR-D1 + IMAGE_SIZE := $(ralink_default_fw_size_16M) + DEVICE_TITLE := PBR-D1 + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci +endef +TARGET_DEVICES += pbr-d1 + define Device/tl-wr840n-v4 DTS := TL-WR840NV4 IMAGE_SIZE := 7808k @@ -40,7 +93,6 @@ define Device/tl-wr840n-v4 IMAGE/sysupgrade.bin := tplink-v2-image -s | append-metadata | \ check-size $$$$(IMAGE_SIZE) endef -TARGET_DEVICES += tl-wr840n-v4 define Device/tl-wr841n-v13 $(Device/tl-wr840n-v4) @@ -48,15 +100,7 @@ define Device/tl-wr841n-v13 DEVICE_TITLE := TP-Link TL-WR841N v13 TPLINK_BOARD_ID := TL-WR841NV13 endef -TARGET_DEVICES += tl-wr841n-v13 - -define Device/gl-mt300n-v2 - DTS := GL-MT300N-V2 - IMAGE_SIZE := 16064k - DEVICE_TITLE := GL-iNet GL-MT300N-V2 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci -endef -TARGET_DEVICES += gl-mt300n-v2 +TARGET_DEVICES += tl-wr840n-v4 tl-wr841n-v13 define Device/vocore2 DTS := VOCORE2 @@ -65,36 +109,15 @@ define Device/vocore2 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \ kmod-sdhci-mt7620 endef -TARGET_DEVICES += vocore2 -define Device/wl-wn575a3 - DTS := WL-WN575A3 - IMAGE_SIZE := $(ralink_default_fw_size_8M) - DEVICE_TITLE := Wavlink WL-WN575A3 -endef -TARGET_DEVICES += wl-wn575a3 - -define Device/wrtnode2p - DTS := WRTNODE2P +define Device/vocore2lite + DTS := VOCORE2LITE IMAGE_SIZE := $(ralink_default_fw_size_16M) - DEVICE_TITLE := WRTnode 2P - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport -endef -TARGET_DEVICES += wrtnode2p - -define Device/duzun-dm06 - DTS := DUZUN-DM06 - DEVICE_TITLE := DuZun DM06 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport -endef -TARGET_DEVICES += duzun-dm06 - -define Device/mac1200r-v2 - DTS := MAC1200RV2 - DEVICE_TITLE := Mercury MAC1200R v2.0 - SUPPORTED_DEVICES := mac1200rv2 + DEVICE_TITLE := VoCore VoCore2-Lite + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \ + kmod-sdhci-mt7620 endef -TARGET_DEVICES += mac1200r-v2 +TARGET_DEVICES += vocore2 vocore2lite define Device/wcr-1166ds DTS := WCR-1166DS @@ -111,3 +134,33 @@ define Device/wcr-1166ds DEVICE_TITLE := Buffalo WCR-1166DS endef TARGET_DEVICES += wcr-1166ds + +define Device/wl-wn575a3 + DTS := WL-WN575A3 + IMAGE_SIZE := $(ralink_default_fw_size_8M) + DEVICE_TITLE := Wavlink WL-WN575A3 +endef +TARGET_DEVICES += wl-wn575a3 + +define Device/widora-neo + DTS := WIDORA-NEO + IMAGE_SIZE := $(ralink_default_fw_size_16M) + DEVICE_TITLE := Widora-NEO + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci +endef +TARGET_DEVICES += widora-neo + +define Device/wrtnode2p + DTS := WRTNODE2P + IMAGE_SIZE := $(ralink_default_fw_size_16M) + DEVICE_TITLE := WRTnode 2P + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport +endef + +define Device/wrtnode2r + DTS := WRTNODE2R + IMAGE_SIZE := $(ralink_default_fw_size_16M) + DEVICE_TITLE := WRTnode 2R + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci +endef +TARGET_DEVICES += wrtnode2p wrtnode2r |