[U-Boot] [PATCH 4/4] arm: kirkwood: lsxl: enable DM for SATA

[Stefan Roese]

On 03.04.19 23:28, Michael Walle wrote:
> Switch from legacy IDE driver to sata_mv driver.
> 
> Signed-off-by: Michael Walle <michael at walle.cc>
> ---
>   configs/lschlv2_defconfig |  4 ++--
>   configs/lsxhl_defconfig   |  4 ++--
>   include/configs/lsxl.h    | 23 ++++++++++-------------
>   3 files changed, 14 insertions(+), 17 deletions(-)
> 
> diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
> index e1ff355731..c550798bcd 100644
> --- a/configs/lschlv2_defconfig
> +++ b/configs/lschlv2_defconfig
> @@ -16,7 +16,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
>   CONFIG_MISC_INIT_R=y
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   # CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_IDE=y
> +CONFIG_CMD_SATA=y
>   CONFIG_CMD_SF=y
>   CONFIG_CMD_SPI=y
>   CONFIG_CMD_USB=y
> @@ -26,7 +26,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-lschlv2"
>   CONFIG_ENV_IS_IN_SPI_FLASH=y
>   CONFIG_NET_RANDOM_ETHADDR=y
>   CONFIG_DM=y
> -CONFIG_MVSATA_IDE=y
> +CONFIG_SATA_MV=y
>   CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
> diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
> index 48678bdb8f..efcce455a4 100644
> --- a/configs/lsxhl_defconfig
> +++ b/configs/lsxhl_defconfig
> @@ -16,7 +16,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
>   CONFIG_MISC_INIT_R=y
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   # CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_IDE=y
> +CONFIG_CMD_SATA=y
>   CONFIG_CMD_SF=y
>   CONFIG_CMD_SPI=y
>   CONFIG_CMD_USB=y
> @@ -26,7 +26,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-lsxhl"
>   CONFIG_ENV_IS_IN_SPI_FLASH=y
>   CONFIG_NET_RANDOM_ETHADDR=y
>   CONFIG_DM=y
> -CONFIG_MVSATA_IDE=y
> +CONFIG_SATA_MV=y
>   CONFIG_BLK=y
>   # CONFIG_MMC is not set
>   CONFIG_DM_SPI_FLASH=y
> diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
> index 72e62658d0..55c4e63325 100644
> --- a/include/configs/lsxl.h
> +++ b/include/configs/lsxl.h
> @@ -76,9 +76,9 @@
>   	"kernel_addr=0x00800000\0"					\
>   	"ramdisk_addr=0x01000000\0"					\
>   	"fdt_addr=0x00ff0000\0"						\
> -	"bootcmd_legacy=ide reset "					\
> -		"&& load ide ${hdpart} ${kernel_addr} /uImage.buffalo "	\
> -		"&& load ide ${hdpart} ${ramdisk_addr} /initrd.buffalo "\
> +	"bootcmd_legacy=sata init "					\
> +		"&& load sata ${hdpart} ${kernel_addr} /uImage.buffalo "\
> +		"&& load sata ${hdpart} ${ramdisk_addr} /initrd.buffalo "\
>   		"&& bootm ${kernel_addr} ${ramdisk_addr}\0"		\
>   	"bootcmd_net=bootp ${kernel_addr} vmlinuz "			\
>   		"&& tftpboot ${ramdisk_addr} initrd.img "		\
> @@ -86,11 +86,11 @@
>   		"&& tftpboot ${fdt_addr} " CONFIG_FDTFILE " "		\
>   		"&& bootz ${kernel_addr} "				\
>   			"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0"	\
> -	"bootcmd_hdd=ide reset "					\
> -		"&& load ide ${hdpart} ${kernel_addr} /vmlinuz "	\
> -		"&& load ide ${hdpart} ${ramdisk_addr} /initrd.img "	\
> +	"bootcmd_hdd=sata init "					\
> +		"&& load sata ${hdpart} ${kernel_addr} /vmlinuz "	\
> +		"&& load sata ${hdpart} ${ramdisk_addr} /initrd.img "	\
>   		"&& setenv ramdisk_len ${filesize} "			\
> -		"&& load ide ${hdpart} ${fdt_addr} /dtb "		\
> +		"&& load sata ${hdpart} ${fdt_addr} /dtb "		\
>   		"&& bootz ${kernel_addr} "				\
>   			"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0"	\
>   	"bootcmd_usb=usb start "					\
> @@ -131,13 +131,10 @@
>   #undef CONFIG_RESET_PHY_R
>   #endif /* CONFIG_CMD_NET */
>   
> -#ifdef CONFIG_IDE
> -#undef CONFIG_SYS_IDE_MAXBUS
> -#define CONFIG_SYS_IDE_MAXBUS		1
> -#undef CONFIG_SYS_IDE_MAXDEVICE
> -#define CONFIG_SYS_IDE_MAXDEVICE	1
> -#define CONFIG_SYS_ATA_IDE0_OFFSET	MV_SATA_PORT0_OFFSET
> +#ifdef CONFIG_SATA
> +#define CONFIG_SYS_SATA_MAX_DEVICE 1
>   #define CONFIG_SYS_64BIT_LBA
> +#define CONFIG_LBA48
>   #endif
>   
>   #endif /* _CONFIG_LSXL_H */
> 

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

Thanks,
Stefan