From 510ff1f1b8f7ee28986cb08381b02392847296ac Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 19 Nov 2014 09:19:38 +0000 Subject: [PATCH] ralink: merge the mt7620a/n subtargets Signed-off-by: John Crispin SVN-Revision: 43300 --- package/kernel/mac80211/Makefile | 2 +- target/linux/ramips/Makefile | 2 +- target/linux/ramips/image/Makefile | 29 +-- target/linux/ramips/modules.mk | 4 +- .../ramips/{mt7620a => mt7620}/config-3.14 | 0 .../profiles/00-default.mk | 0 .../{mt7620a => mt7620}/profiles/linksys.mk | 0 .../linux/ramips/mt7620/profiles/mediatek.mk | 15 ++ .../ramips/{mt7620a => mt7620}/target.mk | 6 +- target/linux/ramips/mt7620n/config-3.14 | 178 ------------------ .../ramips/mt7620n/profiles/00-default.mk | 18 -- target/linux/ramips/mt7620n/target.mk | 17 -- .../patches-3.14/999-non-pci-mt7620.patch | 14 ++ 13 files changed, 45 insertions(+), 240 deletions(-) rename target/linux/ramips/{mt7620a => mt7620}/config-3.14 (100%) rename target/linux/ramips/{mt7620a => mt7620}/profiles/00-default.mk (100%) rename target/linux/ramips/{mt7620a => mt7620}/profiles/linksys.mk (100%) create mode 100644 target/linux/ramips/mt7620/profiles/mediatek.mk rename target/linux/ramips/{mt7620a => mt7620}/target.mk (65%) delete mode 100644 target/linux/ramips/mt7620n/config-3.14 delete mode 100644 target/linux/ramips/mt7620n/profiles/00-default.mk delete mode 100644 target/linux/ramips/mt7620n/target.mk create mode 100644 target/linux/ramips/patches-3.14/999-non-pci-mt7620.patch diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index b5f15bf2c5..007eb75833 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -328,7 +328,7 @@ endef define KernelPackage/rt2800-soc $(call KernelPackage/rt2x00/Default) - DEPENDS += @(TARGET_ramips_rt288x||TARGET_ramips_rt305x||TARGET_ramips_rt3883||TARGET_ramips_mt7620n||TARGET_ramips_mt7620a) +kmod-rt2800-mmio +kmod-rt2800-lib + DEPENDS += @(TARGET_ramips_rt288x||TARGET_ramips_rt305x||TARGET_ramips_rt3883||TARGET_ramips_mt7620) +kmod-rt2800-mmio +kmod-rt2800-lib TITLE += (RT28xx/RT3xxx SoC) FILES := \ $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00soc.ko \ diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index d3d2db789b..95577d4af8 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=mipsel BOARD:=ramips BOARDNAME:=Ralink RT288x/RT3xxx -SUBTARGETS:=rt305x mt7620a mt7620n mt7621 mt7628 rt3883 rt288x +SUBTARGETS:=rt305x mt7620 mt7621 mt7628 rt3883 rt288x FEATURES:=squashfs gpio MAINTAINER:=John Crispin diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 2fae792cb6..491a44d964 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -788,8 +788,16 @@ Image/Build/Profile/NA930=$(call BuildFirmware/CustomFlash/$(1),$(1),na930,NA930 Image/Build/Profile/MZK-750DHP=$(call BuildFirmware/Default8M/$(1),$(1),mzk-750dhp,MZK-750DHP) Image/Build/Profile/Y1=$(call BuildFirmware/Default16M/$(1),$(1),Lenovo-y1,Y1) Image/Build/Profile/Y1S=$(call BuildFirmware/Default16M/$(1),$(1),Lenovo-y1s,Y1S) +Image/Build/Profile/MLW221=$(call BuildFirmware/Default16M/$(1),$(1),mlw221,MLW221) +Image/Build/Profile/WMR300=$(call BuildFirmware/Default8M/$(1),$(1),wmr-300,WMR300) +Image/Build/Profile/RT-N14U=$(call BuildFirmware/Default8M/$(1),$(1),rt-n14u,RT-N14U) +Image/Build/Profile/WR8305RT=$(call BuildFirmware/Default8M/$(1),$(1),wr8305rt,WR8305RT) +Image/Build/Profile/WRTNODE=$(call BuildFirmware/Default16M/$(1),$(1),wrtnode,WRTNODE) +Image/Build/Profile/WT3020=$(call BuildFirmware/DefaultDualSize/$(1),$(1),wt3020,WT3020) +Image/Build/Profile/ZBT-WA05=$(call BuildFirmware/Default8M/$(1),$(1),zbt-wa05,ZBT-WA05) -ifeq ($(SUBTARGET),mt7620a) + +ifeq ($(SUBTARGET),mt7620) define Image/Build/Profile/Default $(call Image/Build/Profile/E1700,$(1)) $(call Image/Build/Profile/MT7620a,$(1)) @@ -805,24 +813,6 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/NA930,$(1)) $(call Image/Build/Profile/Y1,$(1)) $(call Image/Build/Profile/Y1S,$(1)) -endef -endif - - -# -# MT7620N Profiles -# - -Image/Build/Profile/MLW221=$(call BuildFirmware/Default16M/$(1),$(1),mlw221,MLW221) -Image/Build/Profile/WMR300=$(call BuildFirmware/Default8M/$(1),$(1),wmr-300,WMR300) -Image/Build/Profile/RT-N14U=$(call BuildFirmware/Default8M/$(1),$(1),rt-n14u,RT-N14U) -Image/Build/Profile/WR8305RT=$(call BuildFirmware/Default8M/$(1),$(1),wr8305rt,WR8305RT) -Image/Build/Profile/WRTNODE=$(call BuildFirmware/Default16M/$(1),$(1),wrtnode,WRTNODE) -Image/Build/Profile/WT3020=$(call BuildFirmware/DefaultDualSize/$(1),$(1),wt3020,WT3020) -Image/Build/Profile/ZBT-WA05=$(call BuildFirmware/Default8M/$(1),$(1),zbt-wa05,ZBT-WA05) - -ifeq ($(SUBTARGET),mt7620n) -define Image/Build/Profile/Default $(call Image/Build/Profile/MLW221,$(1)) $(call Image/Build/Profile/WMR300,$(1)) $(call Image/Build/Profile/RT-N14U,$(1)) @@ -833,7 +823,6 @@ define Image/Build/Profile/Default endef endif - # # MT7621 Profiles # diff --git a/target/linux/ramips/modules.mk b/target/linux/ramips/modules.mk index 08eea9bb86..550a8c2930 100644 --- a/target/linux/ramips/modules.mk +++ b/target/linux/ramips/modules.mk @@ -9,7 +9,7 @@ OTHER_MENU:=Other modules define KernelPackage/sdhci-mt7620 SUBMENU:=Other modules TITLE:=MT7620 SDCI - DEPENDS:=@(TARGET_ramips_mt7620a||TARGET_ramips_mt7628||TARGET_ramips_mt7621) +kmod-sdhci + DEPENDS:=@(TARGET_ramips_mt7620||TARGET_ramips_mt7628||TARGET_ramips_mt7621) +kmod-sdhci KCONFIG:= \ CONFIG_MTK_MMC \ CONFIG_MTK_AEE_KDUMP=n \ @@ -38,7 +38,7 @@ $(eval $(call KernelPackage,i2c-ralink)) define KernelPackage/sound-mt7620 TITLE:=MT7620 PCM/I2S Alsa Driver - DEPENDS:=@TARGET_ramips_mt7620a +kmod-sound-soc-core +kmod-regmap + DEPENDS:=@TARGET_ramips_mt7620 +kmod-sound-soc-core +kmod-regmap KCONFIG:= \ CONFIG_SND_MT7620_SOC_I2S \ CONFIG_SND_MT7620_SOC_WM8960 diff --git a/target/linux/ramips/mt7620a/config-3.14 b/target/linux/ramips/mt7620/config-3.14 similarity index 100% rename from target/linux/ramips/mt7620a/config-3.14 rename to target/linux/ramips/mt7620/config-3.14 diff --git a/target/linux/ramips/mt7620a/profiles/00-default.mk b/target/linux/ramips/mt7620/profiles/00-default.mk similarity index 100% rename from target/linux/ramips/mt7620a/profiles/00-default.mk rename to target/linux/ramips/mt7620/profiles/00-default.mk diff --git a/target/linux/ramips/mt7620a/profiles/linksys.mk b/target/linux/ramips/mt7620/profiles/linksys.mk similarity index 100% rename from target/linux/ramips/mt7620a/profiles/linksys.mk rename to target/linux/ramips/mt7620/profiles/linksys.mk diff --git a/target/linux/ramips/mt7620/profiles/mediatek.mk b/target/linux/ramips/mt7620/profiles/mediatek.mk new file mode 100644 index 0000000000..acb0c0343e --- /dev/null +++ b/target/linux/ramips/mt7620/profiles/mediatek.mk @@ -0,0 +1,15 @@ +# +# Copyright (C) 2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/MT7620a + NAME:=MT7620a EVB +endef + +define Profile/Default/Description + Default package set compatible with MT7620a eval board +endef +$(eval $(call Profile,MT7620a)) diff --git a/target/linux/ramips/mt7620a/target.mk b/target/linux/ramips/mt7620/target.mk similarity index 65% rename from target/linux/ramips/mt7620a/target.mk rename to target/linux/ramips/mt7620/target.mk index 0475507117..245576c5b9 100644 --- a/target/linux/ramips/mt7620a/target.mk +++ b/target/linux/ramips/mt7620/target.mk @@ -2,8 +2,8 @@ # Copyright (C) 2009 OpenWrt.org # -SUBTARGET:=mt7620a -BOARDNAME:=MT7620a based boards +SUBTARGET:=mt7620 +BOARDNAME:=MT7620 based boards ARCH_PACKAGES:=ramips_24kec FEATURES+=usb CPU_TYPE:=24kec @@ -12,6 +12,6 @@ CPU_SUBTYPE:=dsp DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc define Target/Description - Build firmware images for Ralink MT7620a based boards. + Build firmware images for Ralink MT7620 based boards. endef diff --git a/target/linux/ramips/mt7620n/config-3.14 b/target/linux/ramips/mt7620n/config-3.14 deleted file mode 100644 index 1a3155ebba..0000000000 --- a/target/linux/ramips/mt7620n/config-3.14 +++ /dev/null @@ -1,178 +0,0 @@ -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_ARCH_HAS_RESET_CONTROLLER=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y -CONFIG_ARCH_REQUIRE_GPIOLIB=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_CEVT_R4K=y -CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLKEVT_RT3352=y -CONFIG_CLKSRC_MMIO=y -CONFIG_CLKSRC_OF=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_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_R4K_CACHE_TLB=y -CONFIG_CPU_R4K_FPU=y -CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y -CONFIG_CPU_SUPPORTS_HIGHMEM=y -CONFIG_CSRC_R4K=y -CONFIG_DEBUG_PINCTRL=y -CONFIG_DMA_NONCOHERENT=y -# CONFIG_DTB_MT7620A_EVAL is not set -# CONFIG_DTB_MT7628AN_EVAL is not set -CONFIG_DTB_RT_NONE=y -CONFIG_DTC=y -CONFIG_EARLY_PRINTK=y -CONFIG_GENERIC_ATOMIC64=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_NET_UTILS=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -# CONFIG_GPIO_MT7621 is not set -CONFIG_GPIO_RALINK=y -CONFIG_GPIO_SYSFS=y -CONFIG_HARDWARE_WATCHPOINTS=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -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_ATTRS=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_FUNCTION_TRACE_MCOUNT_TEST=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_IDE=y -CONFIG_HAVE_KVM=y -CONFIG_HAVE_MACH_CLKDEV=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_SYSCALL_TRACEPOINTS=y -CONFIG_HW_HAS_PCI=y -CONFIG_HW_RANDOM=m -CONFIG_HZ_PERIODIC=y -CONFIG_IMAGE_CMDLINE_HACK=y -CONFIG_INET_LRO=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_IRQCHIP=y -CONFIG_IRQ_CPU=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_INTC=y -CONFIG_IRQ_WORK=y -CONFIG_MDIO_BOARDINFO=y -CONFIG_MIPS=y -# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set -CONFIG_MIPS_L1_CACHE_SHIFT=5 -# CONFIG_MIPS_MACHINE is not set -CONFIG_MIPS_MT_DISABLED=y -# CONFIG_MIPS_O32_FP64_SUPPORT is not set -CONFIG_MODULES_USE_ELF_REL=y -# CONFIG_MT7621_WDT is not set -# CONFIG_MTD_CFI_INTELEXT is not set -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_M25P80=y -# CONFIG_MTD_NAND_MT7620 is not set -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_SPLIT_FIRMWARE=y -CONFIG_MTD_UIMAGE_SPLIT=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_PER_CPU_KM=y -CONFIG_NET_RALINK=y -CONFIG_NET_RALINK_GSW_MT7620=y -CONFIG_NET_RALINK_MDIO=y -CONFIG_NET_RALINK_MT7620=y -# CONFIG_NET_RALINK_RT305X is not set -CONFIG_NLS=m -CONFIG_OF=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_FLATTREE=y -CONFIG_OF_GPIO=y -CONFIG_OF_IRQ=y -CONFIG_OF_MDIO=y -CONFIG_OF_MTD=y -CONFIG_OF_NET=y -CONFIG_PAGEFLAGS_EXTENDED=y -# CONFIG_PCI is not set -CONFIG_PERF_USE_VMALLOC=y -CONFIG_PHYLIB=y -# CONFIG_PINCONF is not set -CONFIG_PINCTRL=y -CONFIG_PINCTRL_RT2880=y -# CONFIG_PINCTRL_SINGLE is not set -# CONFIG_PREEMPT_RCU is not set -CONFIG_RALINK=y -CONFIG_RALINK_USBPHY=y -CONFIG_RALINK_WDT=y -CONFIG_RA_NAT_NONE=y -# CONFIG_RCU_STALL_COMMON is not set -CONFIG_RESET_CONTROLLER=y -# CONFIG_SCSI_DMA is not set -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RT288X=y -CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SLAB is not set -CONFIG_SLUB=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_RT2880=y -CONFIG_SWCONFIG=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_TICK_CPU_ACCOUNTING=y -CONFIG_USB=m -CONFIG_USB_COMMON=m -# CONFIG_USB_EHCI_HCD is not set -CONFIG_USB_PHY=y -CONFIG_USB_SUPPORT=y -CONFIG_USE_OF=y -CONFIG_WATCHDOG_CORE=y -CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ramips/mt7620n/profiles/00-default.mk b/target/linux/ramips/mt7620n/profiles/00-default.mk deleted file mode 100644 index 6c7d721444..0000000000 --- a/target/linux/ramips/mt7620n/profiles/00-default.mk +++ /dev/null @@ -1,18 +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 - PACKAGES:=\ - kmod-usb-core kmod-usb2 kmod-usb-ohci \ - kmod-ledtrig-usbdev -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/ramips/mt7620n/target.mk b/target/linux/ramips/mt7620n/target.mk deleted file mode 100644 index 442d88c7b4..0000000000 --- a/target/linux/ramips/mt7620n/target.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2013 OpenWrt.org -# - -SUBTARGET:=mt7620n -BOARDNAME:=MT7620n based boards -ARCH_PACKAGES:=ramips_24kec -FEATURES+=usb -CPU_TYPE:=24kec -CPU_SUBTYPE:=dsp - -DEFAULT_PACKAGES += kmod-rt2800-soc - -define Target/Description - Build firmware images for Ralink MT7620n based boards. -endef - diff --git a/target/linux/ramips/patches-3.14/999-non-pci-mt7620.patch b/target/linux/ramips/patches-3.14/999-non-pci-mt7620.patch new file mode 100644 index 0000000000..6a6f3279f6 --- /dev/null +++ b/target/linux/ramips/patches-3.14/999-non-pci-mt7620.patch @@ -0,0 +1,14 @@ +Index: linux-3.14.18/arch/mips/ralink/mt7620.c +=================================================================== +--- linux-3.14.18.orig/arch/mips/ralink/mt7620.c 2014-11-18 20:57:21.506801623 +0100 ++++ linux-3.14.18/arch/mips/ralink/mt7620.c 2014-11-18 22:12:05.133116492 +0100 +@@ -511,9 +511,6 @@ + ralink_soc = MT762X_SOC_MT7620N; + name = "MT7620N"; + soc_info->compatible = "ralink,mt7620n-soc"; +-#ifdef CONFIG_PCI +- panic("mt7620n is only supported for non pci kernels"); +-#endif + } + } else if (n0 == MT7620_CHIP_NAME0 && n1 == MT7628_CHIP_NAME1) { + ralink_soc = MT762X_SOC_MT7628AN; -- 2.25.1