From 3e36ca4b436510a6e411484db47f7df35ebaf86d Mon Sep 17 00:00:00 2001 From: "L. D. Pinney" Date: Sat, 26 Aug 2017 09:49:45 +0800 Subject: [PATCH] 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 --- target/linux/ramips/Makefile | 2 +- target/linux/ramips/image/Makefile | 8 +- target/linux/ramips/image/mt7688.mk | 60 ----- .../ramips/image/{mt7628.mk => mt76x8.mk} | 141 ++++++++---- target/linux/ramips/mt7688/config-4.9 | 208 ------------------ .../ramips/mt7688/profiles/00-default.mk | 17 -- target/linux/ramips/mt7688/target.mk | 15 -- .../ramips/{mt7628 => mt76x8}/config-4.9 | 0 .../{mt7628 => mt76x8}/profiles/00-default.mk | 0 .../linux/ramips/{mt7628 => mt76x8}/target.mk | 6 +- 10 files changed, 103 insertions(+), 354 deletions(-) delete mode 100644 target/linux/ramips/image/mt7688.mk rename target/linux/ramips/image/{mt7628.mk => mt76x8.mk} (63%) delete mode 100644 target/linux/ramips/mt7688/config-4.9 delete mode 100644 target/linux/ramips/mt7688/profiles/00-default.mk delete mode 100644 target/linux/ramips/mt7688/target.mk rename target/linux/ramips/{mt7628 => mt76x8}/config-4.9 (100%) rename target/linux/ramips/{mt7628 => mt76x8}/profiles/00-default.mk (100%) rename target/linux/ramips/{mt7628 => mt76x8}/target.mk (57%) diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index ad6cbca0ea..9bcffc1ce8 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=mipsel BOARD:=ramips BOARDNAME:=MediaTek Ralink MIPS -SUBTARGETS:=rt305x mt7620 mt7621 mt7628 mt7688 rt3883 rt288x +SUBTARGETS:=mt7620 mt7621 mt76x8 rt288x rt305x rt3883 FEATURES:=squashfs gpio MAINTAINER:=John Crispin diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 7196a4664f..c70761b250 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 2c181fc846..0000000000 --- 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 similarity index 63% rename from target/linux/ramips/image/mt7628.mk rename to target/linux/ramips/image/mt76x8.mk index 693e64f4dd..f4b3171a0b 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 diff --git a/target/linux/ramips/mt7688/config-4.9 b/target/linux/ramips/mt7688/config-4.9 deleted file mode 100644 index 19e2bb05b1..0000000000 --- a/target/linux/ramips/mt7688/config-4.9 +++ /dev/null @@ -1,208 +0,0 @@ -CONFIG_ARCH_BINFMT_ELF_STATE=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set -CONFIG_ARCH_HAS_RESET_CONTROLLER=y -# CONFIG_ARCH_HAS_SG_CHAIN is not set -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_AT803X_PHY=y -CONFIG_BLK_MQ_PCI=y -CONFIG_CEVT_R4K=y -CONFIG_CEVT_SYSTICK_QUIRK=y -CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLKEVT_RT3352=y -CONFIG_CLKSRC_MMIO=y -CONFIG_CLKSRC_OF=y -CONFIG_CLKSRC_PROBE=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE="rootfstype=squashfs,jffs2" -CONFIG_CMDLINE_BOOL=y -# CONFIG_CMDLINE_OVERRIDE is not set -CONFIG_CPU_GENERIC_DUMP_TLB=y -CONFIG_CPU_HAS_PREFETCH=y -CONFIG_CPU_HAS_RIXI=y -CONFIG_CPU_HAS_SYNC=y -CONFIG_CPU_LITTLE_ENDIAN=y -CONFIG_CPU_MIPS32=y -# CONFIG_CPU_MIPS32_R1 is not set -CONFIG_CPU_MIPS32_R2=y -CONFIG_CPU_MIPSR2=y -CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y -CONFIG_CPU_R4K_CACHE_TLB=y -CONFIG_CPU_R4K_FPU=y -CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y -CONFIG_CPU_SUPPORTS_HIGHMEM=y -CONFIG_CPU_SUPPORTS_MSA=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CSRC_R4K=y -CONFIG_DEBUG_PINCTRL=y -CONFIG_DMA_NONCOHERENT=y -# CONFIG_DTB_MT7620A_EVAL is not set -CONFIG_DTB_RT_NONE=y -CONFIG_DTC=y -CONFIG_EARLY_PRINTK=y -CONFIG_FIXED_PHY=y -CONFIG_GENERIC_ATOMIC64=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_PHY=y -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_MT7621=y -# CONFIG_GPIO_RALINK is not set -CONFIG_GPIO_SYSFS=y -CONFIG_HANDLE_DOMAIN_IRQ=y -CONFIG_HARDWARE_WATCHPOINTS=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -# CONFIG_HAVE_ARCH_BITREVERSE is not set -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CBPF_JIT=y -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_IDE=y -CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_KVM=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MEMBLOCK_NODE_MAP=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HW_HAS_PCI=y -CONFIG_HZ_PERIODIC=y -CONFIG_ICPLUS_PHY=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_IRQCHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_INTC=y -CONFIG_IRQ_MIPS_CPU=y -CONFIG_IRQ_WORK=y -CONFIG_LIBFDT=y -CONFIG_MDIO_BOARDINFO=y -CONFIG_MIPS=y -CONFIG_MIPS_ASID_BITS=8 -CONFIG_MIPS_ASID_SHIFT=0 -CONFIG_MIPS_CLOCK_VSYSCALL=y -# CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND is not set -# CONFIG_MIPS_CMDLINE_DTB_EXTEND is not set -# CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER is not set -CONFIG_MIPS_CMDLINE_FROM_DTB=y -# CONFIG_MIPS_ELF_APPENDED_DTB is not set -CONFIG_MIPS_FPU_EMULATOR=y -# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set -CONFIG_MIPS_L1_CACHE_SHIFT=5 -# CONFIG_MIPS_MACHINE is not set -CONFIG_MIPS_NO_APPENDED_DTB=y -# CONFIG_MIPS_RAW_APPENDED_DTB is not set -CONFIG_MIPS_SPRAM=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MT7621_WDT=y -# CONFIG_MTD_CFI_INTELEXT is not set -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_SPI_NOR=y -CONFIG_MTD_SPLIT_FIRMWARE=y -CONFIG_MTD_SPLIT_UIMAGE_FW=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_PER_CPU_KM=y -CONFIG_NET_MEDIATEK_ESW_RT3050=y -# CONFIG_NET_MEDIATEK_MT7620 is not set -CONFIG_NET_MEDIATEK_RT3050=y -CONFIG_NET_MEDIATEK_SOC=y -CONFIG_NET_VENDOR_MEDIATEK=y -CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y -# CONFIG_NO_IOPORT_MAP is not set -CONFIG_OF=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_ADDRESS_PCI=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_FLATTREE=y -CONFIG_OF_GPIO=y -CONFIG_OF_IRQ=y -CONFIG_OF_MDIO=y -CONFIG_OF_NET=y -CONFIG_OF_PCI=y -CONFIG_OF_PCI_IRQ=y -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_DRIVERS_LEGACY=y -CONFIG_PERF_USE_VMALLOC=y -CONFIG_PGTABLE_LEVELS=2 -CONFIG_PHYLIB=y -CONFIG_PHY_RALINK_USB=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_RT2880=y -# CONFIG_PINCTRL_SINGLE is not set -CONFIG_RALINK=y -# CONFIG_RALINK_WDT is not set -# CONFIG_RCU_STALL_COMMON is not set -CONFIG_RESET_CONTROLLER=y -# CONFIG_SCHED_INFO is not set -# CONFIG_SCSI_DMA is not set -# CONFIG_SERIAL_8250_FSL is not set -CONFIG_SERIAL_8250_NR_UARTS=3 -CONFIG_SERIAL_8250_RUNTIME_UARTS=3 -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SOC_MT7620=y -# CONFIG_SOC_MT7621 is not set -# CONFIG_SOC_RT288X is not set -# CONFIG_SOC_RT305X is not set -# CONFIG_SOC_RT3883 is not set -CONFIG_SPI=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_MT7621=y -# CONFIG_SPI_RT2880 is not set -CONFIG_SRCU=y -CONFIG_SWCONFIG=y -CONFIG_SWPHY=y -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_SYS_HAS_CPU_MIPS32_R1=y -CONFIG_SYS_HAS_CPU_MIPS32_R2=y -CONFIG_SYS_HAS_EARLY_PRINTK=y -CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y -CONFIG_SYS_SUPPORTS_ARBIT_HZ=y -CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y -CONFIG_SYS_SUPPORTS_MIPS16=y -CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_USB_SUPPORT=y -CONFIG_USE_OF=y -CONFIG_WATCHDOG_CORE=y diff --git a/target/linux/ramips/mt7688/profiles/00-default.mk b/target/linux/ramips/mt7688/profiles/00-default.mk deleted file mode 100644 index 162ac14315..0000000000 --- a/target/linux/ramips/mt7688/profiles/00-default.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile - PRIORITY:=1 - PACKAGES:= kmod-usb-core kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/ramips/mt7688/target.mk b/target/linux/ramips/mt7688/target.mk deleted file mode 100644 index 30ddb78331..0000000000 --- a/target/linux/ramips/mt7688/target.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2015 OpenWrt.org -# - -SUBTARGET:=mt7688 -BOARDNAME:=MT7688 based boards -FEATURES+=usb -CPU_TYPE:=24kc - -DEFAULT_PACKAGES += kmod-mt76 wpad-mini - -define Target/Description - Build firmware images for Ralink MT7688 based boards. -endef - diff --git a/target/linux/ramips/mt7628/config-4.9 b/target/linux/ramips/mt76x8/config-4.9 similarity index 100% rename from target/linux/ramips/mt7628/config-4.9 rename to target/linux/ramips/mt76x8/config-4.9 diff --git a/target/linux/ramips/mt7628/profiles/00-default.mk b/target/linux/ramips/mt76x8/profiles/00-default.mk similarity index 100% rename from target/linux/ramips/mt7628/profiles/00-default.mk rename to target/linux/ramips/mt76x8/profiles/00-default.mk diff --git a/target/linux/ramips/mt7628/target.mk b/target/linux/ramips/mt76x8/target.mk similarity index 57% rename from target/linux/ramips/mt7628/target.mk rename to target/linux/ramips/mt76x8/target.mk index 48060ce7ac..ccb1bf5c6d 100644 --- a/target/linux/ramips/mt7628/target.mk +++ b/target/linux/ramips/mt76x8/target.mk @@ -2,14 +2,14 @@ # Copyright (C) 2009 OpenWrt.org # -SUBTARGET:=mt7628 -BOARDNAME:=MT7628 based boards +SUBTARGET:=mt76x8 +BOARDNAME:=MT76x8 based boards FEATURES+=usb CPU_TYPE:=24kc DEFAULT_PACKAGES += kmod-mt76 wpad-mini define Target/Description - Build firmware images for Ralink MT7628 based boards. + Build firmware images for Ralink MT76x8 based boards. endef -- 2.30.2