[PATCH v2 3/5] arm: kirkwood: switch LaCie boards to sata_mv driver
Stefan Roese
sr at denx.de
Mon Jun 29 08:16:41 CEST 2020
On 28.06.20 19:00, Simon Guinot wrote:
> 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
>
> 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 | 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(-)
>
> diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
> index 0d240daf01a1..5a3a1f60e308 100644
> --- a/configs/d2net_v2_defconfig
> +++ b/configs/d2net_v2_defconfig
> @@ -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
> diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
> index 2ef916fa85ba..6cd4348a3c1d 100644
> --- a/configs/inetspace_v2_defconfig
> +++ b/configs/inetspace_v2_defconfig
> @@ -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
> diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
> index 9c1ed539b2a0..e7b7be7ed506 100644
> --- a/configs/net2big_v2_defconfig
> +++ b/configs/net2big_v2_defconfig
> @@ -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
> diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
> index 180d1402a188..9e3768ef4efd 100644
> --- a/configs/netspace_lite_v2_defconfig
> +++ b/configs/netspace_lite_v2_defconfig
> @@ -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
> diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
> index ed1a4e2d3653..b06321895b20 100644
> --- a/configs/netspace_max_v2_defconfig
> +++ b/configs/netspace_max_v2_defconfig
> @@ -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
> diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
> index 884bb63f0b90..7e013b48d1a1 100644
> --- a/configs/netspace_mini_v2_defconfig
> +++ b/configs/netspace_mini_v2_defconfig
> @@ -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
> diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
> index cc1af7391771..fc09c6b22464 100644
> --- a/configs/netspace_v2_defconfig
> +++ b/configs/netspace_v2_defconfig
> @@ -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
> diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
> index 5bb0255a74d5..031bc995e3ba 100644
> --- a/include/configs/lacie_kw.h
> +++ b/include/configs/lacie_kw.h
> @@ -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"
>
>
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
More information about the U-Boot
mailing list