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

Mon Jun 29 08:16:08 CEST 2020

On 28.06.20 19:00, Simon Guinot wrote:
> 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
> 
> Signed-off-by: Simon Guinot <simon.guinot at sequanux.org>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   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(-)
> 
> diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
> index fe3c6c47620d..0d240daf01a1 100644
> --- a/configs/d2net_v2_defconfig
> +++ b/configs/d2net_v2_defconfig
> @@ -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
> diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
> index 6144eb5fad45..2ef916fa85ba 100644
> --- a/configs/inetspace_v2_defconfig
> +++ b/configs/inetspace_v2_defconfig
> @@ -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
> diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
> index 1389d3090096..9c1ed539b2a0 100644
> --- a/configs/net2big_v2_defconfig
> +++ b/configs/net2big_v2_defconfig
> @@ -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
> diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
> index c744d2c58efc..180d1402a188 100644
> --- a/configs/netspace_lite_v2_defconfig
> +++ b/configs/netspace_lite_v2_defconfig
> @@ -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
> diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
> index 8602729fcb4e..ed1a4e2d3653 100644
> --- a/configs/netspace_max_v2_defconfig
> +++ b/configs/netspace_max_v2_defconfig
> @@ -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
> diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
> index ba9301de4d53..884bb63f0b90 100644
> --- a/configs/netspace_mini_v2_defconfig
> +++ b/configs/netspace_mini_v2_defconfig
> @@ -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
> diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
> index 6ba1ef423e19..cc1af7391771 100644
> --- a/configs/netspace_v2_defconfig
> +++ b/configs/netspace_v2_defconfig
> @@ -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
> 


Viele Grüße,
Stefan

-- 
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