From patchwork Wed Apr 3 21:28:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 1076453 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=walle.cc Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=walle.cc header.i=@walle.cc header.b="AWJvQozJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44ZK49653Zz9sRt for ; Thu, 4 Apr 2019 08:30:17 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7551BC21EC2; Wed, 3 Apr 2019 21:29:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7D6B9C21E1D; Wed, 3 Apr 2019 21:28:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4B5C2C21DDC; Wed, 3 Apr 2019 21:28:48 +0000 (UTC) Received: from ssl.serverraum.org (ssl.serverraum.org [176.9.125.105]) by lists.denx.de (Postfix) with ESMTPS id 30DA2C21DEC for ; Wed, 3 Apr 2019 21:28:47 +0000 (UTC) Received: from apollo.fritz.box (unknown [IPv6:2a02:810c:c200:2e91:6257:18ff:fec4:ca34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id B33AF22E08; Wed, 3 Apr 2019 23:28:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1554326926; bh=0SSNqX4C1wppSfdgsK37mPuFdDkgrzewHJuirr0Gnak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AWJvQozJ314EbB1lqhucRM9E4wFRq45CvgbYPQLYTNQy1cf9t6STDuWTzqrkq7Fpz QWoRj0mShSaa1V8YY1pXH59WzyYIoAkV5cdiFTbC0aX9ChQEBxlT2BDH8ZxNkWlMdk 8sTPkmAlcULowlHUp5cHYpv/V47IHMPbFUtU5dV0= From: Michael Walle To: u-boot@lists.denx.de Date: Wed, 3 Apr 2019 23:28:28 +0200 Message-Id: <20190403212831.29886-2-michael@walle.cc> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190403212831.29886-1-michael@walle.cc> References: <20190403212831.29886-1-michael@walle.cc> X-Virus-Scanned: clamav-milter 0.100.2 at web X-Virus-Status: Clean Cc: Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH 1/4] sata: sata_mv: use correct format specifier in debug() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This fixes a compile error on kirkwood. Signed-off-by: Michael Walle Reviewed-by: Chris Packham Reviewed-by: Stefan Roese --- 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; From patchwork Wed Apr 3 21:28:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 1076452 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=walle.cc Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=walle.cc header.i=@walle.cc header.b="fhoAOW34"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44ZK3C3LP5z9sRt for ; Thu, 4 Apr 2019 08:29:27 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 26BB1C21E3A; Wed, 3 Apr 2019 21:29:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1B75FC21E74; Wed, 3 Apr 2019 21:28:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3AABFC21DFB; Wed, 3 Apr 2019 21:28:48 +0000 (UTC) Received: from ssl.serverraum.org (ssl.serverraum.org [176.9.125.105]) by lists.denx.de (Postfix) with ESMTPS id 7F6D0C21DDC for ; Wed, 3 Apr 2019 21:28:47 +0000 (UTC) Received: from apollo.fritz.box (unknown [IPv6:2a02:810c:c200:2e91:6257:18ff:fec4:ca34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id 0BC2F22F16; Wed, 3 Apr 2019 23:28:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1554326927; bh=dHXqEUFUPWsO0f7SMQUdlbA81C9qE19eqkn3+lyYirU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fhoAOW34Pjln9G4yl31od4bqFc4ITQ2hE3HS+lB5oSpWoCCFWnE9e695AJc9aR297 z6uGr6LyZEeKLj7Y61vBSWNa+zC618LdJ/JCMkm23kDOl0zdp5qzkNiXlkFL4Vr6e6 OLXEzh4sWyIv8uNEay28L55bLDxBD0EU3YQlemhw= From: Michael Walle To: u-boot@lists.denx.de Date: Wed, 3 Apr 2019 23:28:29 +0200 Message-Id: <20190403212831.29886-3-michael@walle.cc> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190403212831.29886-1-michael@walle.cc> References: <20190403212831.29886-1-michael@walle.cc> X-Virus-Scanned: clamav-milter 0.100.2 at web X-Virus-Status: Clean Cc: Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood architecture X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Fix the worng include and offset macros. Signed-off-by: Michael Walle Reviewed-by: Stefan Roese --- 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 #include +#include #if defined(CONFIG_KIRKWOOD) -#include #define SATAHC_BASE KW_SATA_BASE #else -#include #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; From patchwork Wed Apr 3 21:28:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 1076454 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=walle.cc Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=walle.cc header.i=@walle.cc header.b="Ha224AIu"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44ZK4G1Lnzz9sSS for ; Thu, 4 Apr 2019 08:30:21 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BE908C21E36; Wed, 3 Apr 2019 21:29:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 00A7AC21E9F; Wed, 3 Apr 2019 21:28:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 55B1AC21DFD; Wed, 3 Apr 2019 21:28:48 +0000 (UTC) Received: from ssl.serverraum.org (ssl.serverraum.org [176.9.125.105]) by lists.denx.de (Postfix) with ESMTPS id BA1CAC21C4A for ; Wed, 3 Apr 2019 21:28:47 +0000 (UTC) Received: from apollo.fritz.box (unknown [IPv6:2a02:810c:c200:2e91:6257:18ff:fec4:ca34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id 4FAC722F2C; Wed, 3 Apr 2019 23:28:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1554326927; bh=QveBN7EdNJGOlTC6esrw6MXavZMj6FqPZoismOKbnWc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ha224AIuw3QUnPoCGUP8bFKwQSovQR8lN6mJGVquG7oBQtMaRWU9LaihKpvuUIxfa DZVTF+lP7J+5s9fyJ+t/pZFs9lrcdLFCyED7vAdtuuHkSWbZennx+CyAuYY29tcH38 nRmel45+Wbh6HXAjoqtRUEmWMGNIsTQmbkOvkQtc= From: Michael Walle To: u-boot@lists.denx.de Date: Wed, 3 Apr 2019 23:28:30 +0200 Message-Id: <20190403212831.29886-4-michael@walle.cc> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190403212831.29886-1-michael@walle.cc> References: <20190403212831.29886-1-michael@walle.cc> X-Virus-Scanned: clamav-milter 0.100.2 at web X-Virus-Status: Clean Cc: Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH 3/4] sata: sata_mv: add orion-sata compatible string X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The kirkwood devices are compatible with this driver. Signed-off-by: Michael Walle Reviewed-by: Chris Packham Reviewed-by: Stefan Roese --- 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" }, { } }; From patchwork Wed Apr 3 21:28:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 1076457 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=walle.cc Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=walle.cc header.i=@walle.cc header.b="jeUl32dv"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44ZK4X3sjrz9sSW for ; Thu, 4 Apr 2019 08:30:36 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id F4231C21E30; Wed, 3 Apr 2019 21:29:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 72970C21EB4; Wed, 3 Apr 2019 21:28:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 74DF1C21DFA; Wed, 3 Apr 2019 21:28:48 +0000 (UTC) Received: from ssl.serverraum.org (ssl.serverraum.org [176.9.125.105]) by lists.denx.de (Postfix) with ESMTPS id 0CCE9C21DFA for ; Wed, 3 Apr 2019 21:28:48 +0000 (UTC) Received: from apollo.fritz.box (unknown [IPv6:2a02:810c:c200:2e91:6257:18ff:fec4:ca34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id 9CDFD22F2D; Wed, 3 Apr 2019 23:28:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1554326927; bh=gD4fekppY1kNI7m0DEICLLwWbPT5ZSlgbzWitOJ3rsU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jeUl32dv3G3fVYXLZmxpS9iiJvGUF79vLIMRH6qI7s0R4QXHOUZfETpVzSZWHUjpe gr4Hzjnjcwsa8EJOs4y4dsrzshU2r0Y8NOg97qLbJkipEF7ApDKoBuvHCtp/X0G9Kk gixr8SLIUjJ6maXFNoAhL+zInXpJWWeK7jS4CQLQ= From: Michael Walle To: u-boot@lists.denx.de Date: Wed, 3 Apr 2019 23:28:31 +0200 Message-Id: <20190403212831.29886-5-michael@walle.cc> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190403212831.29886-1-michael@walle.cc> References: <20190403212831.29886-1-michael@walle.cc> X-Virus-Scanned: clamav-milter 0.100.2 at web X-Virus-Status: Clean Cc: Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH 4/4] arm: kirkwood: lsxl: enable DM for SATA X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Switch from legacy IDE driver to sata_mv driver. Signed-off-by: Michael Walle Reviewed-by: Stefan Roese --- 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 */