| Message ID | 20200723085640.12232-4-luka.kovacic@sartura.hr |
|---|---|
| State | Accepted |
| Commit | 537eaf4ea77efb643615cf9a7e9b33578c171e35 |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | Add support for a series of MikroTik CRS3xx switches | expand |
On 23.07.20 10:56, Luka Kovacic wrote: > MikroTik CRS328-4C-20S-4S board has a switch chip with an integrated > Marvell Prestera 98DX3236 CPU. > > This commit includes two board variants, namely the factory > default one and a Bit variant. The Bit board variant has a > bigger Macronix flash. > > Add basic U-Boot, UART and SPI flash support. > > Signed-off-by: Luka Kovacic <luka.kovacic@sartura.hr> > Cc: Luka Perkov <luka.perkov@sartura.hr> > Cc: Jakov Petrina <jakov.petrina@sartura.hr> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > arch/arm/dts/Makefile | 2 + > .../dts/armada-xp-crs328-4c-20s-4s-bit.dts | 43 +++++++ > .../armada-xp-crs328-4c-20s-4s-u-boot.dtsi | 13 +++ > arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts | 17 +++ > arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi | 110 ++++++++++++++++++ > board/mikrotik/crs3xx-98dx3236/MAINTAINERS | 9 ++ > configs/crs328-4c-20s-4s-bit_defconfig | 54 +++++++++ > configs/crs328-4c-20s-4s_defconfig | 54 +++++++++ > 8 files changed, 302 insertions(+) > create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts > create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi > create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts > create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi > create mode 100644 configs/crs328-4c-20s-4s-bit_defconfig > create mode 100644 configs/crs328-4c-20s-4s_defconfig > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 9f8ca61f28..deced1ad7d 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -216,6 +216,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ > armada-xp-crs305-1g-4s-bit.dtb \ > armada-xp-crs326-24g-2s.dtb \ > armada-xp-crs326-24g-2s-bit.dtb \ > + armada-xp-crs328-4c-20s-4s.dtb \ > + armada-xp-crs328-4c-20s-4s-bit.dtb \ > armada-xp-db-xc3-24g4xg.dtb \ > armada-xp-gp.dtb \ > armada-xp-maxbcm.dtb \ > diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts > new file mode 100644 > index 0000000000..d684c895ff > --- /dev/null > +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts > @@ -0,0 +1,43 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Device Tree file for MikroTik CRS328-4C-20S-4S+ Bit board > + * > + * Copyright (C) 2020 Sartura Ltd. > + * Author: Luka Kovacic <luka.kovacic@sartura.hr> > + */ > + > +#include "armada-xp-crs328-4c-20s-4s.dtsi" > + > +/ { > + model = "MikroTik CRS328-4C-20S-4S+ Bit"; > +}; > + > +&spi0 { > + status = "okay"; > + > + spi-flash@0 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "spi-flash", "jedec,spi-nor"; > + reg = <0>; /* Chip select 0 */ > + spi-max-frequency = <108000000>; > + m25p,fast-read; > + > + partition@u-boot { > + reg = <0x00000000 0x001f0000>; > + label = "u-boot"; > + }; > + partition@u-boot-env { > + reg = <0x001f0000 0x00010000>; > + label = "u-boot-env"; > + }; > + partition@ubi1 { > + reg = <0x00200000 0x03f00000>; > + label = "ubi1"; > + }; > + partition@ubi2 { > + reg = <0x04100000 0x03f00000>; > + label = "ubi2"; > + }; > + }; > +}; > diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi > new file mode 100644 > index 0000000000..8576a02730 > --- /dev/null > +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi > @@ -0,0 +1,13 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > + > +&uart0 { > + u-boot,dm-pre-reloc; > +}; > + > +&spi0 { > + u-boot,dm-pre-reloc; > + > + spi-flash@0 { > + u-boot,dm-pre-reloc; > + }; > +}; > diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts > new file mode 100644 > index 0000000000..665757f6e1 > --- /dev/null > +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts > @@ -0,0 +1,17 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Device Tree file for MikroTik CRS328-4C-20S-4S+ board > + * > + * Copyright (C) 2020 Sartura Ltd. > + * Author: Luka Kovacic <luka.kovacic@sartura.hr> > + */ > + > +#include "armada-xp-crs328-4c-20s-4s.dtsi" > + > +/ { > + model = "MikroTik CRS328-4C-20S-4S+"; > +}; > + > +&spi0 { > + status = "okay"; > +}; > diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi > new file mode 100644 > index 0000000000..daff1af2a2 > --- /dev/null > +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi > @@ -0,0 +1,110 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Device Tree file for CRS328-4C-20S-4S+ board > + * > + * Copyright (C) 2016 Allied Telesis Labs > + * Copyright (C) 2020 Sartura Ltd. > + * > + * Based on armada-xp-db.dts > + * > + * Note: this Device Tree assumes that the bootloader has remapped the > + * internal registers to 0xf1000000 (instead of the default > + * 0xd0000000). The 0xf1000000 is the default used by the recent, > + * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier > + * boards were delivered with an older version of the bootloader that > + * left internal registers mapped at 0xd0000000. If you are in this > + * situation, you should either update your bootloader (preferred > + * solution) or the below Device Tree should be adjusted. > + */ > + > +/dts-v1/; > +#include "armada-xp-98dx3236.dtsi" > +#include "armada-xp-crs328-4c-20s-4s-u-boot.dtsi" > + > +/ { > + model = "CRS328-4C-20S-4S+"; > + compatible = "marvell,armadaxp-98dx3236", "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp"; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + bootargs = "console=ttyS0,115200 earlyprintk"; > + }; > + > + aliases { > + spi0 = &spi0; > + }; > + > + memory { > + device_type = "memory"; > + reg = <0 0x00000000 0 0x20000000>; /* 512 MB */ > + }; > +}; > + > +&L2 { > + arm,parity-enable; > + marvell,ecc-enable; > +}; > + > +&devbus_bootcs { > + status = "okay"; > + > + /* Device Bus parameters are required */ > + > + /* Read parameters */ > + devbus,bus-width = <16>; > + devbus,turn-off-ps = <60000>; > + devbus,badr-skew-ps = <0>; > + devbus,acc-first-ps = <124000>; > + devbus,acc-next-ps = <248000>; > + devbus,rd-setup-ps = <0>; > + devbus,rd-hold-ps = <0>; > + > + /* Write parameters */ > + devbus,sync-enable = <0>; > + devbus,wr-high-ps = <60000>; > + devbus,wr-low-ps = <60000>; > + devbus,ale-wr-ps = <60000>; > +}; > + > +&uart0 { > + status = "okay"; > +}; > + > +&uart1 { > + status = "okay"; > +}; > + > +&i2c0 { > + clock-frequency = <100000>; > + status = "okay"; > +}; > + > +&usb0 { > + status = "okay"; > +}; > + > +&spi0 { > + status = "okay"; > + > + spi-flash@0 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "spi-flash", "jedec,spi-nor"; > + reg = <0>; /* Chip select 0 */ > + spi-max-frequency = <108000000>; > + m25p,fast-read; > + > + partition@u-boot { > + reg = <0x00000000 0x001f0000>; > + label = "u-boot"; > + }; > + partition@u-boot-env { > + reg = <0x001f0000 0x00010000>; > + label = "u-boot-env"; > + }; > + partition@ubi1 { > + reg = <0x00200000 0x00e00000>; > + label = "ubi1"; > + }; > + }; > +}; > diff --git a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS > index 7f01f4318e..e6fbf3db1c 100644 > --- a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS > +++ b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS > @@ -21,3 +21,12 @@ F: configs/crs326-24g-2s_defconfig > F: configs/crs326-24g-2s-bit_defconfig > F: arch/arm/dts/armada-xp-crs326-24g-2s.dts > F: arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts > + > +CRS328-4C-20S-4S BOARD > +M: Luka Kovacic <luka.kovacic@sartura.hr> > +M: Luka Perkov <luka.perkov@sartura.hr> > +S: Maintained > +F: configs/crs328-4c-20s-4s_defconfig > +F: configs/crs328-4c-20s-4s-bit_defconfig > +F: arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts > +F: arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts > diff --git a/configs/crs328-4c-20s-4s-bit_defconfig b/configs/crs328-4c-20s-4s-bit_defconfig > new file mode 100644 > index 0000000000..9b949e63da > --- /dev/null > +++ b/configs/crs328-4c-20s-4s-bit_defconfig > @@ -0,0 +1,54 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_CPU_INIT=y > +CONFIG_ARCH_MVEBU=y > +CONFIG_SYS_TEXT_BASE=0x00800000 > +CONFIG_SYS_MALLOC_F_LEN=0x2000 > +CONFIG_TARGET_CRS3XX_98DX3236=y > +CONFIG_ENV_SIZE=0x10000 > +CONFIG_ENV_SECT_SIZE=0x10000 > +CONFIG_ENV_OFFSET=0x1F0000 > +CONFIG_BOOTCOUNT_BOOTLIMIT=3 > +# CONFIG_EFI_LOADER is not set > +CONFIG_BUILD_TARGET="u-boot.kwb" > +CONFIG_USE_PREBOOT=y > +CONFIG_SYS_CONSOLE_INFO_QUIET=y > +CONFIG_HUSH_PARSER=y > +CONFIG_AUTOBOOT_KEYED=y > +CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" > +CONFIG_AUTOBOOT_STOP_STR="s" > +CONFIG_AUTOBOOT_KEYED_CTRLC=y > +CONFIG_CMD_BOOTZ=y > +# CONFIG_CMD_FLASH is not set > +# CONFIG_CMD_I2C is not set > +CONFIG_CMD_SPI=y > +CONFIG_CMD_CACHE=y > +CONFIG_CMD_UBI=y > +CONFIG_CMD_FS_GENERIC=y > +CONFIG_CMD_MTD=y > +CONFIG_CMD_MTDPARTS=y > +CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs328-4c-20s-4s-bit" > +CONFIG_ENV_IS_IN_SPI_FLASH=y > +CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_BLK=y > +CONFIG_BOOTCOUNT_LIMIT=y > +CONFIG_BOOTCOUNT_ENV=y > +# CONFIG_DM_I2C is not set > +# CONFIG_SYS_I2C_MVTWSI is not set > +# CONFIG_MMC is not set > +CONFIG_MTD=y > +CONFIG_MTD_PARTITIONS=y > +CONFIG_DM_MTD=y > +CONFIG_DM_SPI_FLASH=y > +CONFIG_SPI_FLASH_MTD=y > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_BAR=y > +CONFIG_SPI_FLASH_MACRONIX=y > +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set > +CONFIG_FIT=y > +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y > +CONFIG_FIT_VERBOSE=y > +CONFIG_FIT_BEST_MATCH=y > +CONFIG_PCI=y > +CONFIG_PCI_MVEBU=y > +CONFIG_SYS_NS16550=y > +CONFIG_KIRKWOOD_SPI=y > diff --git a/configs/crs328-4c-20s-4s_defconfig b/configs/crs328-4c-20s-4s_defconfig > new file mode 100644 > index 0000000000..33eefbd475 > --- /dev/null > +++ b/configs/crs328-4c-20s-4s_defconfig > @@ -0,0 +1,54 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_CPU_INIT=y > +CONFIG_ARCH_MVEBU=y > +CONFIG_SYS_TEXT_BASE=0x00800000 > +CONFIG_SYS_MALLOC_F_LEN=0x2000 > +CONFIG_TARGET_CRS3XX_98DX3236=y > +CONFIG_ENV_SIZE=0x10000 > +CONFIG_ENV_SECT_SIZE=0x10000 > +CONFIG_ENV_OFFSET=0x1F0000 > +CONFIG_BOOTCOUNT_BOOTLIMIT=3 > +# CONFIG_EFI_LOADER is not set > +CONFIG_BUILD_TARGET="u-boot.kwb" > +CONFIG_USE_PREBOOT=y > +CONFIG_SYS_CONSOLE_INFO_QUIET=y > +CONFIG_HUSH_PARSER=y > +CONFIG_AUTOBOOT_KEYED=y > +CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" > +CONFIG_AUTOBOOT_STOP_STR="s" > +CONFIG_AUTOBOOT_KEYED_CTRLC=y > +CONFIG_CMD_BOOTZ=y > +# CONFIG_CMD_FLASH is not set > +# CONFIG_CMD_I2C is not set > +CONFIG_CMD_SPI=y > +CONFIG_CMD_CACHE=y > +CONFIG_CMD_UBI=y > +CONFIG_CMD_FS_GENERIC=y > +CONFIG_CMD_MTD=y > +CONFIG_CMD_MTDPARTS=y > +CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs328-4c-20s-4s" > +CONFIG_ENV_IS_IN_SPI_FLASH=y > +CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_BLK=y > +CONFIG_BOOTCOUNT_LIMIT=y > +CONFIG_BOOTCOUNT_ENV=y > +# CONFIG_DM_I2C is not set > +# CONFIG_SYS_I2C_MVTWSI is not set > +# CONFIG_MMC is not set > +CONFIG_MTD=y > +CONFIG_MTD_PARTITIONS=y > +CONFIG_DM_MTD=y > +CONFIG_DM_SPI_FLASH=y > +CONFIG_SPI_FLASH_MTD=y > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_BAR=y > +CONFIG_SPI_FLASH_WINBOND=y > +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set > +CONFIG_FIT=y > +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y > +CONFIG_FIT_VERBOSE=y > +CONFIG_FIT_BEST_MATCH=y > +CONFIG_PCI=y > +CONFIG_PCI_MVEBU=y > +CONFIG_SYS_NS16550=y > +CONFIG_KIRKWOOD_SPI=y > Viele Grüße, Stefan
On 06.08.20 14:08, Stefan Roese wrote: > On 23.07.20 10:56, Luka Kovacic wrote: >> MikroTik CRS328-4C-20S-4S board has a switch chip with an integrated >> Marvell Prestera 98DX3236 CPU. >> >> This commit includes two board variants, namely the factory >> default one and a Bit variant. The Bit board variant has a >> bigger Macronix flash. >> >> Add basic U-Boot, UART and SPI flash support. >> >> Signed-off-by: Luka Kovacic <luka.kovacic@sartura.hr> >> Cc: Luka Perkov <luka.perkov@sartura.hr> >> Cc: Jakov Petrina <jakov.petrina@sartura.hr> > > Reviewed-by: Stefan Roese <sr@denx.de> Applied to u-boot-marvell/master Thanks, Stefan > Thanks, > Stefan > >> --- >> arch/arm/dts/Makefile | 2 + >> .../dts/armada-xp-crs328-4c-20s-4s-bit.dts | 43 +++++++ >> .../armada-xp-crs328-4c-20s-4s-u-boot.dtsi | 13 +++ >> arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts | 17 +++ >> arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi | 110 ++++++++++++++++++ >> board/mikrotik/crs3xx-98dx3236/MAINTAINERS | 9 ++ >> configs/crs328-4c-20s-4s-bit_defconfig | 54 +++++++++ >> configs/crs328-4c-20s-4s_defconfig | 54 +++++++++ >> 8 files changed, 302 insertions(+) >> create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts >> create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi >> create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts >> create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi >> create mode 100644 configs/crs328-4c-20s-4s-bit_defconfig >> create mode 100644 configs/crs328-4c-20s-4s_defconfig >> >> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile >> index 9f8ca61f28..deced1ad7d 100644 >> --- a/arch/arm/dts/Makefile >> +++ b/arch/arm/dts/Makefile >> @@ -216,6 +216,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ >> armada-xp-crs305-1g-4s-bit.dtb \ >> armada-xp-crs326-24g-2s.dtb \ >> armada-xp-crs326-24g-2s-bit.dtb \ >> + armada-xp-crs328-4c-20s-4s.dtb \ >> + armada-xp-crs328-4c-20s-4s-bit.dtb \ >> armada-xp-db-xc3-24g4xg.dtb \ >> armada-xp-gp.dtb \ >> armada-xp-maxbcm.dtb \ >> diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts >> b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts >> new file mode 100644 >> index 0000000000..d684c895ff >> --- /dev/null >> +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts >> @@ -0,0 +1,43 @@ >> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) >> +/* >> + * Device Tree file for MikroTik CRS328-4C-20S-4S+ Bit board >> + * >> + * Copyright (C) 2020 Sartura Ltd. >> + * Author: Luka Kovacic <luka.kovacic@sartura.hr> >> + */ >> + >> +#include "armada-xp-crs328-4c-20s-4s.dtsi" >> + >> +/ { >> + model = "MikroTik CRS328-4C-20S-4S+ Bit"; >> +}; >> + >> +&spi0 { >> + status = "okay"; >> + >> + spi-flash@0 { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + compatible = "spi-flash", "jedec,spi-nor"; >> + reg = <0>; /* Chip select 0 */ >> + spi-max-frequency = <108000000>; >> + m25p,fast-read; >> + >> + partition@u-boot { >> + reg = <0x00000000 0x001f0000>; >> + label = "u-boot"; >> + }; >> + partition@u-boot-env { >> + reg = <0x001f0000 0x00010000>; >> + label = "u-boot-env"; >> + }; >> + partition@ubi1 { >> + reg = <0x00200000 0x03f00000>; >> + label = "ubi1"; >> + }; >> + partition@ubi2 { >> + reg = <0x04100000 0x03f00000>; >> + label = "ubi2"; >> + }; >> + }; >> +}; >> diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi >> b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi >> new file mode 100644 >> index 0000000000..8576a02730 >> --- /dev/null >> +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi >> @@ -0,0 +1,13 @@ >> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) >> + >> +&uart0 { >> + u-boot,dm-pre-reloc; >> +}; >> + >> +&spi0 { >> + u-boot,dm-pre-reloc; >> + >> + spi-flash@0 { >> + u-boot,dm-pre-reloc; >> + }; >> +}; >> diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts >> b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts >> new file mode 100644 >> index 0000000000..665757f6e1 >> --- /dev/null >> +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts >> @@ -0,0 +1,17 @@ >> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) >> +/* >> + * Device Tree file for MikroTik CRS328-4C-20S-4S+ board >> + * >> + * Copyright (C) 2020 Sartura Ltd. >> + * Author: Luka Kovacic <luka.kovacic@sartura.hr> >> + */ >> + >> +#include "armada-xp-crs328-4c-20s-4s.dtsi" >> + >> +/ { >> + model = "MikroTik CRS328-4C-20S-4S+"; >> +}; >> + >> +&spi0 { >> + status = "okay"; >> +}; >> diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi >> b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi >> new file mode 100644 >> index 0000000000..daff1af2a2 >> --- /dev/null >> +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi >> @@ -0,0 +1,110 @@ >> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) >> +/* >> + * Device Tree file for CRS328-4C-20S-4S+ board >> + * >> + * Copyright (C) 2016 Allied Telesis Labs >> + * Copyright (C) 2020 Sartura Ltd. >> + * >> + * Based on armada-xp-db.dts >> + * >> + * Note: this Device Tree assumes that the bootloader has remapped the >> + * internal registers to 0xf1000000 (instead of the default >> + * 0xd0000000). The 0xf1000000 is the default used by the recent, >> + * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier >> + * boards were delivered with an older version of the bootloader that >> + * left internal registers mapped at 0xd0000000. If you are in this >> + * situation, you should either update your bootloader (preferred >> + * solution) or the below Device Tree should be adjusted. >> + */ >> + >> +/dts-v1/; >> +#include "armada-xp-98dx3236.dtsi" >> +#include "armada-xp-crs328-4c-20s-4s-u-boot.dtsi" >> + >> +/ { >> + model = "CRS328-4C-20S-4S+"; >> + compatible = "marvell,armadaxp-98dx3236", >> "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp"; >> + >> + chosen { >> + stdout-path = "serial0:115200n8"; >> + bootargs = "console=ttyS0,115200 earlyprintk"; >> + }; >> + >> + aliases { >> + spi0 = &spi0; >> + }; >> + >> + memory { >> + device_type = "memory"; >> + reg = <0 0x00000000 0 0x20000000>; /* 512 MB */ >> + }; >> +}; >> + >> +&L2 { >> + arm,parity-enable; >> + marvell,ecc-enable; >> +}; >> + >> +&devbus_bootcs { >> + status = "okay"; >> + >> + /* Device Bus parameters are required */ >> + >> + /* Read parameters */ >> + devbus,bus-width = <16>; >> + devbus,turn-off-ps = <60000>; >> + devbus,badr-skew-ps = <0>; >> + devbus,acc-first-ps = <124000>; >> + devbus,acc-next-ps = <248000>; >> + devbus,rd-setup-ps = <0>; >> + devbus,rd-hold-ps = <0>; >> + >> + /* Write parameters */ >> + devbus,sync-enable = <0>; >> + devbus,wr-high-ps = <60000>; >> + devbus,wr-low-ps = <60000>; >> + devbus,ale-wr-ps = <60000>; >> +}; >> + >> +&uart0 { >> + status = "okay"; >> +}; >> + >> +&uart1 { >> + status = "okay"; >> +}; >> + >> +&i2c0 { >> + clock-frequency = <100000>; >> + status = "okay"; >> +}; >> + >> +&usb0 { >> + status = "okay"; >> +}; >> + >> +&spi0 { >> + status = "okay"; >> + >> + spi-flash@0 { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + compatible = "spi-flash", "jedec,spi-nor"; >> + reg = <0>; /* Chip select 0 */ >> + spi-max-frequency = <108000000>; >> + m25p,fast-read; >> + >> + partition@u-boot { >> + reg = <0x00000000 0x001f0000>; >> + label = "u-boot"; >> + }; >> + partition@u-boot-env { >> + reg = <0x001f0000 0x00010000>; >> + label = "u-boot-env"; >> + }; >> + partition@ubi1 { >> + reg = <0x00200000 0x00e00000>; >> + label = "ubi1"; >> + }; >> + }; >> +}; >> diff --git a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS >> b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS >> index 7f01f4318e..e6fbf3db1c 100644 >> --- a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS >> +++ b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS >> @@ -21,3 +21,12 @@ F: configs/crs326-24g-2s_defconfig >> F: configs/crs326-24g-2s-bit_defconfig >> F: arch/arm/dts/armada-xp-crs326-24g-2s.dts >> F: arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts >> + >> +CRS328-4C-20S-4S BOARD >> +M: Luka Kovacic <luka.kovacic@sartura.hr> >> +M: Luka Perkov <luka.perkov@sartura.hr> >> +S: Maintained >> +F: configs/crs328-4c-20s-4s_defconfig >> +F: configs/crs328-4c-20s-4s-bit_defconfig >> +F: arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts >> +F: arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts >> diff --git a/configs/crs328-4c-20s-4s-bit_defconfig >> b/configs/crs328-4c-20s-4s-bit_defconfig >> new file mode 100644 >> index 0000000000..9b949e63da >> --- /dev/null >> +++ b/configs/crs328-4c-20s-4s-bit_defconfig >> @@ -0,0 +1,54 @@ >> +CONFIG_ARM=y >> +CONFIG_ARCH_CPU_INIT=y >> +CONFIG_ARCH_MVEBU=y >> +CONFIG_SYS_TEXT_BASE=0x00800000 >> +CONFIG_SYS_MALLOC_F_LEN=0x2000 >> +CONFIG_TARGET_CRS3XX_98DX3236=y >> +CONFIG_ENV_SIZE=0x10000 >> +CONFIG_ENV_SECT_SIZE=0x10000 >> +CONFIG_ENV_OFFSET=0x1F0000 >> +CONFIG_BOOTCOUNT_BOOTLIMIT=3 >> +# CONFIG_EFI_LOADER is not set >> +CONFIG_BUILD_TARGET="u-boot.kwb" >> +CONFIG_USE_PREBOOT=y >> +CONFIG_SYS_CONSOLE_INFO_QUIET=y >> +CONFIG_HUSH_PARSER=y >> +CONFIG_AUTOBOOT_KEYED=y >> +CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" >> +CONFIG_AUTOBOOT_STOP_STR="s" >> +CONFIG_AUTOBOOT_KEYED_CTRLC=y >> +CONFIG_CMD_BOOTZ=y >> +# CONFIG_CMD_FLASH is not set >> +# CONFIG_CMD_I2C is not set >> +CONFIG_CMD_SPI=y >> +CONFIG_CMD_CACHE=y >> +CONFIG_CMD_UBI=y >> +CONFIG_CMD_FS_GENERIC=y >> +CONFIG_CMD_MTD=y >> +CONFIG_CMD_MTDPARTS=y >> +CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs328-4c-20s-4s-bit" >> +CONFIG_ENV_IS_IN_SPI_FLASH=y >> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y >> +CONFIG_BLK=y >> +CONFIG_BOOTCOUNT_LIMIT=y >> +CONFIG_BOOTCOUNT_ENV=y >> +# CONFIG_DM_I2C is not set >> +# CONFIG_SYS_I2C_MVTWSI is not set >> +# CONFIG_MMC is not set >> +CONFIG_MTD=y >> +CONFIG_MTD_PARTITIONS=y >> +CONFIG_DM_MTD=y >> +CONFIG_DM_SPI_FLASH=y >> +CONFIG_SPI_FLASH_MTD=y >> +CONFIG_SPI_FLASH_SFDP_SUPPORT=y >> +CONFIG_SPI_FLASH_BAR=y >> +CONFIG_SPI_FLASH_MACRONIX=y >> +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set >> +CONFIG_FIT=y >> +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y >> +CONFIG_FIT_VERBOSE=y >> +CONFIG_FIT_BEST_MATCH=y >> +CONFIG_PCI=y >> +CONFIG_PCI_MVEBU=y >> +CONFIG_SYS_NS16550=y >> +CONFIG_KIRKWOOD_SPI=y >> diff --git a/configs/crs328-4c-20s-4s_defconfig >> b/configs/crs328-4c-20s-4s_defconfig >> new file mode 100644 >> index 0000000000..33eefbd475 >> --- /dev/null >> +++ b/configs/crs328-4c-20s-4s_defconfig >> @@ -0,0 +1,54 @@ >> +CONFIG_ARM=y >> +CONFIG_ARCH_CPU_INIT=y >> +CONFIG_ARCH_MVEBU=y >> +CONFIG_SYS_TEXT_BASE=0x00800000 >> +CONFIG_SYS_MALLOC_F_LEN=0x2000 >> +CONFIG_TARGET_CRS3XX_98DX3236=y >> +CONFIG_ENV_SIZE=0x10000 >> +CONFIG_ENV_SECT_SIZE=0x10000 >> +CONFIG_ENV_OFFSET=0x1F0000 >> +CONFIG_BOOTCOUNT_BOOTLIMIT=3 >> +# CONFIG_EFI_LOADER is not set >> +CONFIG_BUILD_TARGET="u-boot.kwb" >> +CONFIG_USE_PREBOOT=y >> +CONFIG_SYS_CONSOLE_INFO_QUIET=y >> +CONFIG_HUSH_PARSER=y >> +CONFIG_AUTOBOOT_KEYED=y >> +CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" >> +CONFIG_AUTOBOOT_STOP_STR="s" >> +CONFIG_AUTOBOOT_KEYED_CTRLC=y >> +CONFIG_CMD_BOOTZ=y >> +# CONFIG_CMD_FLASH is not set >> +# CONFIG_CMD_I2C is not set >> +CONFIG_CMD_SPI=y >> +CONFIG_CMD_CACHE=y >> +CONFIG_CMD_UBI=y >> +CONFIG_CMD_FS_GENERIC=y >> +CONFIG_CMD_MTD=y >> +CONFIG_CMD_MTDPARTS=y >> +CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs328-4c-20s-4s" >> +CONFIG_ENV_IS_IN_SPI_FLASH=y >> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y >> +CONFIG_BLK=y >> +CONFIG_BOOTCOUNT_LIMIT=y >> +CONFIG_BOOTCOUNT_ENV=y >> +# CONFIG_DM_I2C is not set >> +# CONFIG_SYS_I2C_MVTWSI is not set >> +# CONFIG_MMC is not set >> +CONFIG_MTD=y >> +CONFIG_MTD_PARTITIONS=y >> +CONFIG_DM_MTD=y >> +CONFIG_DM_SPI_FLASH=y >> +CONFIG_SPI_FLASH_MTD=y >> +CONFIG_SPI_FLASH_SFDP_SUPPORT=y >> +CONFIG_SPI_FLASH_BAR=y >> +CONFIG_SPI_FLASH_WINBOND=y >> +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set >> +CONFIG_FIT=y >> +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y >> +CONFIG_FIT_VERBOSE=y >> +CONFIG_FIT_BEST_MATCH=y >> +CONFIG_PCI=y >> +CONFIG_PCI_MVEBU=y >> +CONFIG_SYS_NS16550=y >> +CONFIG_KIRKWOOD_SPI=y >> > > > Viele Grüße, > Stefan > Viele Grüße, Stefan
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 9f8ca61f28..deced1ad7d 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -216,6 +216,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-xp-crs305-1g-4s-bit.dtb \ armada-xp-crs326-24g-2s.dtb \ armada-xp-crs326-24g-2s-bit.dtb \ + armada-xp-crs328-4c-20s-4s.dtb \ + armada-xp-crs328-4c-20s-4s-bit.dtb \ armada-xp-db-xc3-24g4xg.dtb \ armada-xp-gp.dtb \ armada-xp-maxbcm.dtb \ diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts new file mode 100644 index 0000000000..d684c895ff --- /dev/null +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree file for MikroTik CRS328-4C-20S-4S+ Bit board + * + * Copyright (C) 2020 Sartura Ltd. + * Author: Luka Kovacic <luka.kovacic@sartura.hr> + */ + +#include "armada-xp-crs328-4c-20s-4s.dtsi" + +/ { + model = "MikroTik CRS328-4C-20S-4S+ Bit"; +}; + +&spi0 { + status = "okay"; + + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash", "jedec,spi-nor"; + reg = <0>; /* Chip select 0 */ + spi-max-frequency = <108000000>; + m25p,fast-read; + + partition@u-boot { + reg = <0x00000000 0x001f0000>; + label = "u-boot"; + }; + partition@u-boot-env { + reg = <0x001f0000 0x00010000>; + label = "u-boot-env"; + }; + partition@ubi1 { + reg = <0x00200000 0x03f00000>; + label = "ubi1"; + }; + partition@ubi2 { + reg = <0x04100000 0x03f00000>; + label = "ubi2"; + }; + }; +}; diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi new file mode 100644 index 0000000000..8576a02730 --- /dev/null +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +&uart0 { + u-boot,dm-pre-reloc; +}; + +&spi0 { + u-boot,dm-pre-reloc; + + spi-flash@0 { + u-boot,dm-pre-reloc; + }; +}; diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts new file mode 100644 index 0000000000..665757f6e1 --- /dev/null +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree file for MikroTik CRS328-4C-20S-4S+ board + * + * Copyright (C) 2020 Sartura Ltd. + * Author: Luka Kovacic <luka.kovacic@sartura.hr> + */ + +#include "armada-xp-crs328-4c-20s-4s.dtsi" + +/ { + model = "MikroTik CRS328-4C-20S-4S+"; +}; + +&spi0 { + status = "okay"; +}; diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi new file mode 100644 index 0000000000..daff1af2a2 --- /dev/null +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi @@ -0,0 +1,110 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree file for CRS328-4C-20S-4S+ board + * + * Copyright (C) 2016 Allied Telesis Labs + * Copyright (C) 2020 Sartura Ltd. + * + * Based on armada-xp-db.dts + * + * Note: this Device Tree assumes that the bootloader has remapped the + * internal registers to 0xf1000000 (instead of the default + * 0xd0000000). The 0xf1000000 is the default used by the recent, + * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier + * boards were delivered with an older version of the bootloader that + * left internal registers mapped at 0xd0000000. If you are in this + * situation, you should either update your bootloader (preferred + * solution) or the below Device Tree should be adjusted. + */ + +/dts-v1/; +#include "armada-xp-98dx3236.dtsi" +#include "armada-xp-crs328-4c-20s-4s-u-boot.dtsi" + +/ { + model = "CRS328-4C-20S-4S+"; + compatible = "marvell,armadaxp-98dx3236", "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp"; + + chosen { + stdout-path = "serial0:115200n8"; + bootargs = "console=ttyS0,115200 earlyprintk"; + }; + + aliases { + spi0 = &spi0; + }; + + memory { + device_type = "memory"; + reg = <0 0x00000000 0 0x20000000>; /* 512 MB */ + }; +}; + +&L2 { + arm,parity-enable; + marvell,ecc-enable; +}; + +&devbus_bootcs { + status = "okay"; + + /* Device Bus parameters are required */ + + /* Read parameters */ + devbus,bus-width = <16>; + devbus,turn-off-ps = <60000>; + devbus,badr-skew-ps = <0>; + devbus,acc-first-ps = <124000>; + devbus,acc-next-ps = <248000>; + devbus,rd-setup-ps = <0>; + devbus,rd-hold-ps = <0>; + + /* Write parameters */ + devbus,sync-enable = <0>; + devbus,wr-high-ps = <60000>; + devbus,wr-low-ps = <60000>; + devbus,ale-wr-ps = <60000>; +}; + +&uart0 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&i2c0 { + clock-frequency = <100000>; + status = "okay"; +}; + +&usb0 { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash", "jedec,spi-nor"; + reg = <0>; /* Chip select 0 */ + spi-max-frequency = <108000000>; + m25p,fast-read; + + partition@u-boot { + reg = <0x00000000 0x001f0000>; + label = "u-boot"; + }; + partition@u-boot-env { + reg = <0x001f0000 0x00010000>; + label = "u-boot-env"; + }; + partition@ubi1 { + reg = <0x00200000 0x00e00000>; + label = "ubi1"; + }; + }; +}; diff --git a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS index 7f01f4318e..e6fbf3db1c 100644 --- a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS +++ b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS @@ -21,3 +21,12 @@ F: configs/crs326-24g-2s_defconfig F: configs/crs326-24g-2s-bit_defconfig F: arch/arm/dts/armada-xp-crs326-24g-2s.dts F: arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts + +CRS328-4C-20S-4S BOARD +M: Luka Kovacic <luka.kovacic@sartura.hr> +M: Luka Perkov <luka.perkov@sartura.hr> +S: Maintained +F: configs/crs328-4c-20s-4s_defconfig +F: configs/crs328-4c-20s-4s-bit_defconfig +F: arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts +F: arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts diff --git a/configs/crs328-4c-20s-4s-bit_defconfig b/configs/crs328-4c-20s-4s-bit_defconfig new file mode 100644 index 0000000000..9b949e63da --- /dev/null +++ b/configs/crs328-4c-20s-4s-bit_defconfig @@ -0,0 +1,54 @@ +CONFIG_ARM=y +CONFIG_ARCH_CPU_INIT=y +CONFIG_ARCH_MVEBU=y +CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_CRS3XX_98DX3236=y +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x1F0000 +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +# CONFIG_EFI_LOADER is not set +CONFIG_BUILD_TARGET="u-boot.kwb" +CONFIG_USE_PREBOOT=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" +CONFIG_AUTOBOOT_STOP_STR="s" +CONFIG_AUTOBOOT_KEYED_CTRLC=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_I2C is not set +CONFIG_CMD_SPI=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_UBI=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_MTDPARTS=y +CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs328-4c-20s-4s-bit" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_BLK=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y +# CONFIG_DM_I2C is not set +# CONFIG_SYS_I2C_MVTWSI is not set +# CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_MACRONIX=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_FIT=y +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y +CONFIG_FIT_VERBOSE=y +CONFIG_FIT_BEST_MATCH=y +CONFIG_PCI=y +CONFIG_PCI_MVEBU=y +CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y diff --git a/configs/crs328-4c-20s-4s_defconfig b/configs/crs328-4c-20s-4s_defconfig new file mode 100644 index 0000000000..33eefbd475 --- /dev/null +++ b/configs/crs328-4c-20s-4s_defconfig @@ -0,0 +1,54 @@ +CONFIG_ARM=y +CONFIG_ARCH_CPU_INIT=y +CONFIG_ARCH_MVEBU=y +CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_CRS3XX_98DX3236=y +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x1F0000 +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +# CONFIG_EFI_LOADER is not set +CONFIG_BUILD_TARGET="u-boot.kwb" +CONFIG_USE_PREBOOT=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" +CONFIG_AUTOBOOT_STOP_STR="s" +CONFIG_AUTOBOOT_KEYED_CTRLC=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_I2C is not set +CONFIG_CMD_SPI=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_UBI=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_MTDPARTS=y +CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs328-4c-20s-4s" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_BLK=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y +# CONFIG_DM_I2C is not set +# CONFIG_SYS_I2C_MVTWSI is not set +# CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_WINBOND=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_FIT=y +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y +CONFIG_FIT_VERBOSE=y +CONFIG_FIT_BEST_MATCH=y +CONFIG_PCI=y +CONFIG_PCI_MVEBU=y +CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y
MikroTik CRS328-4C-20S-4S board has a switch chip with an integrated Marvell Prestera 98DX3236 CPU. This commit includes two board variants, namely the factory default one and a Bit variant. The Bit board variant has a bigger Macronix flash. Add basic U-Boot, UART and SPI flash support. Signed-off-by: Luka Kovacic <luka.kovacic@sartura.hr> Cc: Luka Perkov <luka.perkov@sartura.hr> Cc: Jakov Petrina <jakov.petrina@sartura.hr> --- arch/arm/dts/Makefile | 2 + .../dts/armada-xp-crs328-4c-20s-4s-bit.dts | 43 +++++++ .../armada-xp-crs328-4c-20s-4s-u-boot.dtsi | 13 +++ arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts | 17 +++ arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi | 110 ++++++++++++++++++ board/mikrotik/crs3xx-98dx3236/MAINTAINERS | 9 ++ configs/crs328-4c-20s-4s-bit_defconfig | 54 +++++++++ configs/crs328-4c-20s-4s_defconfig | 54 +++++++++ 8 files changed, 302 insertions(+) create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi create mode 100644 configs/crs328-4c-20s-4s-bit_defconfig create mode 100644 configs/crs328-4c-20s-4s_defconfig