* [U-Boot] [PATCH 1/4] sata: sata_mv: use correct format specifier in debug()
2019-04-03 21:28 [U-Boot] [PATCH 0/4] ARM: kirkwood: lsxl: enable DM for SATA Michael Walle
@ 2019-04-03 21:28 ` Michael Walle
2019-04-04 7:01 ` Chris Packham
` (2 more replies)
2019-04-03 21:28 ` [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood architecture Michael Walle
` (3 subsequent siblings)
4 siblings, 3 replies; 18+ messages in thread
From: Michael Walle @ 2019-04-03 21:28 UTC (permalink / raw)
To: u-boot
This fixes a compile error on kirkwood.
Signed-off-by: Michael Walle <michael@walle.cc>
---
drivers/ata/sata_mv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index d13695d79e..87ea95f75d 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -727,7 +727,7 @@ static u32 ata_low_level_rw(struct udevice *dev, int port, lbaint_t blknr,
u8 *addr;
int max_blks;
- debug("%s: %ld %ld\n", __func__, blknr, blkcnt);
+ debug("%s: " LBAFU " " LBAFU "\n", __func__, blknr, blkcnt);
start = blknr;
blks = blkcnt;
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [U-Boot] [PATCH 1/4] sata: sata_mv: use correct format specifier in debug()
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
2 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2019-04-04 7:01 UTC (permalink / raw)
To: u-boot
On Thu, Apr 4, 2019 at 10:28 AM Michael Walle <michael@walle.cc> wrote:
>
> This fixes a compile error on kirkwood.
>
> Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
> ---
> drivers/ata/sata_mv.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
> index d13695d79e..87ea95f75d 100644
> --- a/drivers/ata/sata_mv.c
> +++ b/drivers/ata/sata_mv.c
> @@ -727,7 +727,7 @@ static u32 ata_low_level_rw(struct udevice *dev, int port, lbaint_t blknr,
> u8 *addr;
> int max_blks;
>
> - debug("%s: %ld %ld\n", __func__, blknr, blkcnt);
> + debug("%s: " LBAFU " " LBAFU "\n", __func__, blknr, blkcnt);
>
> start = blknr;
> blks = blkcnt;
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread* [U-Boot] [PATCH 1/4] sata: sata_mv: use correct format specifier in debug()
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
2 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2019-04-04 15:16 UTC (permalink / raw)
To: u-boot
On 03.04.19 23:28, Michael Walle wrote:
> This fixes a compile error on kirkwood.
>
> Signed-off-by: Michael Walle <michael@walle.cc>
> ---
> drivers/ata/sata_mv.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
> index d13695d79e..87ea95f75d 100644
> --- a/drivers/ata/sata_mv.c
> +++ b/drivers/ata/sata_mv.c
> @@ -727,7 +727,7 @@ static u32 ata_low_level_rw(struct udevice *dev, int port, lbaint_t blknr,
> u8 *addr;
> int max_blks;
>
> - debug("%s: %ld %ld\n", __func__, blknr, blkcnt);
> + debug("%s: " LBAFU " " LBAFU "\n", __func__, blknr, blkcnt);
>
> start = blknr;
> blks = blkcnt;
>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread* [U-Boot] [PATCH 1/4] sata: sata_mv: use correct format specifier in debug()
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
2 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2019-04-11 12:10 UTC (permalink / raw)
To: u-boot
On 03.04.19 23:28, Michael Walle wrote:
> This fixes a compile error on kirkwood.
>
> Signed-off-by: Michael Walle <michael@walle.cc>
Applied to u-boot-marvell/master.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood architecture
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-03 21:28 ` Michael Walle
2019-04-04 7:11 ` Chris Packham
` (2 more replies)
2019-04-03 21:28 ` [U-Boot] [PATCH 3/4] sata: sata_mv: add orion-sata compatible string Michael Walle
` (2 subsequent siblings)
4 siblings, 3 replies; 18+ messages in thread
From: Michael Walle @ 2019-04-03 21:28 UTC (permalink / raw)
To: u-boot
Fix the worng include and offset macros.
Signed-off-by: Michael Walle <michael@walle.cc>
---
drivers/ata/sata_mv.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 87ea95f75d..b691107dc0 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -44,11 +44,10 @@
#include <asm/io.h>
#include <linux/mbus.h>
+#include <asm/arch/soc.h>
#if defined(CONFIG_KIRKWOOD)
-#include <asm/arch/kirkwood.h>
#define SATAHC_BASE KW_SATA_BASE
#else
-#include <asm/arch/soc.h>
#define SATAHC_BASE MVEBU_AXP_SATA_BASE
#endif
@@ -218,8 +217,8 @@ struct crqb {
#define CRQB_SECTCOUNT_COUNT_EXP_MASK (0xff << 8)
#define CRQB_SECTCOUNT_COUNT_EXP_SHIFT 8
-#define MVSATA_WIN_CONTROL(w) (MVEBU_AXP_SATA_BASE + 0x30 + ((w) << 4))
-#define MVSATA_WIN_BASE(w) (MVEBU_AXP_SATA_BASE + 0x34 + ((w) << 4))
+#define MVSATA_WIN_CONTROL(w) (SATAHC_BASE + 0x30 + ((w) << 4))
+#define MVSATA_WIN_BASE(w) (SATAHC_BASE + 0x34 + ((w) << 4))
struct eprd {
u32 phyaddr_low;
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood architecture
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
2 siblings, 1 reply; 18+ messages in thread
From: Chris Packham @ 2019-04-04 7:11 UTC (permalink / raw)
To: u-boot
On Thu, Apr 4, 2019 at 10:28 AM Michael Walle <michael@walle.cc> wrote:
>
> Fix the worng include and offset macros.
Typo worng -> wrong
>
> Signed-off-by: Michael Walle <michael@walle.cc>
> ---
> drivers/ata/sata_mv.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
> index 87ea95f75d..b691107dc0 100644
> --- a/drivers/ata/sata_mv.c
> +++ b/drivers/ata/sata_mv.c
> @@ -44,11 +44,10 @@
> #include <asm/io.h>
> #include <linux/mbus.h>
>
> +#include <asm/arch/soc.h>
> #if defined(CONFIG_KIRKWOOD)
> -#include <asm/arch/kirkwood.h>
> #define SATAHC_BASE KW_SATA_BASE
> #else
> -#include <asm/arch/soc.h>
> #define SATAHC_BASE MVEBU_AXP_SATA_BASE
> #endif
It might be a better idea to update these defines to be definitions
for these in the soc.h. We're already doing this for some other
peripheral blocks between mach-kirkwood and mach-mvebu. On the other
hand SATAHC_BASE already achieves this so maybe it's not worth
bothering.
>
> @@ -218,8 +217,8 @@ struct crqb {
> #define CRQB_SECTCOUNT_COUNT_EXP_MASK (0xff << 8)
> #define CRQB_SECTCOUNT_COUNT_EXP_SHIFT 8
>
> -#define MVSATA_WIN_CONTROL(w) (MVEBU_AXP_SATA_BASE + 0x30 + ((w) << 4))
> -#define MVSATA_WIN_BASE(w) (MVEBU_AXP_SATA_BASE + 0x34 + ((w) << 4))
> +#define MVSATA_WIN_CONTROL(w) (SATAHC_BASE + 0x30 + ((w) << 4))
> +#define MVSATA_WIN_BASE(w) (SATAHC_BASE + 0x34 + ((w) << 4))
>
> struct eprd {
> u32 phyaddr_low;
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread* [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood architecture
2019-04-04 7:11 ` Chris Packham
@ 2019-04-04 15:21 ` Stefan Roese
0 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2019-04-04 15:21 UTC (permalink / raw)
To: u-boot
On 04.04.19 09:11, Chris Packham wrote:
> On Thu, Apr 4, 2019 at 10:28 AM Michael Walle <michael@walle.cc> wrote:
>>
>> Fix the worng include and offset macros.
>
> Typo worng -> wrong
>
>>
>> Signed-off-by: Michael Walle <michael@walle.cc>
>> ---
>> drivers/ata/sata_mv.c | 7 +++----
>> 1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
>> index 87ea95f75d..b691107dc0 100644
>> --- a/drivers/ata/sata_mv.c
>> +++ b/drivers/ata/sata_mv.c
>> @@ -44,11 +44,10 @@
>> #include <asm/io.h>
>> #include <linux/mbus.h>
>>
>> +#include <asm/arch/soc.h>
>> #if defined(CONFIG_KIRKWOOD)
>> -#include <asm/arch/kirkwood.h>
>> #define SATAHC_BASE KW_SATA_BASE
>> #else
>> -#include <asm/arch/soc.h>
>> #define SATAHC_BASE MVEBU_AXP_SATA_BASE
>> #endif
>
> It might be a better idea to update these defines to be definitions
> for these in the soc.h. We're already doing this for some other
> peripheral blocks between mach-kirkwood and mach-mvebu. On the other
> hand SATAHC_BASE already achieves this so maybe it's not worth
> bothering.
I'm fine with this change for now. *If* we change something here, we
might make the step towards address probing via DT. But that's some
future work, if it's really worth it. As we most likely won't see new
platforms with new addresses to support any more.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood architecture
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:18 ` Stefan Roese
2019-04-11 12:10 ` Stefan Roese
2 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2019-04-04 15:18 UTC (permalink / raw)
To: u-boot
On 03.04.19 23:28, Michael Walle wrote:
> Fix the worng include and offset macros.
>
> Signed-off-by: Michael Walle <michael@walle.cc>
> ---
> drivers/ata/sata_mv.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
> index 87ea95f75d..b691107dc0 100644
> --- a/drivers/ata/sata_mv.c
> +++ b/drivers/ata/sata_mv.c
> @@ -44,11 +44,10 @@
> #include <asm/io.h>
> #include <linux/mbus.h>
>
> +#include <asm/arch/soc.h>
> #if defined(CONFIG_KIRKWOOD)
> -#include <asm/arch/kirkwood.h>
> #define SATAHC_BASE KW_SATA_BASE
> #else
> -#include <asm/arch/soc.h>
> #define SATAHC_BASE MVEBU_AXP_SATA_BASE
> #endif
>
> @@ -218,8 +217,8 @@ struct crqb {
> #define CRQB_SECTCOUNT_COUNT_EXP_MASK (0xff << 8)
> #define CRQB_SECTCOUNT_COUNT_EXP_SHIFT 8
>
> -#define MVSATA_WIN_CONTROL(w) (MVEBU_AXP_SATA_BASE + 0x30 + ((w) << 4))
> -#define MVSATA_WIN_BASE(w) (MVEBU_AXP_SATA_BASE + 0x34 + ((w) << 4))
> +#define MVSATA_WIN_CONTROL(w) (SATAHC_BASE + 0x30 + ((w) << 4))
> +#define MVSATA_WIN_BASE(w) (SATAHC_BASE + 0x34 + ((w) << 4))
>
> struct eprd {
> u32 phyaddr_low;
>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread* [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood architecture
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:18 ` Stefan Roese
@ 2019-04-11 12:10 ` Stefan Roese
2 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2019-04-11 12:10 UTC (permalink / raw)
To: u-boot
On 03.04.19 23:28, Michael Walle wrote:
> Fix the worng include and offset macros.
>
> Signed-off-by: Michael Walle <michael@walle.cc>
Applied to u-boot-marvell/master.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 3/4] sata: sata_mv: add orion-sata compatible string
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-03 21:28 ` [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood architecture Michael Walle
@ 2019-04-03 21:28 ` Michael Walle
2019-04-04 7:11 ` Chris Packham
` (2 more replies)
2019-04-03 21:28 ` [U-Boot] [PATCH 4/4] arm: kirkwood: lsxl: enable DM for SATA Michael Walle
2019-04-04 7:13 ` [U-Boot] [PATCH 0/4] ARM: " Chris Packham
4 siblings, 3 replies; 18+ messages in thread
From: Michael Walle @ 2019-04-03 21:28 UTC (permalink / raw)
To: u-boot
The kirkwood devices are compatible with this driver.
Signed-off-by: Michael Walle <michael@walle.cc>
---
drivers/ata/sata_mv.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index b691107dc0..2a630d46c1 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1079,6 +1079,7 @@ static int sata_mv_scan(struct udevice *dev)
static const struct udevice_id sata_mv_ids[] = {
{ .compatible = "marvell,armada-370-sata" },
+ { .compatible = "marvell,orion-sata" },
{ }
};
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [U-Boot] [PATCH 3/4] sata: sata_mv: add orion-sata compatible string
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
2 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2019-04-04 7:11 UTC (permalink / raw)
To: u-boot
On Thu, Apr 4, 2019 at 10:28 AM Michael Walle <michael@walle.cc> wrote:
>
> The kirkwood devices are compatible with this driver.
>
> Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
> ---
> drivers/ata/sata_mv.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
> index b691107dc0..2a630d46c1 100644
> --- a/drivers/ata/sata_mv.c
> +++ b/drivers/ata/sata_mv.c
> @@ -1079,6 +1079,7 @@ static int sata_mv_scan(struct udevice *dev)
>
> static const struct udevice_id sata_mv_ids[] = {
> { .compatible = "marvell,armada-370-sata" },
> + { .compatible = "marvell,orion-sata" },
> { }
> };
>
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread* [U-Boot] [PATCH 3/4] sata: sata_mv: add orion-sata compatible string
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
2 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2019-04-04 15:21 UTC (permalink / raw)
To: u-boot
On 03.04.19 23:28, Michael Walle wrote:
> The kirkwood devices are compatible with this driver.
>
> Signed-off-by: Michael Walle <michael@walle.cc>
> ---
> drivers/ata/sata_mv.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
> index b691107dc0..2a630d46c1 100644
> --- a/drivers/ata/sata_mv.c
> +++ b/drivers/ata/sata_mv.c
> @@ -1079,6 +1079,7 @@ static int sata_mv_scan(struct udevice *dev)
>
> static const struct udevice_id sata_mv_ids[] = {
> { .compatible = "marvell,armada-370-sata" },
> + { .compatible = "marvell,orion-sata" },
> { }
> };
>
>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread* [U-Boot] [PATCH 3/4] sata: sata_mv: add orion-sata compatible string
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
2 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2019-04-11 12:11 UTC (permalink / raw)
To: u-boot
On 03.04.19 23:28, Michael Walle wrote:
> The kirkwood devices are compatible with this driver.
>
> Signed-off-by: Michael Walle <michael@walle.cc>
Applied to u-boot-marvell/master.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 4/4] arm: kirkwood: lsxl: enable DM for SATA
2019-04-03 21:28 [U-Boot] [PATCH 0/4] ARM: kirkwood: lsxl: enable DM for SATA Michael Walle
` (2 preceding siblings ...)
2019-04-03 21:28 ` [U-Boot] [PATCH 3/4] sata: sata_mv: add orion-sata compatible string Michael Walle
@ 2019-04-03 21:28 ` Michael Walle
2019-04-04 15:26 ` Stefan Roese
2019-04-11 12:12 ` Stefan Roese
2019-04-04 7:13 ` [U-Boot] [PATCH 0/4] ARM: " Chris Packham
4 siblings, 2 replies; 18+ messages in thread
From: Michael Walle @ 2019-04-03 21:28 UTC (permalink / raw)
To: u-boot
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 */
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [U-Boot] [PATCH 4/4] arm: kirkwood: lsxl: enable DM for SATA
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
2019-04-11 12:12 ` Stefan Roese
1 sibling, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2019-04-04 15:26 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 18+ messages in thread* [U-Boot] [PATCH 4/4] arm: kirkwood: lsxl: enable DM for SATA
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
@ 2019-04-11 12:12 ` Stefan Roese
1 sibling, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2019-04-11 12:12 UTC (permalink / raw)
To: u-boot
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>
Applied to u-boot-marvell/master.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 0/4] ARM: kirkwood: lsxl: enable DM for SATA
2019-04-03 21:28 [U-Boot] [PATCH 0/4] ARM: kirkwood: lsxl: enable DM for SATA Michael Walle
` (3 preceding siblings ...)
2019-04-03 21:28 ` [U-Boot] [PATCH 4/4] arm: kirkwood: lsxl: enable DM for SATA Michael Walle
@ 2019-04-04 7:13 ` Chris Packham
4 siblings, 0 replies; 18+ messages in thread
From: Chris Packham @ 2019-04-04 7:13 UTC (permalink / raw)
To: u-boot
On Thu, Apr 4, 2019 at 10:28 AM Michael Walle <michael@walle.cc> wrote:
>
> Please note that this patchset depends on the following series:
> https://patchwork.ozlabs.org/cover/1055937/
> (ARM: kirkwood: migrate to DM_USB)
> https://patchwork.ozlabs.org/patch/1054403/
> (sata: sata_mv: Add DM support to enable CONFIG_BLK usage)
>
> Michael Walle (4):
> sata: sata_mv: use correct format specifier in debug()
> sata: sata_mv: support kirkwood architecture
> sata: sata_mv: add orion-sata compatible string
> arm: kirkwood: lsxl: enable DM for SATA
I've compile tested this. I don't have a spare SATA drive to actually
test it on my kirkwood board. I might be able to have a dig through my
pile of boards and cobble something together.
>
> configs/lschlv2_defconfig | 4 ++--
> configs/lsxhl_defconfig | 4 ++--
> drivers/ata/sata_mv.c | 10 +++++-----
> include/configs/lsxl.h | 23 ++++++++++-------------
> 4 files changed, 19 insertions(+), 22 deletions(-)
>
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread