On 7/10/23 00:47, Chris Packham wrote:
The x240 and SE240 are a series of L2+ switches from Allied Telesis. There are a number of them in the range but as far as U-Boot is concerned all the CPU block components are the same so there's only one board defined.
Signed-off-by: Chris Packham judge.packham@gmail.com
Reviewed-by: Stefan Roese sr@denx.de
Thanks, Stefan
Notes: Changes in v2: - drop CONFIG_DEBUG_UART
arch/arm/dts/Makefile | 3 +- arch/arm/dts/ac5-98dx35xx-atl-x240.dts | 212 +++++++++++++++++++++++++ arch/arm/mach-mvebu/Kconfig | 7 + board/alliedtelesis/x240/MAINTAINERS | 7 + board/alliedtelesis/x240/Makefile | 6 + board/alliedtelesis/x240/x240.c | 13 ++ configs/x240_defconfig | 86 ++++++++++ include/configs/x240.h | 37 +++++ 8 files changed, 370 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/ac5-98dx35xx-atl-x240.dts create mode 100644 board/alliedtelesis/x240/MAINTAINERS create mode 100644 board/alliedtelesis/x240/Makefile create mode 100644 board/alliedtelesis/x240/x240.c create mode 100644 configs/x240_defconfig create mode 100644 include/configs/x240.h
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 480269fa6065..38d878a0f853 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -303,7 +303,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ cn9132-db-B.dtb \ cn9130-crb-A.dtb \ cn9130-crb-B.dtb \
- ac5-98dx35xx-rd.dtb
ac5-98dx35xx-rd.dtb \
ac5-98dx35xx-atl-x240.dtb endif
dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb
diff --git a/arch/arm/dts/ac5-98dx35xx-atl-x240.dts b/arch/arm/dts/ac5-98dx35xx-atl-x240.dts new file mode 100644 index 000000000000..820ec18b4355 --- /dev/null +++ b/arch/arm/dts/ac5-98dx35xx-atl-x240.dts @@ -0,0 +1,212 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/dts-v1/;
+#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> +#include "ac5-98dx35xx.dtsi"
+/ {
- model = "Allied Telesis x240";
- compatible = "alliedtelesis,x240", "marvell,ac5x", "marvell,ac5";
- aliases {
serial0 = &uart0;spiflash0 = &spiflash0;gpio0 = &gpio0;gpio1 = &gpio1;spi0 = &spi0;i2c0 = &i2c0;usb0 = &usb0;pinctrl0 = &pinctrl0;- };
- chosen {
stdout-path = "serial0:115200n8";- };
- boot-board {
compatible = "atl,boot-board";present-gpio = <&gpio1 6 GPIO_ACTIVE_HIGH>;override-gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;- };
- gpio-leds {
compatible = "gpio-leds";fault {label = "fault:red";gpios = <&system_gpio 11 GPIO_ACTIVE_LOW>;default-state = "on";};- };
+};
+&nand {
- pinctrl-names = "default";
- pinctrl-0 = <&nand_pins>;
- nand-ecc-strength = <4>;
- nand-ecc-step-size = <512>;
- status = "okay";
- partitions {
compatible = "fixed-partitions";#address-cells = <1>;#size-cells = <1>;partition@user {reg = <0x00000000 0x10000000>;label = "user";};- };
+};
+&uart0 {
- status = "okay";
+};
+&usb0 {
- status = "okay";
+};
+&i2c0 {
- status = "okay";
- mux@71 {
#address-cells = <1>;#size-cells = <0>;compatible = "nxp,pca9546";reg = <0x71>;i2c-mux-idle-disconnect;reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; /* MPP36 */status = "okay";i2c@1 {#address-cells = <1>;#size-cells = <0>;reg = <1>;hwmon@2e {compatible = "adi,adt7476";reg = <0x2e>;};rtc@68 {compatible = "adi,max31331";reg = <0x68>;};system_gpio: gpio@27 {compatible = "nxp,pca9555";gpio-controller;#gpio-cells= <2>;reg = <0x27>;interrupt-parent = <&gpio0>;interrupts = <25 IRQ_TYPE_LEVEL_LOW>; /* MPP25 */};};- };
+};
+&spi0 {
- status = "okay";
- spiflash0: flash@0 {
compatible = "jedec,spi-nor";spi-max-frequency = <50000000>;spi-tx-bus-width = <1>; /* 1-single, 2-dual, 4-quad */spi-rx-bus-width = <1>; /* 1-single, 2-dual, 4-quad */reg = <0>;#address-cells = <1>;#size-cells = <1>;- };
+};
+&gpio0 {
- phy-reset {
gpio-hog;gpios = <19 GPIO_ACTIVE_LOW>;output-high;line-name = "phy-reset";- };
- usb-en {
gpio-hog;gpios = <28 GPIO_ACTIVE_HIGH>;output-high;line-name = "usb-en";- };
- led-oe-n {
gpio-hog;gpios = <23 GPIO_ACTIVE_LOW>;output-low;line-name = "led-oe-n";- };
+};
+&gpio1 {
- nand-protect {
gpio-hog;gpios = <8 GPIO_ACTIVE_LOW>;output-low;line-name = "nand-protect";- };
+};
+&pinctrl0 {
- /*
* MPP Bus: MPP#* NF_IO [0-7]* NF_Wen [8]* NF_ALE [9]* NF_CLE [10]* NF_Cen [11]* QSPI_SCK/SPI0_SCK [12]* QSPI_CSn/SPI0_CSn [13]* QSPI_DIO[0]/SPI0_MOSI [14]* QSPI_DIO[1]/SPI0_MISO [15]* NF_Ren [16]* NF_RBn [17]* WD_INTn [18]* B_B_OVRIDE_N [19]* GREEN_SW_N [20]* PHY_INT_N[0] [21]* SPI_WPn [22]* LED_OE_N [23]* USB_PWR_FLT_N [24]* SFP_INT_N [25]* I2C0_SCL [26]* I2C0_SDA [27]* USB_EN [28]* MONITOR_INT_N [29]* XM1_MDC [30]* XM1_MDIO [31]* UA0_RXD [32]* UA0_TXD [33]* PHY_RST0n [34]* TPM_INT_N [35]* I2CMUX_RESET_N [36]* SPI_SRAM_SEL_N [37]* B_B_PRESENT [38]* SPI_FLASH_SEL_N [39]* NF_WP_N [40]* POE_INT_N [41]* PoE_RST_N [42]* LED0_CLK [43]* LED0_STB [44]* LED0_DATA [45]*/- /* 0 1 2 3 4 5 6 7 8 9 */
- pin-func = < 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
0xff 0xff 1 1 1 1 0xff 0xff 0 00 0 0 0 0 0 1 1 0 01 1 1 1 0 0 0 0 0 00 0 0 1 1 1 >;- nand_pins: nand-pins {
marvell,pins = <0 1 2 3 4 5 6 7 8 9 10 11 16 17>;marvell,function = <2>;- };
+}; diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index ac484c73f62d..5c7f4bf964af 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -202,6 +202,10 @@ config TARGET_X530 bool "Support Allied Telesis x530" select 88F6820
+config TARGET_X240
- bool "Support Allied Telesis x240"
- select ALLEYCAT_5
- config TARGET_DB_XC3_24G4XG bool "Support DB-XC3-24G4XG" select 98DX3336
@@ -274,6 +278,7 @@ config SYS_BOARD default "theadorable" if TARGET_THEADORABLE default "a38x" if TARGET_CONTROLCENTERDC default "x530" if TARGET_X530
- default "x240" if TARGET_X240 default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236 default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5
@@ -297,6 +302,7 @@ config SYS_CONFIG_NAME default "turris_mox" if TARGET_TURRIS_MOX default "controlcenterdc" if TARGET_CONTROLCENTERDC default "x530" if TARGET_X530
- default "x240" if TARGET_X240 default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236 default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5
@@ -320,6 +326,7 @@ config SYS_VENDOR default "CZ.NIC" if TARGET_TURRIS_MOX default "gdsys" if TARGET_CONTROLCENTERDC default "alliedtelesis" if TARGET_X530
- default "alliedtelesis" if TARGET_X240 default "mikrotik" if TARGET_CRS3XX_98DX3236 default "Marvell" if TARGET_MVEBU_ALLEYCAT5
diff --git a/board/alliedtelesis/x240/MAINTAINERS b/board/alliedtelesis/x240/MAINTAINERS new file mode 100644 index 000000000000..f1f78d96167c --- /dev/null +++ b/board/alliedtelesis/x240/MAINTAINERS @@ -0,0 +1,7 @@ +X240 BOARD +M: Chris Packham chris.packham@alliedtelesis.co.nz +S: Maintained +F: board/alliedtelesis/x240/ +F: arch/arm/dts/ac5-98dx35xx-rd.dts +F: include/configs/x240.h +F: configs/x240_defconfig diff --git a/board/alliedtelesis/x240/Makefile b/board/alliedtelesis/x240/Makefile new file mode 100644 index 000000000000..7f20a47d6a76 --- /dev/null +++ b/board/alliedtelesis/x240/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2022 Allied Telesis +#
+obj-y += x240.o diff --git a/board/alliedtelesis/x240/x240.c b/board/alliedtelesis/x240/x240.c new file mode 100644 index 000000000000..0c4f8e03b859 --- /dev/null +++ b/board/alliedtelesis/x240/x240.c @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+
+#include <common.h> +#include <asm/global_data.h>
+DECLARE_GLOBAL_DATA_PTR;
+int board_init(void) +{
- gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100;
- return 0;
+} diff --git a/configs/x240_defconfig b/configs/x240_defconfig new file mode 100644 index 000000000000..6d25c5ae3fcf --- /dev/null +++ b/configs/x240_defconfig @@ -0,0 +1,86 @@ +CONFIG_ARM=y +CONFIG_ARCH_CPU_INIT=y +CONFIG_ARCH_MVEBU=y +CONFIG_TEXT_BASE=0x200000000 +CONFIG_SYS_MALLOC_LEN=0x900000 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x200FF0000 +CONFIG_TARGET_X240=y +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x00f80000 +CONFIG_ENV_SECT_SIZE=0x40000 +CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="ac5-98dx35xx-atl-x240" +CONFIG_SYS_LOAD_ADDR=0x220000000 +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_FIT=y +CONFIG_BOOTDELAY=3 +CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_MEMTEST=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MTD=y +CONFIG_CMD_PCI=y +CONFIG_CMD_SPI=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_REGULATOR=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_UBI=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_CLK=y +CONFIG_CLK_MVEBU=y +CONFIG_GPIO_HOG=y +CONFIG_DM_PCA953X=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_MVTWSI=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y +CONFIG_LED=y +CONFIG_LED_GPIO=y +CONFIG_MISC=y +# CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_MTD_RAW_NAND=y +CONFIG_NAND_PXA3XX=y +CONFIG_SYS_NAND_ONFI_DETECTION=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_ATMEL=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_SST=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_ARMADA_8K=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_RTC=y +CONFIG_RTC_MAX313XX=y +CONFIG_DM_SCSI=y +CONFIG_SYS_NS16550=y +CONFIG_MVEBU_A3700_SPI=y +CONFIG_DM_THERMAL=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_ASIX88179=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_RTL8152=y +CONFIG_USB_ETHER_SMSC95XX=y +# CONFIG_FAT_WRITE is not set diff --git a/include/configs/x240.h b/include/configs/x240.h new file mode 100644 index 000000000000..3601df588d56 --- /dev/null +++ b/include/configs/x240.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/*
- Copyright (C) 2022 Allied Telesis
- */
+#ifndef __X240_H_ +#define __X240_H_
+#include <asm/arch/soc.h>
+/* additions for new ARM relocation support */ +#define CFG_SYS_SDRAM_BASE 0x200000000
+#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
115200, 230400, 460800, 921600 }+/* Default Env vars */
+#define BOOT_TARGET_DEVICES(func) \
- func(USB, usb, 0) \
- func(DHCP, dhcp, na)
+#include <config_distro_bootcmd.h>
+#define CFG_EXTRA_ENV_SETTINGS \
- BOOTENV \
- "kernel_addr_r=0x202000000\0" \
- "fdt_addr_r=0x201000000\0" \
- "ramdisk_addr_r=0x206000000\0" \
- "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0"
+/*
- High Level Configuration Options (easy to change)
- */
+#define CFG_SYS_TCLK 325000000
+#endif /* __X240_H_ */
Viele Grüße, Stefan Roese