Message ID | 1602833717-19168-1-git-send-email-weijie.gao@mediatek.com |
---|---|
State | Superseded |
Delegated to: | Daniel Schwierzeck |
Headers | show |
Series | [01/18] mips: dts: switch to board defines for dtb for mtmips | expand |
On 16.10.20 09:35, Weijie Gao wrote: > This patch is a preparation for add a new soc fot mtmips. > > Move all mt7628 related Kconfig (boards and UART selection) into mt7628 > subdirectory and make sure the top directory of mtmips contains only > selection for SoCs. > > Signed-off-by: Weijie Gao <weijie.gao@mediatek.com> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > arch/mips/mach-mtmips/Kconfig | 53 +--------------------------- > arch/mips/mach-mtmips/mt7628/Kconfig | 53 ++++++++++++++++++++++++++++ > 2 files changed, 54 insertions(+), 52 deletions(-) > create mode 100644 arch/mips/mach-mtmips/mt7628/Kconfig > > diff --git a/arch/mips/mach-mtmips/Kconfig b/arch/mips/mach-mtmips/Kconfig > index 737de2cb8e..7c07430a0c 100644 > --- a/arch/mips/mach-mtmips/Kconfig > +++ b/arch/mips/mach-mtmips/Kconfig > @@ -58,57 +58,6 @@ config SOC_MT7628 > > endchoice > > -choice > - prompt "Board select" > - > -config BOARD_GARDENA_SMART_GATEWAY_MT7688 > - bool "GARDENA smart Gateway" > - depends on SOC_MT7628 > - select BOARD_LATE_INIT > - help > - GARDENA smart Gateway boards have a MT7688 SoC with 128 MiB of RAM > - and 8 MiB of flash (SPI NOR) and additional SPI NAND storage. > - > -config BOARD_LINKIT_SMART_7688 > - bool "LinkIt Smart 7688" > - depends on SOC_MT7628 > - help > - Seeed LinkIt Smart 7688 boards have a MT7688 SoC with 128 MiB of RAM > - and 32 MiB of flash (SPI). > - Between its different peripherals there's an integrated switch with 4 > - ethernet ports, 1 USB port, 1 UART, GPIO buttons and LEDs, and > - a MT7688 (PCIe). > - > -config BOARD_MT7628_RFB > - bool "MediaTek MT7628 RFB" > - depends on SOC_MT7628 > - help > - The reference design of MT7628. The board has 128 MiB DDR2, 8 MiB > - SPI-NOR flash, 1 built-in switch with 5 ports, 1 UART, 1 USB host, > - 1 SDXC, 1 PCIe socket and JTAG pins. > - > -config BOARD_VOCORE2 > - bool "VoCore2" > - depends on SOC_MT7628 > - select SPL_SERIAL_SUPPORT > - select SPL_UART2_SPIS_PINMUX > - help > - VoCore VoCore2 board has a MT7628 SoC with 128 MiB of RAM > - and 16 MiB of flash (SPI). > - > -endchoice > - > -config SPL_UART2_SPIS_PINMUX > - bool "Use alternative pinmux for UART2 in SPL stage" > - depends on SPL_SERIAL_SUPPORT > - default n > - help > - Select this if the UART2 of your board is connected to GPIO 16/17 > - (shared with SPIS) rather than the usual GPIO 20/21. > - > -source "board/gardena/smart-gateway-mt7688/Kconfig" > -source "board/mediatek/mt7628/Kconfig" > -source "board/seeed/linkit-smart-7688/Kconfig" > -source "board/vocore/vocore2/Kconfig" > +source "arch/mips/mach-mtmips/mt7628/Kconfig" > > endmenu > diff --git a/arch/mips/mach-mtmips/mt7628/Kconfig b/arch/mips/mach-mtmips/mt7628/Kconfig > new file mode 100644 > index 0000000000..e3f56e782e > --- /dev/null > +++ b/arch/mips/mach-mtmips/mt7628/Kconfig > @@ -0,0 +1,53 @@ > + > +if SOC_MT7628 > + > +choice > + prompt "Board select" > + > +config BOARD_GARDENA_SMART_GATEWAY_MT7688 > + bool "GARDENA smart Gateway" > + select BOARD_LATE_INIT > + help > + GARDENA smart Gateway boards have a MT7688 SoC with 128 MiB of RAM > + and 8 MiB of flash (SPI NOR) and additional SPI NAND storage. > + > +config BOARD_LINKIT_SMART_7688 > + bool "LinkIt Smart 7688" > + help > + Seeed LinkIt Smart 7688 boards have a MT7688 SoC with 128 MiB of RAM > + and 32 MiB of flash (SPI). > + Between its different peripherals there's an integrated switch with 4 > + ethernet ports, 1 USB port, 1 UART, GPIO buttons and LEDs, and > + a MT7688 (PCIe). > + > +config BOARD_MT7628_RFB > + bool "MediaTek MT7628 RFB" > + help > + The reference design of MT7628. The board has 128 MiB DDR2, 8 MiB > + SPI-NOR flash, 1 built-in switch with 5 ports, 1 UART, 1 USB host, > + 1 SDXC, 1 PCIe socket and JTAG pins. > + > +config BOARD_VOCORE2 > + bool "VoCore2" > + select SPL_SERIAL_SUPPORT > + select SPL_UART2_SPIS_PINMUX > + help > + VoCore VoCore2 board has a MT7628 SoC with 128 MiB of RAM > + and 16 MiB of flash (SPI). > + > +endchoice > + > +config SPL_UART2_SPIS_PINMUX > + bool "Use alternative pinmux for UART2 in SPL stage" > + depends on SPL_SERIAL_SUPPORT > + default n > + help > + Select this if the UART2 of your board is connected to GPIO 16/17 > + (shared with SPIS) rather than the usual GPIO 20/21. > + > +source "board/gardena/smart-gateway-mt7688/Kconfig" > +source "board/mediatek/mt7628/Kconfig" > +source "board/seeed/linkit-smart-7688/Kconfig" > +source "board/vocore/vocore2/Kconfig" > + > +endif > Viele Grüße, Stefan
diff --git a/arch/mips/mach-mtmips/Kconfig b/arch/mips/mach-mtmips/Kconfig index 737de2cb8e..7c07430a0c 100644 --- a/arch/mips/mach-mtmips/Kconfig +++ b/arch/mips/mach-mtmips/Kconfig @@ -58,57 +58,6 @@ config SOC_MT7628 endchoice -choice - prompt "Board select" - -config BOARD_GARDENA_SMART_GATEWAY_MT7688 - bool "GARDENA smart Gateway" - depends on SOC_MT7628 - select BOARD_LATE_INIT - help - GARDENA smart Gateway boards have a MT7688 SoC with 128 MiB of RAM - and 8 MiB of flash (SPI NOR) and additional SPI NAND storage. - -config BOARD_LINKIT_SMART_7688 - bool "LinkIt Smart 7688" - depends on SOC_MT7628 - help - Seeed LinkIt Smart 7688 boards have a MT7688 SoC with 128 MiB of RAM - and 32 MiB of flash (SPI). - Between its different peripherals there's an integrated switch with 4 - ethernet ports, 1 USB port, 1 UART, GPIO buttons and LEDs, and - a MT7688 (PCIe). - -config BOARD_MT7628_RFB - bool "MediaTek MT7628 RFB" - depends on SOC_MT7628 - help - The reference design of MT7628. The board has 128 MiB DDR2, 8 MiB - SPI-NOR flash, 1 built-in switch with 5 ports, 1 UART, 1 USB host, - 1 SDXC, 1 PCIe socket and JTAG pins. - -config BOARD_VOCORE2 - bool "VoCore2" - depends on SOC_MT7628 - select SPL_SERIAL_SUPPORT - select SPL_UART2_SPIS_PINMUX - help - VoCore VoCore2 board has a MT7628 SoC with 128 MiB of RAM - and 16 MiB of flash (SPI). - -endchoice - -config SPL_UART2_SPIS_PINMUX - bool "Use alternative pinmux for UART2 in SPL stage" - depends on SPL_SERIAL_SUPPORT - default n - help - Select this if the UART2 of your board is connected to GPIO 16/17 - (shared with SPIS) rather than the usual GPIO 20/21. - -source "board/gardena/smart-gateway-mt7688/Kconfig" -source "board/mediatek/mt7628/Kconfig" -source "board/seeed/linkit-smart-7688/Kconfig" -source "board/vocore/vocore2/Kconfig" +source "arch/mips/mach-mtmips/mt7628/Kconfig" endmenu diff --git a/arch/mips/mach-mtmips/mt7628/Kconfig b/arch/mips/mach-mtmips/mt7628/Kconfig new file mode 100644 index 0000000000..e3f56e782e --- /dev/null +++ b/arch/mips/mach-mtmips/mt7628/Kconfig @@ -0,0 +1,53 @@ + +if SOC_MT7628 + +choice + prompt "Board select" + +config BOARD_GARDENA_SMART_GATEWAY_MT7688 + bool "GARDENA smart Gateway" + select BOARD_LATE_INIT + help + GARDENA smart Gateway boards have a MT7688 SoC with 128 MiB of RAM + and 8 MiB of flash (SPI NOR) and additional SPI NAND storage. + +config BOARD_LINKIT_SMART_7688 + bool "LinkIt Smart 7688" + help + Seeed LinkIt Smart 7688 boards have a MT7688 SoC with 128 MiB of RAM + and 32 MiB of flash (SPI). + Between its different peripherals there's an integrated switch with 4 + ethernet ports, 1 USB port, 1 UART, GPIO buttons and LEDs, and + a MT7688 (PCIe). + +config BOARD_MT7628_RFB + bool "MediaTek MT7628 RFB" + help + The reference design of MT7628. The board has 128 MiB DDR2, 8 MiB + SPI-NOR flash, 1 built-in switch with 5 ports, 1 UART, 1 USB host, + 1 SDXC, 1 PCIe socket and JTAG pins. + +config BOARD_VOCORE2 + bool "VoCore2" + select SPL_SERIAL_SUPPORT + select SPL_UART2_SPIS_PINMUX + help + VoCore VoCore2 board has a MT7628 SoC with 128 MiB of RAM + and 16 MiB of flash (SPI). + +endchoice + +config SPL_UART2_SPIS_PINMUX + bool "Use alternative pinmux for UART2 in SPL stage" + depends on SPL_SERIAL_SUPPORT + default n + help + Select this if the UART2 of your board is connected to GPIO 16/17 + (shared with SPIS) rather than the usual GPIO 20/21. + +source "board/gardena/smart-gateway-mt7688/Kconfig" +source "board/mediatek/mt7628/Kconfig" +source "board/seeed/linkit-smart-7688/Kconfig" +source "board/vocore/vocore2/Kconfig" + +endif
This patch is a preparation for add a new soc fot mtmips. Move all mt7628 related Kconfig (boards and UART selection) into mt7628 subdirectory and make sure the top directory of mtmips contains only selection for SoCs. Signed-off-by: Weijie Gao <weijie.gao@mediatek.com> --- arch/mips/mach-mtmips/Kconfig | 53 +--------------------------- arch/mips/mach-mtmips/mt7628/Kconfig | 53 ++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 52 deletions(-) create mode 100644 arch/mips/mach-mtmips/mt7628/Kconfig