From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/4] arm: kirkwood: lsxl: enable DM for SATA
Date: Thu, 4 Apr 2019 17:26:08 +0200 [thread overview]
Message-ID: <067830d4-1bf0-efbe-fc31-ebabdef2dbc0@denx.de> (raw)
In-Reply-To: <20190403212831.29886-5-michael@walle.cc>
On 03.04.19 23:28, Michael Walle wrote:
> Switch from legacy IDE driver to sata_mv driver.
>
> Signed-off-by: Michael Walle <michael@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@denx.de>
Thanks,
Stefan
next prev parent reply other threads:[~2019-04-04 15:26 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-03 21:28 [U-Boot] [PATCH 0/4] ARM: kirkwood: lsxl: enable DM for SATA Michael Walle
2019-04-03 21:28 ` [U-Boot] [PATCH 1/4] sata: sata_mv: use correct format specifier in debug() Michael Walle
2019-04-04 7:01 ` Chris Packham
2019-04-04 15:16 ` Stefan Roese
2019-04-11 12:10 ` Stefan Roese
2019-04-03 21:28 ` [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood architecture Michael Walle
2019-04-04 7:11 ` Chris Packham
2019-04-04 15:21 ` Stefan Roese
2019-04-04 15:18 ` Stefan Roese
2019-04-11 12:10 ` Stefan Roese
2019-04-03 21:28 ` [U-Boot] [PATCH 3/4] sata: sata_mv: add orion-sata compatible string Michael Walle
2019-04-04 7:11 ` Chris Packham
2019-04-04 15:21 ` Stefan Roese
2019-04-11 12:11 ` Stefan Roese
2019-04-03 21:28 ` [U-Boot] [PATCH 4/4] arm: kirkwood: lsxl: enable DM for SATA Michael Walle
2019-04-04 15:26 ` Stefan Roese [this message]
2019-04-11 12:12 ` Stefan Roese
2019-04-04 7:13 ` [U-Boot] [PATCH 0/4] ARM: " Chris Packham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=067830d4-1bf0-efbe-fc31-ebabdef2dbc0@denx.de \
--to=sr@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.