Skip to contentSkip to conversation

Convert LaCie boards to use DM drivers

PATCH New Simon Guinot 4 participants 16 messages Jun 28, 2020 – Jul 9, 2020 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

v2 cover Convert LaCie boards to use DM drivers

This patch series converts the following LaCie boards (Marvell Kirkwood-based) to use DM drivers:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Changes in v2:

- Move spi0 DT aliases into per boards -u-boot.dtsi files. This files will be removed as soon as the spi0 aliases will be available in the Linux upstream dtsi files.

Simon Guinot (5):
arm: kirkwood: add DT spi0 alias to LaCie boards
arm: kirkwood: convert LaCie boards to DM_SPI_FLASH
arm: kirkwood: switch LaCie boards to sata_mv driver
arm: kirkwood: enable DM_USB for LaCie board
arm: kirkwood: enable DM_ETH for LaCie board

 arch/arm/dts/kirkwood-d2net-u-boot.dtsi   |  7 +++++++
 arch/arm/dts/kirkwood-is2-u-boot.dtsi     |  7 +++++++
 arch/arm/dts/kirkwood-net2big-u-boot.dtsi |  7 +++++++
 arch/arm/dts/kirkwood-ns2-u-boot.dtsi     |  7 +++++++
 arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi |  7 +++++++
 arch/arm/dts/kirkwood-ns2max-u-boot.dtsi  |  7 +++++++
 arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi |  7 +++++++
 board/LaCie/net2big_v2/MAINTAINERS        |  6 ++++++
 board/LaCie/net2big_v2/net2big_v2.c       |  2 +-
 board/LaCie/netspace_v2/MAINTAINERS       | 21 ++++++++++++++-------
 board/LaCie/netspace_v2/netspace_v2.c     |  4 ++--
 configs/d2net_v2_defconfig                | 13 +++++++++----
 configs/inetspace_v2_defconfig            | 13 +++++++++----
 configs/net2big_v2_defconfig              | 13 +++++++++----
 configs/netspace_lite_v2_defconfig        | 14 ++++++++++----
 configs/netspace_max_v2_defconfig         | 14 ++++++++++----
 configs/netspace_mini_v2_defconfig        | 12 ++++++++----
 configs/netspace_v2_defconfig             | 13 +++++++++----
 include/configs/lacie_kw.h                | 19 +++++++++----------
 19 files changed, 145 insertions(+), 48 deletions(-)
 create mode 100644 arch/arm/dts/kirkwood-d2net-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-is2-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-net2big-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi
Signature · 1 line
2.27.0
#1 lore raw

PATCH v2 1/5 arm: kirkwood: add DT spi0 alias to LaCie boards

The spi0 alias is needed by the environment code to retrieve the SPI flash. This patch adds some -u-boot.dtsi files, providing the spi0 aliases, for all the following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Note that this -u-boot.dtsi files will be removed as soon as the spi0 aliases will be available in the upstream Linux dtsi files.

---
 arch/arm/dts/kirkwood-d2net-u-boot.dtsi   |  7 +++++++
 arch/arm/dts/kirkwood-is2-u-boot.dtsi     |  7 +++++++
 arch/arm/dts/kirkwood-net2big-u-boot.dtsi |  7 +++++++
 arch/arm/dts/kirkwood-ns2-u-boot.dtsi     |  7 +++++++
 arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi |  7 +++++++
 arch/arm/dts/kirkwood-ns2max-u-boot.dtsi  |  7 +++++++
 arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi |  7 +++++++
 board/LaCie/net2big_v2/MAINTAINERS        |  6 ++++++
 board/LaCie/netspace_v2/MAINTAINERS       | 21 ++++++++++++++-------
 9 files changed, 69 insertions(+), 7 deletions(-)
 create mode 100644 arch/arm/dts/kirkwood-d2net-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-is2-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-net2big-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
 create mode 100644 arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi
arch/arm/dts/kirkwood-d2net-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
arch/arm/dts/kirkwood-is2-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
arch/arm/dts/kirkwood-net2big-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
arch/arm/dts/kirkwood-ns2-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
arch/arm/dts/kirkwood-ns2max-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
board/LaCie/net2big_v2/MAINTAINERS +6 -0
index 8fec70315f5d..7046e1b2c5c7 100644
@@ -1,6 +1,12 @@
 NET2BIG_V2 BOARD
 M:	Simon Guinot <[email protected]>
 S:	Maintained
+F:	arch/arm/dts/kirkwood-d2net.dts
+F:	arch/arm/dts/kirkwood-d2net-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-d2net.dtsi
+F:	arch/arm/dts/kirkwood-net2big.dts
+F:	arch/arm/dts/kirkwood-net2big-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-netxbig.dtsi
 F:	board/LaCie/net2big_v2/
 F:	include/configs/lacie_kw.h
 F:	configs/d2net_v2_defconfig
board/LaCie/netspace_v2/MAINTAINERS +14 -7
index 55fd50d4eb1b..1cc4f7108b6b 100644
@@ -1,14 +1,21 @@
-NETSPACE_V2 BOARD
+NETSPACE_V2 BOARDS
 M:	Simon Guinot <[email protected]>
 S:	Maintained
+F:	arch/arm/dts/kirkwood-is2.dts
+F:	arch/arm/dts/kirkwood-is2-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-ns2-common.dtsi
+F:	arch/arm/dts/kirkwood-ns2.dts
+F:	arch/arm/dts/kirkwood-ns2lite.dts
+F:	arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-ns2max.dts
+F:	arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-ns2mini.dts
+F:	arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-ns2-u-boot.dtsi
 F:	board/LaCie/netspace_v2/
 F:	include/configs/lacie_kw.h
 F:	configs/inetspace_v2_defconfig
-F:	configs/netspace_max_v2_defconfig
-F:	configs/netspace_v2_defconfig
-
-NETSPACE_LITE_V2 BOARD
-#M:	-
-S:	Maintained
 F:	configs/netspace_lite_v2_defconfig
+F:	configs/netspace_max_v2_defconfig
 F:	configs/netspace_mini_v2_defconfig
+F:	configs/netspace_v2_defconfig
Signature · 1 line
2.27.0
#2 lore raw

PATCH v2 1/5 arm: kirkwood: add DT spi0 alias to LaCie boards

Quoted 12 lines · Simon Guinot

The spi0 alias is needed by the environment code to retrieve the SPI flash. This patch adds some -u-boot.dtsi files, providing the spi0 aliases, for all the following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Quoted 4 lines

Note that this -u-boot.dtsi files will be removed as soon as the spi0 aliases will be available in the upstream Linux dtsi files.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200628/fd12dffc/attachment.sig>
#3 lore raw

PATCH v2 1/5 arm: kirkwood: add DT spi0 alias to LaCie boards

In reply to Simon Guinot
Quoted 12 lines · Simon Guinot

The spi0 alias is needed by the environment code to retrieve the SPI flash. This patch adds some -u-boot.dtsi files, providing the spi0 aliases, for all the following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Quoted 4 lines

Note that this -u-boot.dtsi files will be removed as soon as the spi0 aliases will be available in the upstream Linux dtsi files.

Thanks,
Stefan

Quoted 151 lines
---
  arch/arm/dts/kirkwood-d2net-u-boot.dtsi   |  7 +++++++
  arch/arm/dts/kirkwood-is2-u-boot.dtsi     |  7 +++++++
  arch/arm/dts/kirkwood-net2big-u-boot.dtsi |  7 +++++++
  arch/arm/dts/kirkwood-ns2-u-boot.dtsi     |  7 +++++++
  arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi |  7 +++++++
  arch/arm/dts/kirkwood-ns2max-u-boot.dtsi  |  7 +++++++
  arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi |  7 +++++++
  board/LaCie/net2big_v2/MAINTAINERS        |  6 ++++++
  board/LaCie/netspace_v2/MAINTAINERS       | 21 ++++++++++++++-------
  9 files changed, 69 insertions(+), 7 deletions(-)

create mode 100644 arch/arm/dts/kirkwood-d2net-u-boot.dtsi create mode 100644 arch/arm/dts/kirkwood-is2-u-boot.dtsi create mode 100644 arch/arm/dts/kirkwood-net2big-u-boot.dtsi create mode 100644 arch/arm/dts/kirkwood-ns2-u-boot.dtsi create mode 100644 arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi create mode 100644 arch/arm/dts/kirkwood-ns2max-u-boot.dtsi create mode 100644 arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi

arch/arm/dts/kirkwood-d2net-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
arch/arm/dts/kirkwood-is2-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
arch/arm/dts/kirkwood-net2big-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
arch/arm/dts/kirkwood-ns2-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
arch/arm/dts/kirkwood-ns2max-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi new file +7 -0
new file mode 100644
index 000000000000..1f3b1854795b
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+	aliases {
+		spi0 = &spi0;
+	};
+};
board/LaCie/net2big_v2/MAINTAINERS +6 -0
index 8fec70315f5d..7046e1b2c5c7 100644
@@ -1,6 +1,12 @@
  NET2BIG_V2 BOARD
  M:	Simon Guinot <[email protected]>
  S:	Maintained
+F:	arch/arm/dts/kirkwood-d2net.dts
+F:	arch/arm/dts/kirkwood-d2net-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-d2net.dtsi
+F:	arch/arm/dts/kirkwood-net2big.dts
+F:	arch/arm/dts/kirkwood-net2big-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-netxbig.dtsi
  F:	board/LaCie/net2big_v2/
  F:	include/configs/lacie_kw.h
  F:	configs/d2net_v2_defconfig
board/LaCie/netspace_v2/MAINTAINERS +12 -1
index 55fd50d4eb1b..1cc4f7108b6b 100644
@@ -1,14 +1,21 @@
-NETSPACE_V2 BOARD
+NETSPACE_V2 BOARDS
  M:	Simon Guinot <[email protected]>
  S:	Maintained
+F:	arch/arm/dts/kirkwood-is2.dts
+F:	arch/arm/dts/kirkwood-is2-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-ns2-common.dtsi
+F:	arch/arm/dts/kirkwood-ns2.dts
+F:	arch/arm/dts/kirkwood-ns2lite.dts
+F:	arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-ns2max.dts
+F:	arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-ns2mini.dts
+F:	arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi
+F:	arch/arm/dts/kirkwood-ns2-u-boot.dtsi
  F:	board/LaCie/netspace_v2/
  F:	include/configs/lacie_kw.h
  F:	configs/inetspace_v2_defconfig

board/LaCie/netspace_v2/MAINTAINERS line 21

Quoted 10 lines
board/LaCie/netspace_v2/MAINTAINERS +2 -6
-F:	configs/netspace_max_v2_defconfig
-F:	configs/netspace_v2_defconfig
-
-NETSPACE_LITE_V2 BOARD
-#M:	-
-S:	Maintained
  F:	configs/netspace_lite_v2_defconfig
+F:	configs/netspace_max_v2_defconfig
  F:	configs/netspace_mini_v2_defconfig
+F:	configs/netspace_v2_defconfig

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#4 lore raw

PATCH v2 1/5 arm: kirkwood: add DT spi0 alias to LaCie boards

In reply to Simon Guinot
Quoted 18 lines · Simon Guinot

The spi0 alias is needed by the environment code to retrieve the SPI flash. This patch adds some -u-boot.dtsi files, providing the spi0 aliases, for all the following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Note that this -u-boot.dtsi files will be removed as soon as the spi0 aliases will be available in the upstream Linux dtsi files.

---

Quoted 12 lines · Simon Guinot

This patch converts the following Kirkwood-based LaCie boards to DM, DM_SPI and DM_SPI_FLASH:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Quoted 2 lines

---

#5 lore raw

PATCH v2 2/5 arm: kirkwood: convert LaCie boards to DM_SPI_FLASH

In reply to Simon Guinot

This patch converts the following Kirkwood-based LaCie boards to DM, DM_SPI and DM_SPI_FLASH:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

---
 configs/d2net_v2_defconfig         | 6 ++++--
 configs/inetspace_v2_defconfig     | 6 ++++--
 configs/net2big_v2_defconfig       | 6 ++++--
 configs/netspace_lite_v2_defconfig | 6 ++++--
 configs/netspace_max_v2_defconfig  | 6 ++++--
 configs/netspace_mini_v2_defconfig | 6 ++++--
 configs/netspace_v2_defconfig      | 6 ++++--
 7 files changed, 28 insertions(+), 14 deletions(-)
configs/d2net_v2_defconfig +4 -2
index fe3c6c47620d..0d240daf01a1 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" D2 v2"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="d2v2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/inetspace_v2_defconfig +4 -2
index 6144eb5fad45..2ef916fa85ba 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" IS v2"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/net2big_v2_defconfig +4 -2
index 1389d3090096..9c1ed539b2a0 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" 2Big v2"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="2big2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/netspace_lite_v2_defconfig +4 -2
index c744d2c58efc..180d1402a188 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" NS v2 Lite"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/netspace_max_v2_defconfig +4 -2
index 8602729fcb4e..ed1a4e2d3653 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" NS Max v2"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/netspace_mini_v2_defconfig +4 -2
index ba9301de4d53..884bb63f0b90 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" NS v2 Mini"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
@@ -37,12 +37,14 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/netspace_v2_defconfig +4 -2
index 6ba1ef423e19..cc1af7391771 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_IDENT_STRING=" NS v2"
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
Signature · 1 line
2.27.0
#6 lore raw

PATCH v2 2/5 arm: kirkwood: convert LaCie boards to DM_SPI_FLASH

Quoted 11 lines · Simon Guinot

This patch converts the following Kirkwood-based LaCie boards to DM, DM_SPI and DM_SPI_FLASH:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Quoted 1 line

Thanks,
Stefan

Quoted 265 lines
---
  configs/d2net_v2_defconfig         | 6 ++++--
  configs/inetspace_v2_defconfig     | 6 ++++--
  configs/net2big_v2_defconfig       | 6 ++++--
  configs/netspace_lite_v2_defconfig | 6 ++++--
  configs/netspace_max_v2_defconfig  | 6 ++++--
  configs/netspace_mini_v2_defconfig | 6 ++++--
  configs/netspace_v2_defconfig      | 6 ++++--
  7 files changed, 28 insertions(+), 14 deletions(-)
configs/d2net_v2_defconfig +4 -2
index fe3c6c47620d..0d240daf01a1 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_IDENT_STRING=" D2 v2"
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="d2v2> "
  CONFIG_CMD_EEPROM=y
  CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
  CONFIG_MVSATA_IDE=y
  # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
  CONFIG_SPI=y
+CONFIG_DM_SPI=y
  CONFIG_KIRKWOOD_SPI=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
configs/inetspace_v2_defconfig +4 -2
index 6144eb5fad45..2ef916fa85ba 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_IDENT_STRING=" IS v2"
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
  CONFIG_CMD_EEPROM=y
  CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
  CONFIG_MVSATA_IDE=y
  # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
  CONFIG_SPI=y
+CONFIG_DM_SPI=y
  CONFIG_KIRKWOOD_SPI=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
configs/net2big_v2_defconfig +4 -2
index 1389d3090096..9c1ed539b2a0 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_IDENT_STRING=" 2Big v2"
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="2big2> "
  CONFIG_CMD_EEPROM=y
  CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
  CONFIG_MVSATA_IDE=y
  # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
  CONFIG_SPI=y
+CONFIG_DM_SPI=y
  CONFIG_KIRKWOOD_SPI=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
configs/netspace_lite_v2_defconfig +4 -2
index c744d2c58efc..180d1402a188 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_IDENT_STRING=" NS v2 Lite"
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
  CONFIG_CMD_EEPROM=y
  CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
  CONFIG_MVSATA_IDE=y
  # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
  CONFIG_SPI=y
+CONFIG_DM_SPI=y
  CONFIG_KIRKWOOD_SPI=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
configs/netspace_max_v2_defconfig +4 -2
index 8602729fcb4e..ed1a4e2d3653 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_IDENT_STRING=" NS Max v2"
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
  CONFIG_CMD_EEPROM=y
  CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
  CONFIG_MVSATA_IDE=y
  # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
  CONFIG_SPI=y
+CONFIG_DM_SPI=y
  CONFIG_KIRKWOOD_SPI=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
configs/netspace_mini_v2_defconfig +4 -2
index ba9301de4d53..884bb63f0b90 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_IDENT_STRING=" NS v2 Mini"
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
  CONFIG_CMD_EEPROM=y
  CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
  CONFIG_CMD_MII=y
@@ -37,12 +37,14 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
  CONFIG_MVSATA_IDE=y
  # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y
+CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
  CONFIG_SPI=y
+CONFIG_DM_SPI=y
  CONFIG_KIRKWOOD_SPI=y
configs/netspace_v2_defconfig +2 -2
index 6ba1ef423e19..cc1af7391771 100644
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x70000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_IDENT_STRING=" NS v2"
+# CONFIG_SYS_MALLOC_F is not set
  CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTARGS=y
@@ -22,7 +23,6 @@ CONFIG_SYS_PROMPT="ns2> "
  CONFIG_CMD_EEPROM=y
  CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
-CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
@@ -39,14 +39,16 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
+CONFIG_DM=y
  CONFIG_MVSATA_IDE=y
  # CONFIG_MMC is not set
-CONFIG_SPI_FLASH=y

configs/netspace_v2_defconfig CONFIG_ENV_IS_IN_SPI_FLASH=y · line 54

Quoted 10 lines
configs/netspace_v2_defconfig +2 -0
+CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
  CONFIG_SPI=y
+CONFIG_DM_SPI=y
  CONFIG_KIRKWOOD_SPI=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#7 lore raw

PATCH v2 2/5 arm: kirkwood: convert LaCie boards to DM_SPI_FLASH

In reply to Simon Guinot
Quoted 12 lines · Simon Guinot

This patch converts the following Kirkwood-based LaCie boards to DM, DM_SPI and DM_SPI_FLASH:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Quoted 2 lines

---

#8 lore raw

PATCH v2 2/5 arm: kirkwood: convert LaCie boards to DM_SPI_FLASH

Quoted 14 lines · Jagan Teki
Quoted 12 lines · Simon Guinot

This patch converts the following Kirkwood-based LaCie boards to DM, DM_SPI and DM_SPI_FLASH:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Quoted 4 lines
Quoted 2 lines

---

Any chance to move this series into master, I have a dependency for kirkwood spi driver patches.

Jagan.

#9 lore raw

PATCH v2 2/5 arm: kirkwood: convert LaCie boards to DM_SPI_FLASH

Quoted 15 lines · Jagan Teki
Quoted 14 lines · Jagan Teki
Quoted 12 lines · Simon Guinot

This patch converts the following Kirkwood-based LaCie boards to DM, DM_SPI and DM_SPI_FLASH:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

---

Any chance to move this series into master, I have a dependency for kirkwood spi driver patches.

I'll try to take care of it today.

Thanks,
Stefan

#10 lore raw

PATCH v2 3/5 arm: kirkwood: switch LaCie boards to sata_mv driver

In reply to Simon Guinot

This patch switches the SATA driver from mvsata_ide to sata_mv for the following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

---
 configs/d2net_v2_defconfig         |  6 +++---
 configs/inetspace_v2_defconfig     |  6 +++---
 configs/net2big_v2_defconfig       |  6 +++---
 configs/netspace_lite_v2_defconfig |  5 +++--
 configs/netspace_max_v2_defconfig  |  5 +++--
 configs/netspace_mini_v2_defconfig |  5 +++--
 configs/netspace_v2_defconfig      |  6 +++---
 include/configs/lacie_kw.h         | 19 +++++++++----------
 8 files changed, 30 insertions(+), 28 deletions(-)
configs/d2net_v2_defconfig +3 -3
index 0d240daf01a1..5a3a1f60e308 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="d2v2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
configs/inetspace_v2_defconfig +3 -3
index 2ef916fa85ba..6cd4348a3c1d 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
configs/net2big_v2_defconfig +3 -3
index 9c1ed539b2a0..e7b7be7ed506 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="2big2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
configs/netspace_lite_v2_defconfig +3 -2
index 180d1402a188..9e3768ef4efd 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/netspace_max_v2_defconfig +3 -2
index ed1a4e2d3653..b06321895b20 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/netspace_mini_v2_defconfig +3 -2
index 884bb63f0b90..7e013b48d1a1 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
@@ -38,7 +38,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/netspace_v2_defconfig +3 -3
index cc1af7391771..fc09c6b22464 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ns2> "
 CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
 CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_ENV_ADDR=0x70000
 CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
include/configs/lacie_kw.h +9 -10
index 5bb0255a74d5..031bc995e3ba 100644
@@ -83,18 +83,17 @@
 /*
  * SATA Driver configuration
  */
-#ifdef CONFIG_MVSATA_IDE
-#define CONFIG_SYS_ATA_IDE0_OFFSET      MV_SATA_PORT0_OFFSET
+
+#ifdef CONFIG_SATA
+#define CONFIG_SYS_64BIT_LBA
+#define CONFIG_LBA48
 #if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_D2NET_V2) || \
 	defined(CONFIG_NET2BIG_V2)
-#define CONFIG_SYS_ATA_IDE1_OFFSET      MV_SATA_PORT1_OFFSET
-#define CONFIG_SYS_IDE_MAXBUS           2
-#define CONFIG_SYS_IDE_MAXDEVICE        2
+#define CONFIG_SYS_SATA_MAX_DEVICE	2
 #else
-#define CONFIG_SYS_IDE_MAXBUS           1
-#define CONFIG_SYS_IDE_MAXDEVICE        1
+#define CONFIG_SYS_SATA_MAX_DEVICE	1
 #endif
-#endif /* CONFIG_MVSATA_IDE */
+#endif /* CONFIG_SATA */
 
 /*
  * Enable GPI0 support
@@ -144,8 +143,8 @@
 		"set stdin $stdin,nc; "				\
 		"set stdout $stdout,nc; "			\
 		"set stderr $stderr,nc;\0"			\
-	"diskload=ide reset && "				\
-		"ext2load ide 0:1 $loadaddr /boot/$bootfile\0"	\
+	"diskload=sata init && "				\
+		"ext2load sata 0:1 $loadaddr /boot/$bootfile\0"	\
 	"usbload=usb start && "					\
 		"fatload usb 0:1 $loadaddr /boot/$bootfile\0"
 
Signature · 1 line
2.27.0
#11 lore raw

PATCH v2 3/5 arm: kirkwood: switch LaCie boards to sata_mv driver

Quoted 11 lines · Simon Guinot

This patch switches the SATA driver from mvsata_ide to sata_mv for the following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Quoted 1 line

Thanks,
Stefan

Quoted 231 lines
---
  configs/d2net_v2_defconfig         |  6 +++---
  configs/inetspace_v2_defconfig     |  6 +++---
  configs/net2big_v2_defconfig       |  6 +++---
  configs/netspace_lite_v2_defconfig |  5 +++--
  configs/netspace_max_v2_defconfig  |  5 +++--
  configs/netspace_mini_v2_defconfig |  5 +++--
  configs/netspace_v2_defconfig      |  6 +++---
  include/configs/lacie_kw.h         | 19 +++++++++----------
  8 files changed, 30 insertions(+), 28 deletions(-)
configs/d2net_v2_defconfig +3 -3
index 0d240daf01a1..5a3a1f60e308 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="d2v2> "
  CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
  CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
  CONFIG_KIRKWOOD_SPI=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
configs/inetspace_v2_defconfig +3 -3
index 2ef916fa85ba..6cd4348a3c1d 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="ns2> "
  CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
  CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
  CONFIG_KIRKWOOD_SPI=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
configs/net2big_v2_defconfig +3 -3
index 9c1ed539b2a0..e7b7be7ed506 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="2big2> "
  CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
  CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
  CONFIG_KIRKWOOD_SPI=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
configs/netspace_lite_v2_defconfig +3 -2
index 180d1402a188..9e3768ef4efd 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="ns2> "
  CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
  CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
configs/netspace_max_v2_defconfig +3 -2
index ed1a4e2d3653..b06321895b20 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="ns2> "
  CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
  CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
configs/netspace_mini_v2_defconfig +3 -2
index 884bb63f0b90..7e013b48d1a1 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="ns2> "
  CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
  CONFIG_CMD_MII=y
@@ -38,7 +38,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
  CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
configs/netspace_v2_defconfig +3 -3
index cc1af7391771..fc09c6b22464 100644
@@ -21,8 +21,8 @@ CONFIG_MISC_INIT_R=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="ns2> "
  CONFIG_CMD_EEPROM=y
-CONFIG_CMD_IDE=y
  CONFIG_CMD_I2C=y
+CONFIG_CMD_SATA=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_DHCP=y
@@ -40,7 +40,8 @@ CONFIG_USE_ENV_SPI_MAX_HZ=y
  CONFIG_ENV_SPI_MAX_HZ=20000000
  CONFIG_ENV_ADDR=0x70000
  CONFIG_DM=y
-CONFIG_MVSATA_IDE=y
+CONFIG_SATA_MV=y
+CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,4 +53,3 @@ CONFIG_DM_SPI=y
  CONFIG_KIRKWOOD_SPI=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_STORAGE=y
include/configs/lacie_kw.h +7 -8
index 5bb0255a74d5..031bc995e3ba 100644
@@ -83,18 +83,17 @@
  /*
   * SATA Driver configuration
   */
-#ifdef CONFIG_MVSATA_IDE
-#define CONFIG_SYS_ATA_IDE0_OFFSET      MV_SATA_PORT0_OFFSET
+
+#ifdef CONFIG_SATA
+#define CONFIG_SYS_64BIT_LBA
+#define CONFIG_LBA48
  #if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_D2NET_V2) || \
  	defined(CONFIG_NET2BIG_V2)
-#define CONFIG_SYS_ATA_IDE1_OFFSET      MV_SATA_PORT1_OFFSET
-#define CONFIG_SYS_IDE_MAXBUS           2
-#define CONFIG_SYS_IDE_MAXDEVICE        2
+#define CONFIG_SYS_SATA_MAX_DEVICE	2
  #else
-#define CONFIG_SYS_IDE_MAXBUS           1
-#define CONFIG_SYS_IDE_MAXDEVICE        1
+#define CONFIG_SYS_SATA_MAX_DEVICE	1
  #endif
-#endif /* CONFIG_MVSATA_IDE */
+#endif /* CONFIG_SATA */
 
  /*
   * Enable GPI0 support

include/configs/lacie_kw.h line 150

Quoted 10 lines
include/configs/lacie_kw.h +2 -2
@@ -144,8 +143,8 @@
  		"set stdin $stdin,nc; "				\
  		"set stdout $stdout,nc; "			\
  		"set stderr $stderr,nc;\0"			\
-	"diskload=ide reset && "				\
-		"ext2load ide 0:1 $loadaddr /boot/$bootfile\0"	\
+	"diskload=sata init && "				\
+		"ext2load sata 0:1 $loadaddr /boot/$bootfile\0"	\
  	"usbload=usb start && "					\
  		"fatload usb 0:1 $loadaddr /boot/$bootfile\0"
 

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#12 lore raw

PATCH v2 4/5 arm: kirkwood: enable DM_USB for LaCie board

In reply to Simon Guinot

This patch enables DM_USB and USB_STORAGE for the following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2

---
 configs/d2net_v2_defconfig         | 2 ++
 configs/inetspace_v2_defconfig     | 2 ++
 configs/net2big_v2_defconfig       | 2 ++
 configs/netspace_lite_v2_defconfig | 2 ++
 configs/netspace_max_v2_defconfig  | 2 ++
 configs/netspace_v2_defconfig      | 2 ++
 6 files changed, 12 insertions(+)
configs/d2net_v2_defconfig +2 -0
index 5a3a1f60e308..33f48e0dd94c 100644
@@ -52,4 +52,6 @@ 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
configs/inetspace_v2_defconfig +2 -0
index 6cd4348a3c1d..ca444d0aafa3 100644
@@ -52,4 +52,6 @@ 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
configs/net2big_v2_defconfig +2 -0
index e7b7be7ed506..4d0e50b3e0a5 100644
@@ -52,4 +52,6 @@ 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
configs/netspace_lite_v2_defconfig +2 -0
index 9e3768ef4efd..26ca464e0b48 100644
@@ -52,5 +52,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_USB_STORAGE=y
configs/netspace_max_v2_defconfig +2 -0
index b06321895b20..af2d9df6ff8a 100644
@@ -52,5 +52,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_USB_STORAGE=y
configs/netspace_v2_defconfig +2 -0
index fc09c6b22464..3585b7cf6318 100644
@@ -52,4 +52,6 @@ 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
Signature · 1 line
2.27.0
#13 lore raw

PATCH v2 4/5 arm: kirkwood: enable DM_USB for LaCie board

Quoted 11 lines · Simon Guinot

This patch enables DM_USB and USB_STORAGE for the following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2

Thanks,
Stefan

Quoted 72 lines
---
  configs/d2net_v2_defconfig         | 2 ++
  configs/inetspace_v2_defconfig     | 2 ++
  configs/net2big_v2_defconfig       | 2 ++
  configs/netspace_lite_v2_defconfig | 2 ++
  configs/netspace_max_v2_defconfig  | 2 ++
  configs/netspace_v2_defconfig      | 2 ++
  6 files changed, 12 insertions(+)
configs/d2net_v2_defconfig +2 -0
index 5a3a1f60e308..33f48e0dd94c 100644
@@ -52,4 +52,6 @@ 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
configs/inetspace_v2_defconfig +2 -0
index 6cd4348a3c1d..ca444d0aafa3 100644
@@ -52,4 +52,6 @@ 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
configs/net2big_v2_defconfig +2 -0
index e7b7be7ed506..4d0e50b3e0a5 100644
@@ -52,4 +52,6 @@ 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
configs/netspace_lite_v2_defconfig +2 -0
index 9e3768ef4efd..26ca464e0b48 100644
@@ -52,5 +52,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_USB_STORAGE=y
configs/netspace_max_v2_defconfig +2 -0
index b06321895b20..af2d9df6ff8a 100644
@@ -52,5 +52,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_USB_STORAGE=y
configs/netspace_v2_defconfig +0 -0
index fc09c6b22464..3585b7cf6318 100644

configs/netspace_v2_defconfig CONFIG_SPI=y · line 57

Quoted 6 lines
configs/netspace_v2_defconfig +2 -0
@@ -52,4 +52,6 @@ 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

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#14 lore raw

PATCH v2 5/5 arm: kirkwood: enable DM_ETH for LaCie board

In reply to Simon Guinot

This patch enables DM_ETH for the following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

---
 board/LaCie/net2big_v2/net2big_v2.c   | 2 +-
 board/LaCie/netspace_v2/netspace_v2.c | 4 ++--
 configs/d2net_v2_defconfig            | 1 +
 configs/inetspace_v2_defconfig        | 1 +
 configs/net2big_v2_defconfig          | 1 +
 configs/netspace_lite_v2_defconfig    | 1 +
 configs/netspace_max_v2_defconfig     | 1 +
 configs/netspace_mini_v2_defconfig    | 1 +
 configs/netspace_v2_defconfig         | 1 +
 9 files changed, 10 insertions(+), 3 deletions(-)
board/LaCie/net2big_v2/net2big_v2.c +1 -1
index dbd8b5755da3..e94c9a6dce96 100644
@@ -239,7 +239,7 @@ int misc_init_r(void)
 /* Configure and initialize PHY */
 void reset_phy(void)
 {
-	mv_phy_88e1116_init("egiga0", 8);
+	mv_phy_88e1116_init("ethernet-controller at 72000", 8);
 }
 #endif
 
board/LaCie/netspace_v2/netspace_v2.c +2 -2
index 011cc563d19d..33246b201528 100644
@@ -100,9 +100,9 @@ int misc_init_r(void)
 void reset_phy(void)
 {
 #if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
-	mv_phy_88e1318_init("egiga0", 0);
+	mv_phy_88e1318_init("ethernet-controller at 72000", 0);
 #else
-	mv_phy_88e1116_init("egiga0", 8);
+	mv_phy_88e1116_init("ethernet-controller at 72000", 8);
 #endif
 }
 #endif
configs/d2net_v2_defconfig +1 -0
index 33f48e0dd94c..31a5d91af2b3 100644
@@ -45,6 +45,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/inetspace_v2_defconfig +1 -0
index ca444d0aafa3..b5973977a5b8 100644
@@ -45,6 +45,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/net2big_v2_defconfig +1 -0
index 4d0e50b3e0a5..bba85030492a 100644
@@ -45,6 +45,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/netspace_lite_v2_defconfig +1 -0
index 26ca464e0b48..bfa93dbd1c27 100644
@@ -45,6 +45,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/netspace_max_v2_defconfig +1 -0
index af2d9df6ff8a..d0f750369a3a 100644
@@ -45,6 +45,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/netspace_mini_v2_defconfig +1 -0
index 7e013b48d1a1..6cfaccf51dbd 100644
@@ -43,6 +43,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/netspace_v2_defconfig +1 -0
index 3585b7cf6318..1bd148f9b511 100644
@@ -45,6 +45,7 @@ CONFIG_BLK=y
 # CONFIG_MMC is not set
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
Signature · 1 line
2.27.0
#15 lore raw

PATCH v2 5/5 arm: kirkwood: enable DM_ETH for LaCie board

Quoted 11 lines · Simon Guinot

This patch enables DM_ETH for the following Kirkwood-based LaCie boards:

- d2 Network v2
- Internet Space v2
- 2Big Network v2
- Network Space v2
- Network Space Lite v2
- Network Space Max v2
- Network Space Mini v2

Thanks,
Stefan

Quoted 119 lines
---
  board/LaCie/net2big_v2/net2big_v2.c   | 2 +-
  board/LaCie/netspace_v2/netspace_v2.c | 4 ++--
  configs/d2net_v2_defconfig            | 1 +
  configs/inetspace_v2_defconfig        | 1 +
  configs/net2big_v2_defconfig          | 1 +
  configs/netspace_lite_v2_defconfig    | 1 +
  configs/netspace_max_v2_defconfig     | 1 +
  configs/netspace_mini_v2_defconfig    | 1 +
  configs/netspace_v2_defconfig         | 1 +
  9 files changed, 10 insertions(+), 3 deletions(-)
board/LaCie/net2big_v2/net2big_v2.c +1 -1
index dbd8b5755da3..e94c9a6dce96 100644
@@ -239,7 +239,7 @@ int misc_init_r(void)
  /* Configure and initialize PHY */
  void reset_phy(void)
  {
-	mv_phy_88e1116_init("egiga0", 8);
+	mv_phy_88e1116_init("ethernet-controller at 72000", 8);
  }
  #endif
 
board/LaCie/netspace_v2/netspace_v2.c +2 -2
index 011cc563d19d..33246b201528 100644
@@ -100,9 +100,9 @@ int misc_init_r(void)
  void reset_phy(void)
  {
  #if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
-	mv_phy_88e1318_init("egiga0", 0);
+	mv_phy_88e1318_init("ethernet-controller at 72000", 0);
  #else
-	mv_phy_88e1116_init("egiga0", 8);
+	mv_phy_88e1116_init("ethernet-controller at 72000", 8);
  #endif
  }
  #endif
configs/d2net_v2_defconfig +1 -0
index 33f48e0dd94c..31a5d91af2b3 100644
@@ -45,6 +45,7 @@ CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
configs/inetspace_v2_defconfig +1 -0
index ca444d0aafa3..b5973977a5b8 100644
@@ -45,6 +45,7 @@ CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
configs/net2big_v2_defconfig +1 -0
index 4d0e50b3e0a5..bba85030492a 100644
@@ -45,6 +45,7 @@ CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
configs/netspace_lite_v2_defconfig +1 -0
index 26ca464e0b48..bfa93dbd1c27 100644
@@ -45,6 +45,7 @@ CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
configs/netspace_max_v2_defconfig +1 -0
index af2d9df6ff8a..d0f750369a3a 100644
@@ -45,6 +45,7 @@ CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
configs/netspace_mini_v2_defconfig +1 -0
index 7e013b48d1a1..6cfaccf51dbd 100644
@@ -43,6 +43,7 @@ CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y
configs/netspace_v2_defconfig +0 -0
index 3585b7cf6318..1bd148f9b511 100644

configs/netspace_v2_defconfig CONFIG_BLK=y · line 51

Quoted 7 lines
configs/netspace_v2_defconfig +1 -0
@@ -45,6 +45,7 @@ CONFIG_BLK=y
  # CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_ETH=y
  CONFIG_MVGBE=y
  CONFIG_MII=y
  CONFIG_SYS_NS16550=y

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de