Skip to contentSkip to conversation

ARM: kirkwood: add db-88f6281-bp board

PATCH New Chris Packham 2 participants 4 messages Apr 13, 2019 – Apr 26, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/2 ARM: kirkwood: add db-88f6281-bp board

This is Marvell's Kirkwood development board. It has the following features

- 512M DDR2
- 2 PCI connectors
- 1 x1 PCI-e interface
- 1 Gigabit Ethernet Port
- 2 SATA Ports
- USB 2.0 Interface
- SDIO
- 128M NAND Flash
- 16M SPI Flash

It can be strapped to boot from SPI or NAND so there are two defconfigs (one per boot media).

---

Changes in v4:
- Correctly handle external build output directories
- Add entries to arch/arm/dts/Makefile

Changes in v3:
- incorporate review feedback (except for DM_SERIAL) from Stefan

 arch/arm/dts/Makefile                       |   2 +
 arch/arm/dts/kirkwood-db-88f6281-spi.dts    |  48 +++++++++
 arch/arm/dts/kirkwood-db-88f6281.dts        |  26 +++++
 arch/arm/dts/kirkwood-db.dtsi               |  94 ++++++++++++++++++
 arch/arm/mach-kirkwood/Kconfig              |   4 +
 board/Marvell/db-88f6281-bp/.gitignore      |   1 +
 board/Marvell/db-88f6281-bp/Kconfig         |  12 +++
 board/Marvell/db-88f6281-bp/MAINTAINERS     |  10 ++
 board/Marvell/db-88f6281-bp/Makefile        |  12 +++
 board/Marvell/db-88f6281-bp/db-88f6281-bp.c | 103 ++++++++++++++++++++
 board/Marvell/db-88f6281-bp/kwbimage.cfg.in |  36 +++++++
 configs/db-88f6281-bp-nand_defconfig        |  53 ++++++++++
 configs/db-88f6281-bp-spi_defconfig         |  55 +++++++++++
 include/configs/db-88f6281-bp.h             |  99 +++++++++++++++++++
 14 files changed, 555 insertions(+)
 create mode 100644 arch/arm/dts/kirkwood-db-88f6281-spi.dts
 create mode 100644 arch/arm/dts/kirkwood-db-88f6281.dts
 create mode 100644 arch/arm/dts/kirkwood-db.dtsi
 create mode 100644 board/Marvell/db-88f6281-bp/.gitignore
 create mode 100644 board/Marvell/db-88f6281-bp/Kconfig
 create mode 100644 board/Marvell/db-88f6281-bp/MAINTAINERS
 create mode 100644 board/Marvell/db-88f6281-bp/Makefile
 create mode 100644 board/Marvell/db-88f6281-bp/db-88f6281-bp.c
 create mode 100644 board/Marvell/db-88f6281-bp/kwbimage.cfg.in
 create mode 100644 configs/db-88f6281-bp-nand_defconfig
 create mode 100644 configs/db-88f6281-bp-spi_defconfig
 create mode 100644 include/configs/db-88f6281-bp.h
arch/arm/dts/Makefile +2 -0
index 8167cdb4e856..b2842580152c 100644
@@ -37,6 +37,8 @@ dtb-$(CONFIG_KIRKWOOD) += \
 	kirkwood-atl-sbx81lifxcat.dtb \
 	kirkwood-blackarmor-nas220.dtb \
 	kirkwood-d2net.dtb \
+	kirkwood-db-88f6281.dtb \
+	kirkwood-db-88f6281-spi.dtb \
 	kirkwood-dns325.dtb \
 	kirkwood-dockstar.dtb \
 	kirkwood-dreamplug.dtb \
arch/arm/dts/kirkwood-db-88f6281-spi.dts new file +48 -0

48 lines not on this page · raw message

arch/arm/dts/kirkwood-db-88f6281.dts new file +26 -0
new file mode 100644
index 000000000000..2adb17c955aa
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Marvell DB-88F6281-BP Development Board Setup
+ *
+ * Saeed Bishara <[email protected]>
+ * Thomas Petazzoni <[email protected]>
+ *
+ */
+
+/dts-v1/;
+
+#include "kirkwood-db.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+	model = "Marvell DB-88F6281-BP Development Board";
+	compatible = "marvell,db-88f6281-bp", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+};
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+	status = "okay";
+};
arch/arm/dts/kirkwood-db.dtsi new file +94 -0

94 lines not on this page · raw message

arch/arm/mach-kirkwood/Kconfig +4 -0
index 3b860c4f55fe..7c4170399afb 100644
@@ -65,6 +65,9 @@ config TARGET_SBx81LIFKW
 config TARGET_SBx81LIFXCAT
 	bool "Allied Telesis SBx81GP24/SBx81GT24"
 
+config TARGET_DB_88F6281_BP
+	bool "Marvell DB-88F6281-BP"
+
 endchoice
 
 config SYS_SOC
@@ -89,5 +92,6 @@ source "board/Seagate/nas220/Kconfig"
 source "board/zyxel/nsa310s/Kconfig"
 source "board/alliedtelesis/SBx81LIFKW/Kconfig"
 source "board/alliedtelesis/SBx81LIFXCAT/Kconfig"
+source "board/Marvell/db-88f6281-bp/Kconfig"
 
 endif
board/Marvell/db-88f6281-bp/.gitignore new file +1 -0
new file mode 100644
index 000000000000..775b9346b859
@@ -0,0 +1 @@
+kwbimage.cfg
board/Marvell/db-88f6281-bp/Kconfig new file +12 -0
new file mode 100644
index 000000000000..38467399e688
@@ -0,0 +1,12 @@
+if TARGET_DB_88F6281_BP
+
+config SYS_BOARD
+	default "db-88f6281-bp"
+
+config SYS_VENDOR
+	default "Marvell"
+
+config SYS_CONFIG_NAME
+	default "db-88f6281-bp"
+
+endif
board/Marvell/db-88f6281-bp/MAINTAINERS new file +10 -0
new file mode 100644
index 000000000000..acf0b051ff54
@@ -0,0 +1,10 @@
+DB_88F6820_AMC BOARD
+M:	Chris Packham <[email protected]>
+S:	Maintained
+F:	arch/arm/dts/kirkwood-db-88f6281.dts
+F:	arch/arm/dts/kirkwood-db-88f6281-spi.dts
+F:	arch/arm/dts/kirkwood-db.dtsi
+F:	board/Marvell/db-88f6281-bp/
+F:	include/configs/db-88f6281-bp.h
+F:	configs/db-88f6281-bp-nand_defconfig
+F:	configs/db-88f6281-bp-spi_defconfig
board/Marvell/db-88f6281-bp/Makefile new file +12 -0
new file mode 100644
index 000000000000..e6aa7e39a07f
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0+
+
+obj-y	:= db-88f6281-bp.o
+extra-y := kwbimage.cfg
+
+quiet_cmd_sed = SED     $@
+      cmd_sed = sed $(SEDFLAGS_$(@F)) $< >$(dir $<)$(@F)
+
+SEDFLAGS_kwbimage.cfg = -e "s/^\#@BOOT_FROM.*/BOOT_FROM	$(if $(CONFIG_CMD_NAND),nand,spi)/"
+$(src)/kwbimage.cfg: $(src)/kwbimage.cfg.in include/autoconf.mk \
+		include/config/auto.conf
+	$(call if_changed,sed)
board/Marvell/db-88f6281-bp/db-88f6281-bp.c new file +103 -0

103 lines not on this page · raw message

board/Marvell/db-88f6281-bp/kwbimage.cfg.in new file +36 -0
new file mode 100644
index 000000000000..05f8b275f607
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0+
+
+# Boot Media configurations
+#@BOOT_FROM
+
+DATA 0xd00100e0 0x1b1b1b9b
+DATA 0xd0020134 0xbbbbbbbb
+DATA 0xd0020138 0x00bbbbbb
+DATA 0xd0020154 0x00000200
+DATA 0xd002014c 0x00001c00
+DATA 0xd0020148 0x00000001
+
+DATA 0xd0001400 0x43000c30
+DATA 0xd0001404 0x39543000
+DATA 0xd0001408 0x22125451
+DATA 0xd000140c 0x00000833
+DATA 0xd0001410 0x000000cc
+DATA 0xd0001414 0x00000000
+DATA 0xd0001418 0x00000000
+DATA 0xd000141c 0x00000c52
+DATA 0xd0001420 0x00000044
+DATA 0xd0001424 0x0000f1ff
+DATA 0xd0001428 0x00085520
+DATA 0xd000147c 0x00008552
+DATA 0xd0001504 0x0ffffff1
+DATA 0xd0001508 0x10000000
+DATA 0xd000150c 0x0ffffff5
+DATA 0xd0001514 0x00000000
+DATA 0xd000151c 0x00000000
+DATA 0xd0001494 0x84210000
+DATA 0xd0001498 0x00000000
+DATA 0xd000149c 0x0000f40f
+DATA 0xd0001480 0x00000001
+
+# End of Header extension
+DATA 0x0 0x0
configs/db-88f6281-bp-nand_defconfig new file +53 -0

53 lines not on this page · raw message

configs/db-88f6281-bp-spi_defconfig new file +55 -0

55 lines not on this page · raw message

include/configs/db-88f6281-bp.h new file +99 -0

99 lines not on this page · raw message

Signature · 1 line
2.21.0
#1 lore raw

PATCH v4 2/2 ARM: kirkwood: enable CONFIG_DM_USB on db-88f6281-bp

Switch to the driver model for USB on the db-88f6281-bp board. CONFIG_BLK can't be enabled yet because mvebu_mmc.c needs converting.

---
In my original patch series having this separate made sense as this wouldn't be possible without the USB changes. Now it may make sense to squash this into the previous patch.

Changes in v4: None
Changes in v3: None

 configs/db-88f6281-bp-nand_defconfig | 1 +
 configs/db-88f6281-bp-spi_defconfig  | 1 +
 2 files changed, 2 insertions(+)
configs/db-88f6281-bp-nand_defconfig +1 -0
index 6360ef5e8280..a7a65df7ee7b 100644
@@ -47,6 +47,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_LZMA=y
configs/db-88f6281-bp-spi_defconfig +1 -0
index 54d476727996..bafbdd3ef075 100644
@@ -49,6 +49,7 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_LZMA=y
Signature · 1 line
2.21.0
#3 lore raw

PATCH v4 1/2 ARM: kirkwood: add db-88f6281-bp board

In reply to Chris Packham
Quoted 13 lines · Chris Packham

This is Marvell's Kirkwood development board. It has the following features

- 512M DDR2
- 2 PCI connectors
- 1 x1 PCI-e interface
- 1 Gigabit Ethernet Port
- 2 SATA Ports
- USB 2.0 Interface
- SDIO
- 128M NAND Flash
- 16M SPI Flash

Quoted 4 lines

It can be strapped to boot from SPI or NAND so there are two defconfigs (one per boot media).

Applied to u-boot-marvell/master.

Thanks,
Stefan