diff options
author | Tom Rini <trini@konsulko.com> | 2020-05-27 10:56:25 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-05-27 10:56:25 -0400 |
commit | ab80137cc436e977ef91a154372ae5aeae3f4fb0 (patch) | |
tree | 5787d169fc0ba7a7d1cc87530938ef526f85dc9e /board | |
parent | 0d6a3e23225ad8c8e302044f8f720f657edda4f7 (diff) | |
parent | df9ebbe17ea13de4c443849ecf23cba545dd0395 (diff) | |
download | u-boot-ab80137cc436e977ef91a154372ae5aeae3f4fb0.zip u-boot-ab80137cc436e977ef91a154372ae5aeae3f4fb0.tar.gz u-boot-ab80137cc436e977ef91a154372ae5aeae3f4fb0.tar.bz2 |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Fix SPI boot on ds414 (Ezra)
- Fix PHY mode definition on armada-3720-uDPU (Jakov)
- Convert CRS305-1G-4S to generic version (Luka)
Diffstat (limited to 'board')
-rw-r--r-- | board/mikrotik/crs305-1g-4s/MAINTAINERS | 7 | ||||
-rw-r--r-- | board/mikrotik/crs3xx-98dx3236/.gitignore (renamed from board/mikrotik/crs305-1g-4s/.gitignore) | 0 | ||||
-rw-r--r-- | board/mikrotik/crs3xx-98dx3236/MAINTAINERS | 11 | ||||
-rw-r--r-- | board/mikrotik/crs3xx-98dx3236/Makefile (renamed from board/mikrotik/crs305-1g-4s/Makefile) | 2 | ||||
-rw-r--r-- | board/mikrotik/crs3xx-98dx3236/README (renamed from board/mikrotik/crs305-1g-4s/README) | 12 | ||||
-rw-r--r-- | board/mikrotik/crs3xx-98dx3236/binary.0 (renamed from board/mikrotik/crs305-1g-4s/binary.0) | 0 | ||||
-rw-r--r-- | board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c (renamed from board/mikrotik/crs305-1g-4s/crs305-1g-4s.c) | 0 | ||||
-rw-r--r-- | board/mikrotik/crs3xx-98dx3236/kwbimage.cfg.in (renamed from board/mikrotik/crs305-1g-4s/kwbimage.cfg.in) | 2 |
8 files changed, 19 insertions, 15 deletions
diff --git a/board/mikrotik/crs305-1g-4s/MAINTAINERS b/board/mikrotik/crs305-1g-4s/MAINTAINERS deleted file mode 100644 index 3823489..0000000 --- a/board/mikrotik/crs305-1g-4s/MAINTAINERS +++ /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/crs305-1g-4s/.gitignore b/board/mikrotik/crs3xx-98dx3236/.gitignore index 775b934..775b934 100644 --- a/board/mikrotik/crs305-1g-4s/.gitignore +++ b/board/mikrotik/crs3xx-98dx3236/.gitignore diff --git a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS new file mode 100644 index 0000000..127e0ea --- /dev/null +++ b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS @@ -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 diff --git a/board/mikrotik/crs305-1g-4s/Makefile b/board/mikrotik/crs3xx-98dx3236/Makefile index c03f534..0b2930d 100644 --- a/board/mikrotik/crs305-1g-4s/Makefile +++ b/board/mikrotik/crs3xx-98dx3236/Makefile @@ -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 $@ diff --git a/board/mikrotik/crs305-1g-4s/README b/board/mikrotik/crs3xx-98dx3236/README index f420aab..952f774 100644 --- a/board/mikrotik/crs305-1g-4s/README +++ b/board/mikrotik/crs3xx-98dx3236/README @@ -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 ================ diff --git a/board/mikrotik/crs305-1g-4s/binary.0 b/board/mikrotik/crs3xx-98dx3236/binary.0 index 8dd6872..8dd6872 100644 --- a/board/mikrotik/crs305-1g-4s/binary.0 +++ b/board/mikrotik/crs3xx-98dx3236/binary.0 diff --git a/board/mikrotik/crs305-1g-4s/crs305-1g-4s.c b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c index 8b419ef..8b419ef 100644 --- a/board/mikrotik/crs305-1g-4s/crs305-1g-4s.c +++ b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c diff --git a/board/mikrotik/crs305-1g-4s/kwbimage.cfg.in b/board/mikrotik/crs3xx-98dx3236/kwbimage.cfg.in index 2dbbbd0..9a58b33 100644 --- a/board/mikrotik/crs305-1g-4s/kwbimage.cfg.in +++ b/board/mikrotik/crs3xx-98dx3236/kwbimage.cfg.in @@ -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 |