leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mips: rename mach-mt7620 to mach-mtmips

Browse Source 
Currently mach-mt7620 contains only support for mt7628. To avoid confusion,
rename mach-mt7620 to mach-mtmips, which means MediaTek MIPS platforms.
MT7620 and MT7628 should be distinguished by SOC_MT7620 and SOC_MT7628
because they do not share the same lowlevel codes.

Dependencies of four drivers are changed to SOC_MT7628 as these drivers
are only used by MT7628.

Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
This commit is contained in:
Weijie Gao 2019-04-30 11:13:58 +08:00 committed by Daniel Schwierzeck
parent 8c211af8f8
commit 16b94903e2
17 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/mips/Kconfig
View File

@ -74,8 +74,8 @@ config ARCH_BMIPS
select SYSRESET select SYSRESET
imply CMD_DM imply CMD_DM
config ARCH_MT7620 config ARCH_MTMIPS
bool "Support MT7620/7688 SoCs" bool "Support MediaTek MIPS platforms"
imply CMD_DM imply CMD_DM
select DISPLAY_CPUINFO select DISPLAY_CPUINFO
select DM select DM
@ -153,7 +153,7 @@ source "arch/mips/mach-mscc/Kconfig"
source "arch/mips/mach-bmips/Kconfig" source "arch/mips/mach-bmips/Kconfig"
source "arch/mips/mach-jz47xx/Kconfig" source "arch/mips/mach-jz47xx/Kconfig"
source "arch/mips/mach-pic32/Kconfig" source "arch/mips/mach-pic32/Kconfig"
source "arch/mips/mach-mt7620/Kconfig" source "arch/mips/mach-mtmips/Kconfig"
if MIPS if MIPS

2
arch/mips/Makefile
View File

@ -15,7 +15,7 @@ machine-$(CONFIG_ARCH_ATH79) += ath79
machine-$(CONFIG_ARCH_BMIPS) += bmips machine-$(CONFIG_ARCH_BMIPS) += bmips
machine-$(CONFIG_ARCH_JZ47XX) += jz47xx machine-$(CONFIG_ARCH_JZ47XX) += jz47xx
machine-$(CONFIG_MACH_PIC32) += pic32 machine-$(CONFIG_MACH_PIC32) += pic32
machine-$(CONFIG_ARCH_MT7620) += mt7620 machine-$(CONFIG_ARCH_MTMIPS) += mtmips
machine-$(CONFIG_ARCH_MSCC) += mscc machine-$(CONFIG_ARCH_MSCC) += mscc
machdirs := $(patsubst %,arch/mips/mach-%/,$(machine-y)) machdirs := $(patsubst %,arch/mips/mach-%/,$(machine-y))

2
arch/mips/dts/Makefile
View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
dtb-$(CONFIG_ARCH_MT7620) += \ dtb-$(CONFIG_ARCH_MTMIPS) += \
gardena-smart-gateway-mt7688.dtb \ gardena-smart-gateway-mt7688.dtb \
linkit-smart-7688.dtb linkit-smart-7688.dtb
dtb-$(CONFIG_TARGET_AP121) += ap121.dtb dtb-$(CONFIG_TARGET_AP121) += ap121.dtb

14
arch/mips/mach-mt7620/Kconfig → arch/mips/mach-mtmips/Kconfig
View File

@ -1,20 +1,20 @@
menu "MediaTek MIPS platforms" menu "MediaTek MIPS platforms"
depends on ARCH_MT7620 depends on ARCH_MTMIPS
config SYS_MALLOC_F_LEN config SYS_MALLOC_F_LEN
default 0x1000 default 0x1000
config SYS_SOC config SYS_SOC
default "mt7620" if SOC_MT7620 default "mt7628" if SOC_MT7628
choice choice
prompt "MediaTek MIPS SoC select" prompt "MediaTek MIPS SoC select"
config SOC_MT7620 config SOC_MT7628
bool "MT7620/8" bool "MT7628"
select MIPS_L1_CACHE_SHIFT_5 select MIPS_L1_CACHE_SHIFT_5
help help
This supports MediaTek MIPS MT7620 family. This supports MediaTek MT7628/MT7688.
endchoice endchoice
@ -23,7 +23,7 @@ choice
config BOARD_GARDENA_SMART_GATEWAY_MT7688 config BOARD_GARDENA_SMART_GATEWAY_MT7688
bool "GARDENA smart Gateway" bool "GARDENA smart Gateway"
depends on SOC_MT7620 depends on SOC_MT7628
select BOARD_LATE_INIT select BOARD_LATE_INIT
select SUPPORTS_BOOT_RAM select SUPPORTS_BOOT_RAM
help help
@ -32,7 +32,7 @@ config BOARD_GARDENA_SMART_GATEWAY_MT7688
config BOARD_LINKIT_SMART_7688 config BOARD_LINKIT_SMART_7688
bool "LinkIt Smart 7688" bool "LinkIt Smart 7688"
depends on SOC_MT7620 depends on SOC_MT7628
select SUPPORTS_BOOT_RAM select SUPPORTS_BOOT_RAM
help help
Seeed LinkIt Smart 7688 boards have a MT7688 SoC with 128 MiB of RAM Seeed LinkIt Smart 7688 boards have a MT7688 SoC with 128 MiB of RAM

0
arch/mips/mach-mt7620/Makefile → arch/mips/mach-mtmips/Makefile
View File

0
arch/mips/mach-mt7620/cpu.c → arch/mips/mach-mtmips/cpu.c
View File

0
arch/mips/mach-mt7620/ddr_calibrate.c → arch/mips/mach-mtmips/ddr_calibrate.c
View File

0
arch/mips/mach-mt7620/lowlevel_init.S → arch/mips/mach-mtmips/lowlevel_init.S
View File

0
arch/mips/mach-mt7620/mt76xx.h → arch/mips/mach-mtmips/mt76xx.h
View File

2
configs/gardena-smart-gateway-mt7688-ram_defconfig
View File

@ -1,7 +1,7 @@
CONFIG_MIPS=y CONFIG_MIPS=y
CONFIG_SYS_TEXT_BASE=0x80010000 CONFIG_SYS_TEXT_BASE=0x80010000
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_ARCH_MT7620=y CONFIG_ARCH_MTMIPS=y
# CONFIG_MIPS_BOOT_ENV_LEGACY is not set # CONFIG_MIPS_BOOT_ENV_LEGACY is not set
CONFIG_MIPS_BOOT_FDT=y CONFIG_MIPS_BOOT_FDT=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_ENV_VARS_UBOOT_CONFIG=y

2
configs/gardena-smart-gateway-mt7688_defconfig
View File

@ -1,7 +1,7 @@
CONFIG_MIPS=y CONFIG_MIPS=y
CONFIG_SYS_TEXT_BASE=0x9c000000 CONFIG_SYS_TEXT_BASE=0x9c000000
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_ARCH_MT7620=y CONFIG_ARCH_MTMIPS=y
CONFIG_BOOT_ROM=y CONFIG_BOOT_ROM=y
CONFIG_ONBOARD_DDR2_SIZE_1024MBIT=y CONFIG_ONBOARD_DDR2_SIZE_1024MBIT=y
CONFIG_ONBOARD_DDR2_CHIP_WIDTH_16BIT=y CONFIG_ONBOARD_DDR2_CHIP_WIDTH_16BIT=y

2
configs/linkit-smart-7688-ram_defconfig
View File

@ -1,7 +1,7 @@
CONFIG_MIPS=y CONFIG_MIPS=y
CONFIG_SYS_TEXT_BASE=0x80010000 CONFIG_SYS_TEXT_BASE=0x80010000
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_ARCH_MT7620=y CONFIG_ARCH_MTMIPS=y
CONFIG_BOARD_LINKIT_SMART_7688=y CONFIG_BOARD_LINKIT_SMART_7688=y
# CONFIG_MIPS_BOOT_ENV_LEGACY is not set # CONFIG_MIPS_BOOT_ENV_LEGACY is not set
CONFIG_MIPS_BOOT_FDT=y CONFIG_MIPS_BOOT_FDT=y

2
configs/linkit-smart-7688_defconfig
View File

@ -1,7 +1,7 @@
CONFIG_MIPS=y CONFIG_MIPS=y
CONFIG_SYS_TEXT_BASE=0x9c000000 CONFIG_SYS_TEXT_BASE=0x9c000000
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_ARCH_MT7620=y CONFIG_ARCH_MTMIPS=y
CONFIG_BOARD_LINKIT_SMART_7688=y CONFIG_BOARD_LINKIT_SMART_7688=y
CONFIG_BOOT_ROM=y CONFIG_BOOT_ROM=y
CONFIG_ONBOARD_DDR2_SIZE_1024MBIT=y CONFIG_ONBOARD_DDR2_SIZE_1024MBIT=y

2
drivers/gpio/Kconfig
View File

@ -351,7 +351,7 @@ config MPC8XXX_GPIO
config MT7621_GPIO config MT7621_GPIO
bool "MediaTek MT7621 GPIO driver" bool "MediaTek MT7621 GPIO driver"
depends on DM_GPIO && ARCH_MT7620 depends on DM_GPIO && SOC_MT7628
default y default y
help help
Say yes here to support MediaTek MT7621 compatible GPIOs. Say yes here to support MediaTek MT7621 compatible GPIOs.

2
drivers/net/Kconfig
View File

@ -269,7 +269,7 @@ config MACB_ZYNQ
config MT7628_ETH config MT7628_ETH
bool "MediaTek MT7628 Ethernet Interface" bool "MediaTek MT7628 Ethernet Interface"
depends on ARCH_MT7620 depends on SOC_MT7628
help help
The MediaTek MT7628 ethernet interface is used on MT7628 and The MediaTek MT7628 ethernet interface is used on MT7628 and
MT7688 based boards. MT7688 based boards.

2
drivers/spi/Kconfig
View File

@ -133,7 +133,7 @@ config MPC8XX_SPI
config MT7621_SPI config MT7621_SPI
bool "MediaTek MT7621 SPI driver" bool "MediaTek MT7621 SPI driver"
depends on ARCH_MT7620 depends on SOC_MT7628
help help
Enable the MT7621 SPI driver. This driver can be used to access Enable the MT7621 SPI driver. This driver can be used to access
the SPI NOR flash on platforms embedding this Ralink / MediaTek the SPI NOR flash on platforms embedding this Ralink / MediaTek

2
drivers/watchdog/Kconfig
View File

@ -143,7 +143,7 @@ config WDT_AT91
config WDT_MT7621 config WDT_MT7621
bool "MediaTek MT7621 watchdog timer support" bool "MediaTek MT7621 watchdog timer support"
depends on WDT && ARCH_MT7620 depends on WDT && SOC_MT7628
help help
Select this to enable Ralink / Mediatek watchdog timer, Select this to enable Ralink / Mediatek watchdog timer,
which can be found on some MediaTek chips. which can be found on some MediaTek chips.