arm: mvebu: Convert CRS305-1G-4S board to CRS3xx-98DX3236
authorLuka Kovacic <luka.kovacic@sartura.hr>
Tue, 26 May 2020 18:17:50 +0000 (20:17 +0200)
committerStefan Roese <sr@denx.de>
Wed, 27 May 2020 05:03:17 +0000 (07:03 +0200)
Convert the CRS305-1G-4S board to CRS3xx-98DX3236 to enable easier
implementation of new CRS3xx series boards, based on Marvell Prestera
98DX3236.

Signed-off-by: Luka Kovacic <luka.kovacic@sartura.hr>
Reviewed-by: Stefan Roese <sr@denx.de>
Cc: Luka Perkov <luka.perkov@sartura.hr>
Cc: Jakov Petrina <jakov.petrina@sartura.hr>
13 files changed:
arch/arm/dts/armada-xp-crs305-1g-4s.dts
arch/arm/dts/armada-xp-crs305-1g-4s.dtsi [new file with mode: 0644]
arch/arm/mach-mvebu/Kconfig
board/mikrotik/crs305-1g-4s/MAINTAINERS [deleted file]
board/mikrotik/crs3xx-98dx3236/.gitignore [moved from board/mikrotik/crs305-1g-4s/.gitignore with 100% similarity]
board/mikrotik/crs3xx-98dx3236/MAINTAINERS [new file with mode: 0644]
board/mikrotik/crs3xx-98dx3236/Makefile [moved from board/mikrotik/crs305-1g-4s/Makefile with 93% similarity]
board/mikrotik/crs3xx-98dx3236/README [moved from board/mikrotik/crs305-1g-4s/README with 64% similarity]
board/mikrotik/crs3xx-98dx3236/binary.0 [moved from board/mikrotik/crs305-1g-4s/binary.0 with 100% similarity]
board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c [moved from board/mikrotik/crs305-1g-4s/crs305-1g-4s.c with 100% similarity]
board/mikrotik/crs3xx-98dx3236/kwbimage.cfg.in [moved from board/mikrotik/crs305-1g-4s/kwbimage.cfg.in with 75% similarity]
configs/crs305-1g-4s_defconfig
include/configs/crs3xx-98dx3236.h [moved from include/configs/crs305-1g-4s.h with 87% similarity]

index 1116f5c..010b83b 100644 (file)
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Device Tree file for CRS305-1G-4S board
+ * Device Tree file for MikroTik CRS305-1G-4S+ board
  *
- * Copyright (C) 2016 Allied Telesis Labs
- *
- * 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.
+ * Copyright (C) 2020 Sartura Ltd.
+ * Author: Luka Kovacic <luka.kovacic@sartura.hr>
  */
 
-/dts-v1/;
-#include "armada-xp-98dx3236.dtsi"
-#include "armada-xp-crs305-1g-4s-u-boot.dtsi"
+#include "armada-xp-crs305-1g-4s.dtsi"
 
 / {
-       model = "CRS305-1G-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";
+       model = "MikroTik CRS305-1G-4S+";
 };
 
 &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 0x00100000>;
-                       label = "u-boot";
-               };
-               partition@u-boot-env {
-                       reg = <0x00100000 0x00040000>;
-                       label = "u-boot-env";
-               };
-               partition@unused {
-                       reg = <0x00140000 0x00ec0000>;
-                       label = "unused";
-               };
-
-       };
 };
diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi b/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi
new file mode 100644 (file)
index 0000000..c8839ea
--- /dev/null
@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Device Tree file for CRS305-1G-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-crs305-1g-4s-u-boot.dtsi"
+
+/ {
+       model = "CRS305-1G-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 0x00080000>;
+                       label = "u-boot";
+               };
+               partition@u-boot-env {
+                       reg = <0x00080000 0x00010000>;
+                       label = "u-boot-env";
+               };
+               partition@firmware {
+                       reg = <0x00090000 0x00f70000>;
+                       label = "firmware";
+               };
+
+       };
+};
index 645990b..0d8e092 100644 (file)
@@ -165,8 +165,8 @@ config TARGET_DB_XC3_24G4XG
        bool "Support DB-XC3-24G4XG"
        select 98DX3336
 
-config TARGET_CRS305_1G_4S
-       bool "Support CRS305-1G-4S"
+config TARGET_CRS3XX_98DX3236
+       bool "Support CRS3XX-98DX3236"
        select 98DX3236
 
 endchoice
@@ -188,7 +188,7 @@ config SYS_BOARD
        default "a38x" if TARGET_CONTROLCENTERDC
        default "x530" if TARGET_X530
        default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG
-       default "crs305-1g-4s" if TARGET_CRS305_1G_4S
+       default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236
 
 config SYS_CONFIG_NAME
        default "clearfog" if TARGET_CLEARFOG
@@ -207,7 +207,7 @@ config SYS_CONFIG_NAME
        default "controlcenterdc" if TARGET_CONTROLCENTERDC
        default "x530" if TARGET_X530
        default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG
-       default "crs305-1g-4s" if TARGET_CRS305_1G_4S
+       default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236
 
 config SYS_VENDOR
        default "Marvell" if TARGET_DB_MV784MP_GP
@@ -225,7 +225,7 @@ config SYS_VENDOR
        default "CZ.NIC" if TARGET_TURRIS_MOX
        default "gdsys" if TARGET_CONTROLCENTERDC
        default "alliedtelesis" if TARGET_X530
-       default "mikrotik" if TARGET_CRS305_1G_4S
+       default "mikrotik" if TARGET_CRS3XX_98DX3236
 
 config SYS_SOC
        default "mvebu"
diff --git a/board/mikrotik/crs305-1g-4s/MAINTAINERS b/board/mikrotik/crs305-1g-4s/MAINTAINERS
deleted file mode 100644 (file)
index 3823489..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-CRS305-1G-4S BOARD
-M:     Luka Kovacic <me@lukakovacic.xyz>
-S:     Maintained
-F:     board/mikrotik/crs305-1g-4s/
-F:     include/configs/crs305-1g-4s.h
-F:     configs/crs305-1g-4s_defconfig
-F:     arch/arm/dts/armada-xp-crs305-1g-4s.dts
diff --git a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS
new file mode 100644 (file)
index 0000000..127e0ea
--- /dev/null
@@ -0,0 +1,11 @@
+CRS3XX-98DX3236 BOARD
+M:     Luka Kovacic <luka.kovacic@sartura.hr>
+S:     Maintained
+F:     board/mikrotik/crs3xx-98dx3236/
+F:     include/configs/crs3xx-98dx3236.h
+
+CRS305-1G-4S BOARD
+M:     Luka Kovacic <luka.kovacic@sartura.hr>
+S:     Maintained
+F:     configs/crs305-1g-4s_defconfig
+F:     arch/arm/dts/armada-xp-crs305-1g-4s.dts
similarity index 93%
rename from board/mikrotik/crs305-1g-4s/Makefile
rename to board/mikrotik/crs3xx-98dx3236/Makefile
index c03f534..0b2930d 100644 (file)
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2015 Stefan Roese <sr@denx.de>
 
-obj-y  := crs305-1g-4s.o
+obj-y  := crs3xx-98dx3236.o
 extra-y        := kwbimage.cfg
 
 quiet_cmd_sed = SED     $@
similarity index 64%
rename from board/mikrotik/crs305-1g-4s/README
rename to board/mikrotik/crs3xx-98dx3236/README
index f420aab..952f774 100644 (file)
@@ -1,13 +1,13 @@
-MikroTik CRS305-1G-4S+IN
+MikroTik CRS3XX-98DX3236
 ========================
 
-CRS305-1G-4S+IN is a 4x SFP+ switch with a Gigabit Ethernet port for management.
-Specifications:
+CRS3XX-98DX3236 is a U-Boot port that supports a series of MikroTik switches
+based on the Marvell Prestera 98DX3236 switch with an integrated CPU.
+
+Common specifications:
  - Marvell Prestera 98DX3236 switch with an integrated ARMv7 CPU
  - 512 MB DDR3 RAM
  - UART @ 115200bps
- - 4x SFP+
- - Gigabit Ethernet (AR8033)
  - 16 MB SPI flash (Winbond 25Q128JVSM)
 
 Currently supported hardware:
@@ -15,7 +15,7 @@ Currently supported hardware:
  - SPI boot, environment and load kernel
 
 Planned:
- - Gigabit Ethernet support
+ - Gigabit Ethernet support (internal CPU <-> switch fabric connection)
 
 Getting binary.0
 ================
similarity index 75%
rename from board/mikrotik/crs305-1g-4s/kwbimage.cfg.in
rename to board/mikrotik/crs3xx-98dx3236/kwbimage.cfg.in
index 2dbbbd0..9a58b33 100644 (file)
@@ -9,4 +9,4 @@ VERSION         1
 BOOT_FROM      spi
 
 # Binary Header (bin_hdr) with DDR3 training code
-BINARY board/mikrotik/crs305-1g-4s/binary.0 0000005b 00000068
+BINARY board/mikrotik/crs3xx-98dx3236/binary.0 0000005b 00000068
index 7632fc4..27043bf 100644 (file)
@@ -3,48 +3,46 @@ CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_MVEBU=y
 CONFIG_SYS_TEXT_BASE=0x00800000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_TARGET_CRS305_1G_4S=y
+CONFIG_TARGET_CRS3XX_98DX3236=y
 CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_OFFSET=0x100000
-CONFIG_ENV_SECT_SIZE=0x40000
+CONFIG_ENV_SECT_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x80000
+# CONFIG_EFI_LOADER is not set
 CONFIG_BUILD_TARGET="u-boot.kwb"
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=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_MEMTEST=y
-CONFIG_SYS_ALT_MEMTEST=y
-CONFIG_SYS_MEMTEST_START=0x00800000
-CONFIG_SYS_MEMTEST_END=0x00ffffff
 # CONFIG_CMD_FLASH is not set
-CONFIG_CMD_I2C=y
+# CONFIG_CMD_I2C is not set
 CONFIG_CMD_SPI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_TFTPPUT=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_CMD_UBI=y
+# CONFIG_CMD_UBI is not set
+CONFIG_CMD_MTD=y
+CONFIG_CMD_MTDPARTS=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs305-1g-4s"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_BLK=y
-CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MVTWSI=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_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_SST=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
similarity index 87%
rename from include/configs/crs305-1g-4s.h
rename to include/configs/crs3xx-98dx3236.h
index 617c8af..e2ba7b8 100644 (file)
@@ -3,8 +3,8 @@
  * Copyright (C) 2014 Stefan Roese <sr@denx.de>
  */
 
-#ifndef _CONFIG_CRS305_1G_4S_H
-#define _CONFIG_CRS305_1G_4S_H
+#ifndef _CONFIG_CRS3XX_98DX3236_H
+#define _CONFIG_CRS3XX_98DX3236_H
 
 /*
  * High Level Configuration Options (easy to change)
@@ -32,4 +32,4 @@
 #undef CONFIG_SYS_MAXARGS
 #define CONFIG_SYS_MAXARGS 96
 
-#endif /* _CONFIG_CRS305_1G_4S_H */
+#endif /* _CONFIG_CRS3XX_98DX3236_H */