[PATCH v3 02/15] mips: mtmips: add two reference boards for mt7621

Weijie Gao weijie.gao at mediatek.com
Fri Apr 29 09:51:00 CEST 2022 

On Fri, 2022-04-29 at 08:20 +0200, Stefan Roese wrote:
> On 4/28/22 12:37, Weijie Gao wrote:
> > The mt7621_rfb board supports integrated giga PHYs plus one
> > external
> > giga PHYs. It also has up to 512MiB DDR3, 16MB SPI-NOR, 3 mini PCI-
> > e x1
> > slots, SDXC and USB.
> > 
> > The mt7621_nand_rfb board is almost the same as mt7621_rfb board,
> > but it
> > uses NAND flash and SDXC is not available.
> > 
> > Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
> > Signed-off-by: Weijie Gao <weijie.gao at mediatek.com>
> > ---
> > v3 changes: none
> > v2 changes:
> >    Add config file for mt7621-rfb boards
> > ---
> >   arch/mips/dts/Makefile                     |  2 +
> >   arch/mips/dts/mediatek,mt7621-nand-rfb.dts | 52 +++++++++++++++
> >   arch/mips/dts/mediatek,mt7621-rfb.dts      | 68
> > ++++++++++++++++++++
> >   arch/mips/mach-mtmips/mt7621/Kconfig       | 20 ++++++
> >   board/mediatek/mt7621/MAINTAINERS          |  9 +++
> >   board/mediatek/mt7621/Makefile             |  3 +
> >   board/mediatek/mt7621/board.c              |  6 ++
> >   configs/mt7621_nand_rfb_ramboot_defconfig  | 72
> > +++++++++++++++++++++
> >   configs/mt7621_rfb_ramboot_defconfig       | 75
> > ++++++++++++++++++++++
> >   include/configs/mt7621-rfb.h               | 18 ++++++
> >   10 files changed, 325 insertions(+)
> >   create mode 100644 arch/mips/dts/mediatek,mt7621-nand-rfb.dts
> >   create mode 100644 arch/mips/dts/mediatek,mt7621-rfb.dts
> >   create mode 100644 board/mediatek/mt7621/MAINTAINERS
> >   create mode 100644 board/mediatek/mt7621/Makefile
> >   create mode 100644 board/mediatek/mt7621/board.c
> >   create mode 100644 configs/mt7621_nand_rfb_ramboot_defconfig
> >   create mode 100644 configs/mt7621_rfb_ramboot_defconfig
> >   create mode 100644 include/configs/mt7621-rfb.h
> > 
> > diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile
> > index 95144b24dc..1b179116c9 100644
> > --- a/arch/mips/dts/Makefile
> > +++ b/arch/mips/dts/Makefile
> > @@ -16,6 +16,8 @@ dtb-$(CONFIG_BOARD_COMTREND_WAP5813N) +=
> > comtrend,wap-5813n.dtb
> >   dtb-$(CONFIG_BOARD_HUAWEI_HG556A) += huawei,hg556a.dtb
> >   dtb-$(CONFIG_BOARD_MT7620_RFB) += mediatek,mt7620-rfb.dtb
> >   dtb-$(CONFIG_BOARD_MT7620_MT7530_RFB) += mediatek,mt7620-mt7530-
> > rfb.dtb
> > +dtb-$(CONFIG_BOARD_MT7621_RFB) += mediatek,mt7621-rfb.dtb
> > +dtb-$(CONFIG_BOARD_MT7621_NAND_RFB) += mediatek,mt7621-nand-
> > rfb.dtb
> >   dtb-$(CONFIG_BOARD_MT7628_RFB) += mediatek,mt7628-rfb.dtb
> >   dtb-$(CONFIG_BOARD_GARDENA_SMART_GATEWAY_MT7688) += gardena-
> > smart-gateway-mt7688.dtb
> >   dtb-$(CONFIG_BOARD_LINKIT_SMART_7688) += linkit-smart-7688.dtb
> > diff --git a/arch/mips/dts/mediatek,mt7621-nand-rfb.dts
> > b/arch/mips/dts/mediatek,mt7621-nand-rfb.dts
> > new file mode 100644
> > index 0000000000..80870fe3f3
> > --- /dev/null
> > +++ b/arch/mips/dts/mediatek,mt7621-nand-rfb.dts
> > @@ -0,0 +1,52 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Copyright (C) 2021 MediaTek Inc. All rights reserved.
> > + *
> > + * Author: Weijie Gao <weijie.gao at mediatek.com>
> > + */
> > +
> > +/dts-v1/;
> > +
> > +#include "mt7621.dtsi"
> > +
> > +/ {
> > +	compatible = "mediatek,mt7621-nand-rfb", "mediatek,mt7621-
> > soc";
> > +	model = "MediaTek MT7621 RFB (NAND)";
> > +
> > +	aliases {
> > +		serial0 = &uart0;
> > +	};
> > +
> > +	chosen {
> > +		stdout-path = &uart0;
> > +	};
> > +};
> > +
> > +&pinctrl {
> > +	state_default: pin_state {
> > +		nand {
> > +			groups = "spi", "sdxc";
> > +			function = "nand";
> > +		};
> > +	};
> > +};
> > +
> > +&uart0 {
> > +	status = "okay";
> > +};
> > +
> > +&gpio {
> > +	status = "okay";
> > +};
> > +
> > +&eth {
> > +	status = "okay";
> > +};
> > +
> > +&ssusb {
> > +	status = "okay";
> > +};
> > +
> > +&u3phy {
> > +	status = "okay";
> > +};
> > diff --git a/arch/mips/dts/mediatek,mt7621-rfb.dts
> > b/arch/mips/dts/mediatek,mt7621-rfb.dts
> > new file mode 100644
> > index 0000000000..c8561548f5
> > --- /dev/null
> > +++ b/arch/mips/dts/mediatek,mt7621-rfb.dts
> > @@ -0,0 +1,68 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Copyright (C) 2021 MediaTek Inc. All rights reserved.
> > + *
> > + * Author: Weijie Gao <weijie.gao at mediatek.com>
> > + */
> > +
> > +/dts-v1/;
> > +
> > +#include "mt7621.dtsi"
> > +
> > +/ {
> > +	compatible = "mediatek,mt7621-rfb", "mediatek,mt7621-soc";
> > +	model = "MediaTek MT7621 RFB (SPI-NOR)";
> > +
> > +	aliases {
> > +		serial0 = &uart0;
> > +		spi0 = &spi;
> > +	};
> > +
> > +	chosen {
> > +		stdout-path = &uart0;
> > +	};
> > +};
> > +
> > +&pinctrl {
> > +	state_default: pin_state {
> > +	};
> > +};
> > +
> > +&uart0 {
> > +	status = "okay";
> > +};
> > +
> > +&gpio {
> > +	status = "okay";
> > +};
> > +
> > +&spi {
> > +	status = "okay";
> > +	num-cs = <2>;
> > +
> > +	spi-flash at 0 {
> > +		#address-cells = <1>;
> > +		#size-cells = <1>;
> > +		compatible = "jedec,spi-nor";
> > +		spi-max-frequency = <25000000>;
> > +		reg = <0>;
> > +	};
> > +};
> > +
> > +&eth {
> > +	status = "okay";
> > +};
> > +
> > +&mmc {
> > +	cap-sd-highspeed;
> > +
> > +	status = "okay";
> > +};
> > +
> > +&ssusb {
> > +	status = "okay";
> > +};
> > +
> > +&u3phy {
> > +	status = "okay";
> > +};
> > diff --git a/arch/mips/mach-mtmips/mt7621/Kconfig b/arch/mips/mach-
> > mtmips/mt7621/Kconfig
> > index 6948bee31b..add1f4154b 100644
> > --- a/arch/mips/mach-mtmips/mt7621/Kconfig
> > +++ b/arch/mips/mach-mtmips/mt7621/Kconfig
> > @@ -7,6 +7,26 @@ config DEBUG_UART_BOARD_INIT
> >   choice
> >   	prompt "Board select"
> >   
> > +config BOARD_MT7621_RFB
> > +	bool "MediaTek MT7621 RFB (SPI-NOR)"
> > +	help
> > +	  The reference design of MT7621A (WS3010) booting from
> > SPI-NOR flash.
> > +	  The board can be configured with DDR2 (64MiB~256MiB) or
> > DDR3
> > +	  (128MiB~512MiB). The board has 16 MiB SPI-NOR flash,
> > built-in MT7530
> > +	  GbE switch, 1 UART, 1 USB 2.0 host, 1 USB 3.0 host, 1
> > SDXC, 3 PCIe
> > +	  sockets, 1 RGMII to external GbE PHY, 2 audio jacks
> > (in/out),
> > +	  JTAG pins and expansion GPIO pins.
> > +
> > +config BOARD_MT7621_NAND_RFB
> > +	bool "MediaTek MT7621 RFB (NAND)"
> > +	help
> > +	  The reference design of MT7621A (WS3010) booting from
> > NAND flash.
> > +	  The board can be configured with DDR2 (64MiB~256MiB) or
> > DDR3
> > +	  (128MiB~512MiB). The board has 128 MiB parallel NAND
> > flash, built-in
> > +	  MT7530 GbE switch, 1 UART, 1 USB 2.0 host, 1 USB 3.0
> > host, 3 PCIe
> > +	  sockets, 1 RGMII to external GbE PHY, 2 audio jacks
> > (in/out),
> > +	  JTAG pins and expansion GPIO pins.
> > +
> >   endchoice
> >   
> >   config SYS_CONFIG_NAME
> > diff --git a/board/mediatek/mt7621/MAINTAINERS
> > b/board/mediatek/mt7621/MAINTAINERS
> > new file mode 100644
> > index 0000000000..add653b931
> > --- /dev/null
> > +++ b/board/mediatek/mt7621/MAINTAINERS
> > @@ -0,0 +1,9 @@
> > +MT7621_RFB BOARD
> > +M:	Weijie Gao <weijie.gao at mediatek.com>
> > +S:	Maintained
> > +F:	board/mediatek/mt7621
> > +F:	configs/mt7621_rfb_ramboot_defconfig
> > +F:	configs/mt7621_nand_rfb_ramboot_defconfig
> > +F:	arch/mips/dts/mediatek,mt7621-rfb.dts
> > +F:	arch/mips/dts/mediatek,mt7621-nand-rfb.dts
> > +F:	include/configs/mt7621-rfb.h
> > diff --git a/board/mediatek/mt7621/Makefile
> > b/board/mediatek/mt7621/Makefile
> > new file mode 100644
> > index 0000000000..db129c5aba
> > --- /dev/null
> > +++ b/board/mediatek/mt7621/Makefile
> > @@ -0,0 +1,3 @@
> > +# SPDX-License-Identifier: GPL-2.0
> > +
> > +obj-y += board.o
> > diff --git a/board/mediatek/mt7621/board.c
> > b/board/mediatek/mt7621/board.c
> > new file mode 100644
> > index 0000000000..119b8fc9e5
> > --- /dev/null
> > +++ b/board/mediatek/mt7621/board.c
> > @@ -0,0 +1,6 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Copyright (C) 2020 MediaTek Inc. All Rights Reserved.
> > + *
> > + * Author: Weijie Gao <weijie.gao at mediatek.com>
> > + */
> > diff --git a/configs/mt7621_nand_rfb_ramboot_defconfig
> > b/configs/mt7621_nand_rfb_ramboot_defconfig
> > new file mode 100644
> > index 0000000000..f5088ca629
> > --- /dev/null
> > +++ b/configs/mt7621_nand_rfb_ramboot_defconfig
> > @@ -0,0 +1,72 @@
> > +CONFIG_MIPS=y
> > +CONFIG_SYS_CONFIG_NAME="mt7621-rfb"
> > +CONFIG_NR_DRAM_BANKS=1
> > +CONFIG_ENV_SIZE=0x1000
> > +CONFIG_SYS_MALLOC_LEN=0x100000
> > +CONFIG_DEFAULT_DEVICE_TREE="mediatek,mt7621-nand-rfb"
> > +CONFIG_DEBUG_UART_BASE=0xbe000c00
> > +CONFIG_DEBUG_UART_CLOCK=50000000
> > +CONFIG_ARCH_MTMIPS=y
> > +CONFIG_SOC_MT7621=y
> > +CONFIG_BOARD_MT7621_NAND_RFB=y
> > +# CONFIG_MIPS_CACHE_SETUP is not set
> > +# CONFIG_MIPS_CACHE_DISABLE is not set
> > +CONFIG_RESTORE_EXCEPTION_VECTOR_BASE=y
> > +CONFIG_SPL_INIT_STACK_WITHOUT_MALLOC_F=y
> > +CONFIG_MIPS_BOOT_FDT=y
> > +CONFIG_DEBUG_UART=y
> > +CONFIG_SYS_LOAD_ADDR=0x83000000
> > +CONFIG_FIT=y
> > +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
> > +CONFIG_SYS_CONSOLE_INFO_QUIET=y
> > +# CONFIG_BOOTM_NETBSD is not set
> > +# CONFIG_BOOTM_PLAN9 is not set
> > +# CONFIG_BOOTM_RTEMS is not set
> > +# CONFIG_BOOTM_VXWORKS is not set
> > +# CONFIG_CMD_ELF is not set
> > +# CONFIG_CMD_XIMG is not set
> > +# CONFIG_CMD_CRC32 is not set
> > +# CONFIG_CMD_DM is not set
> > +# CONFIG_CMD_FLASH is not set
> > +CONFIG_CMD_GPIO=y
> > +# CONFIG_CMD_LOADS is not set
> > +CONFIG_CMD_MMC=y
> > +CONFIG_CMD_MTD=y
> > +CONFIG_CMD_PART=y
> > +# CONFIG_CMD_PINMUX is not set
> > +CONFIG_CMD_USB=y
> > +# CONFIG_CMD_NFS is not set
> > +CONFIG_CMD_FAT=y
> > +CONFIG_CMD_FS_GENERIC=y
> > +# CONFIG_ISO_PARTITION is not set
> > +CONFIG_EFI_PARTITION=y
> > +CONFIG_PARTITION_TYPE_GUID=y
> > +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> > +CONFIG_NET_RANDOM_ETHADDR=y
> > +# CONFIG_I2C is not set
> > +# CONFIG_INPUT is not set
> > +CONFIG_MMC=y
> > +# CONFIG_MMC_QUIRKS is not set
> > +# CONFIG_MMC_HW_PARTITIONING is not set
> > +CONFIG_MMC_MTK=y
> > +CONFIG_MTD=y
> > +CONFIG_DM_MTD=y
> > +CONFIG_MTD_RAW_NAND=y
> > +CONFIG_NAND_MT7621=y
> > +CONFIG_SYS_NAND_ONFI_DETECTION=y
> > +CONFIG_MEDIATEK_ETH=y
> > +CONFIG_PHY=y
> > +CONFIG_PHY_MTK_TPHY=y
> > +CONFIG_SPECIFY_CONSOLE_INDEX=y
> > +CONFIG_DEBUG_UART_SHIFT=2
> > +CONFIG_SYSRESET=y
> > +CONFIG_SYSRESET_RESETCTL=y
> > +CONFIG_USB=y
> > +CONFIG_USB_XHCI_HCD=y
> > +CONFIG_USB_XHCI_MTK=y
> > +CONFIG_USB_STORAGE=y
> > +CONFIG_WDT=y
> > +CONFIG_WDT_MT7621=y
> > +CONFIG_FAT_WRITE=y
> > +CONFIG_LZMA=y
> > +CONFIG_SPL_LZMA=y
> > diff --git a/configs/mt7621_rfb_ramboot_defconfig
> > b/configs/mt7621_rfb_ramboot_defconfig
> > new file mode 100644
> > index 0000000000..6f6bb52c9e
> > --- /dev/null
> > +++ b/configs/mt7621_rfb_ramboot_defconfig
> > @@ -0,0 +1,75 @@
> > +CONFIG_MIPS=y
> > +CONFIG_SYS_CONFIG_NAME="mt7621-rfb"
> > +CONFIG_NR_DRAM_BANKS=1
> > +CONFIG_ENV_SIZE=0x1000
> > +CONFIG_SYS_MALLOC_LEN=0x100000
> > +CONFIG_DEFAULT_DEVICE_TREE="mediatek,mt7621-rfb"
> > +CONFIG_DEBUG_UART_BASE=0xbe000c00
> > +CONFIG_DEBUG_UART_CLOCK=50000000
> > +CONFIG_ARCH_MTMIPS=y
> > +CONFIG_SOC_MT7621=y
> > +# CONFIG_MIPS_CACHE_SETUP is not set
> > +# CONFIG_MIPS_CACHE_DISABLE is not set
> > +CONFIG_RESTORE_EXCEPTION_VECTOR_BASE=y
> > +CONFIG_SPL_INIT_STACK_WITHOUT_MALLOC_F=y
> > +CONFIG_MIPS_BOOT_FDT=y
> > +CONFIG_DEBUG_UART=y
> > +CONFIG_SYS_LOAD_ADDR=0x83000000
> > +CONFIG_FIT=y
> > +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
> > +CONFIG_SYS_CONSOLE_INFO_QUIET=y
> > +# CONFIG_BOOTM_NETBSD is not set
> > +# CONFIG_BOOTM_PLAN9 is not set
> > +# CONFIG_BOOTM_RTEMS is not set
> > +# CONFIG_BOOTM_VXWORKS is not set
> > +# CONFIG_CMD_ELF is not set
> > +# CONFIG_CMD_XIMG is not set
> > +# CONFIG_CMD_CRC32 is not set
> > +# CONFIG_CMD_DM is not set
> > +CONFIG_CMD_GPIO=y
> > +# CONFIG_CMD_LOADS is not set
> > +CONFIG_CMD_MMC=y
> > +CONFIG_CMD_PART=y
> > +# CONFIG_CMD_PINMUX is not set
> > +CONFIG_CMD_SPI=y
> > +CONFIG_CMD_USB=y
> > +# CONFIG_CMD_NFS is not set
> > +CONFIG_CMD_FAT=y
> > +CONFIG_CMD_FS_GENERIC=y
> > +# CONFIG_ISO_PARTITION is not set
> > +CONFIG_EFI_PARTITION=y
> > +CONFIG_PARTITION_TYPE_GUID=y
> > +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> > +CONFIG_NET_RANDOM_ETHADDR=y
> > +# CONFIG_I2C is not set
> > +# CONFIG_INPUT is not set
> > +CONFIG_MMC=y
> > +# CONFIG_MMC_QUIRKS is not set
> > +# CONFIG_MMC_HW_PARTITIONING is not set
> > +CONFIG_MMC_MTK=y
> > +CONFIG_SPI_FLASH_EON=y
> > +CONFIG_SPI_FLASH_GIGADEVICE=y
> > +CONFIG_SPI_FLASH_ISSI=y
> > +CONFIG_SPI_FLASH_MACRONIX=y
> > +CONFIG_SPI_FLASH_SPANSION=y
> > +CONFIG_SPI_FLASH_STMICRO=y
> > +CONFIG_SPI_FLASH_WINBOND=y
> > +CONFIG_SPI_FLASH_XMC=y
> > +CONFIG_MEDIATEK_ETH=y
> > +CONFIG_PHY=y
> > +CONFIG_PHY_MTK_TPHY=y
> > +CONFIG_SPECIFY_CONSOLE_INDEX=y
> > +CONFIG_DEBUG_UART_SHIFT=2
> > +CONFIG_SPI=y
> > +CONFIG_MT7621_SPI=y
> > +CONFIG_SYSRESET=y
> > +CONFIG_SYSRESET_RESETCTL=y
> > +CONFIG_USB=y
> > +CONFIG_USB_XHCI_HCD=y
> > +CONFIG_USB_XHCI_MTK=y
> > +CONFIG_USB_STORAGE=y
> > +CONFIG_WDT=y
> > +CONFIG_WDT_MT7621=y
> > +CONFIG_FAT_WRITE=y
> > +CONFIG_LZMA=y
> > +CONFIG_SPL_LZMA=y
> > diff --git a/include/configs/mt7621-rfb.h b/include/configs/mt7621-
> > rfb.h
> > new file mode 100644
> > index 0000000000..2287cb1103
> > --- /dev/null
> > +++ b/include/configs/mt7621-rfb.h
> > @@ -0,0 +1,18 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> > +/*
> > + * Copyright (C) 2021 MediaTek Inc. All Rights Reserved.
> > + *
> > + * Author: Weijie Gao <weijie.gao at mediatek.com>
> > + */
> > +
> > +#ifndef __CONFIG_MT7621_RFB_H
> > +#define __CONFIG_MT7621_RFB_H
> > +
> > +#include "mt7621.h"
> > +
> > +/* Network */
> > +#define CONFIG_IPADDR			192.168.1.1
> > +#define CONFIG_SERVERIP			192.168.1.2
> > +#define CONFIG_NETMASK			255.255.255.0
> 
> Do you really need this? It's in general not recommended to add some
> hardcoded values here (anymore).
OK. I'll remove this file and use mt7621.h instead.
> 
> BTW: You might also want to update the copyright line to 2022.
I'll update it for all new files.
> 
> Other than this:
> 
> Reviewed-by: Stefan Roese <sr at denx.de>
> 
> Thanks,
> Stefan

More information about the U-Boot mailing list