mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 15:14:43 +00:00
arm: mvebu: Add CRS326-24G-2S board
MikroTik CRS326-24G-2S 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>
This commit is contained in:
Luka Kovacic
Stefan Roese
parent
a263df59be
commit
d4cc179fcd
8 changed files with 302 additions and 0 deletions
|
|
@ -220,6 +220,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
|
|||
armada-8040-mcbin.dtb \
|
||||
armada-xp-crs305-1g-4s.dtb \
|
||||
armada-xp-crs305-1g-4s-bit.dtb \
|
||||
armada-xp-crs326-24g-2s.dtb \
|
||||
armada-xp-crs326-24g-2s-bit.dtb \
|
||||
armada-xp-db-xc3-24g4xg.dtb \
|
||||
armada-xp-gp.dtb \
|
||||
armada-xp-maxbcm.dtb \
|
||||
|
|
|
|||
43
arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts
Normal file
43
arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
/*
|
||||
* Device Tree file for MikroTik CRS326-24G-2S+ Bit board
|
||||
*
|
||||
* Copyright (C) 2020 Sartura Ltd.
|
||||
* Author: Luka Kovacic <luka.kovacic@sartura.hr>
|
||||
*/
|
||||
|
||||
#include "armada-xp-crs326-24g-2s.dtsi"
|
||||
|
||||
/ {
|
||||
model = "MikroTik CRS326-24G-2S+ 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";
|
||||
};
|
||||
};
|
||||
};
|
||||
13
arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi
Normal file
13
arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi
Normal file
|
|
@ -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;
|
||||
};
|
||||
};
|
||||
17
arch/arm/dts/armada-xp-crs326-24g-2s.dts
Normal file
17
arch/arm/dts/armada-xp-crs326-24g-2s.dts
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
/*
|
||||
* Device Tree file for MikroTik CRS326-24G-2S+ board
|
||||
*
|
||||
* Copyright (C) 2020 Sartura Ltd.
|
||||
* Author: Luka Kovacic <luka.kovacic@sartura.hr>
|
||||
*/
|
||||
|
||||
#include "armada-xp-crs326-24g-2s.dtsi"
|
||||
|
||||
/ {
|
||||
model = "MikroTik CRS326-24G-2S+";
|
||||
};
|
||||
|
||||
&spi0 {
|
||||
status = "okay";
|
||||
};
|
||||
110
arch/arm/dts/armada-xp-crs326-24g-2s.dtsi
Normal file
110
arch/arm/dts/armada-xp-crs326-24g-2s.dtsi
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
/*
|
||||
* Device Tree file for CRS326-24G-2S 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-crs326-24g-2s-u-boot.dtsi"
|
||||
|
||||
/ {
|
||||
model = "CRS326-24G-2S+";
|
||||
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";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -12,3 +12,12 @@ F: configs/crs305-1g-4s_defconfig
|
|||
F: configs/crs305-1g-4s-bit_defconfig
|
||||
F: arch/arm/dts/armada-xp-crs305-1g-4s.dts
|
||||
F: arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts
|
||||
|
||||
CRS326-24G-2S BOARD
|
||||
M: Luka Kovacic <luka.kovacic@sartura.hr>
|
||||
M: Luka Perkov <luka.perkov@sartura.hr>
|
||||
S: Maintained
|
||||
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
|
||||
|
|
|
|||
54
configs/crs326-24g-2s-bit_defconfig
Normal file
54
configs/crs326-24g-2s-bit_defconfig
Normal file
|
|
@ -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-crs326-24g-2s-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
|
||||
54
configs/crs326-24g-2s_defconfig
Normal file
54
configs/crs326-24g-2s_defconfig
Normal file
|
|
@ -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-crs326-24g-2s"
|
||||
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
|
||||
Loading…
Reference in a new issue