From patchwork Mon Jun 6 12:34:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: u-boot@lakedaemon.net X-Patchwork-Id: 98874 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id CBAB6B6FB9 for ; Mon, 6 Jun 2011 22:35:00 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 642E428124; Mon, 6 Jun 2011 14:34:52 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rkay5N1tHt41; Mon, 6 Jun 2011 14:34:52 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DC64B28119; Mon, 6 Jun 2011 14:34:46 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 77B4528119 for ; Mon, 6 Jun 2011 14:34:44 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1wA56wtxxLcX for ; Mon, 6 Jun 2011 14:34:43 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mho-02-ewr.mailhop.org (mho-04-ewr.mailhop.org [204.13.248.74]) by theia.denx.de (Postfix) with ESMTPS id 04ACB2810D for ; Mon, 6 Jun 2011 14:34:38 +0200 (CEST) Received: from pool-108-17-158-236.nrflva.fios.verizon.net ([108.17.158.236] helo=titan) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1QTZ0v-000O8v-E3; Mon, 06 Jun 2011 12:34:37 +0000 Received: from localhost.localdomain (triton.lakedaemon.net [10.16.5.101]) by titan (Postfix) with ESMTP id D8DAD2261CB; Mon, 6 Jun 2011 08:34:36 -0400 (EDT) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 108.17.158.236 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+9QjP3XSCR+kRrihZMJxCwiRg+E+G2O1o= From: u-boot@lakedaemon.net To: u-boot@lists.denx.de Date: Mon, 6 Jun 2011 12:34:08 +0000 Message-Id: <6329e9f06c62ebc7e3e21a74961dd59b3a7f13c9.1307363293.git.u-boot@lakedaemon.net> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: Subject: [U-Boot] [PATCH 2/3 v2] dreamplug: switch from NAND flash to SPI flash. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Jason Cooper MPP._SPI_ configuration copied from boards/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c Signed-off-by: Jason Cooper --- board/Marvell/dreamplug/dreamplug.c | 18 +++++++++--------- board/Marvell/dreamplug/kwbimage.cfg | 4 +--- include/configs/dreamplug.h | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c index 32d82ba..6442396 100644 --- a/board/Marvell/dreamplug/dreamplug.c +++ b/board/Marvell/dreamplug/dreamplug.c @@ -43,14 +43,14 @@ int board_early_init_f(void) /* Multi-Purpose Pins Functionality configuration */ u32 kwmpp_config[] = { - MPP0_NF_IO2, - MPP1_NF_IO3, - MPP2_NF_IO4, - MPP3_NF_IO5, - MPP4_NF_IO6, - MPP5_NF_IO7, + MPP0_SPI_SCn, + MPP1_SPI_MOSI, + MPP2_SPI_SCK, + MPP3_SPI_MISO, + MPP4_GPIO, + MPP5_GPO, MPP6_SYSRST_OUTn, - MPP7_GPO, /* GPIO_RST */ + MPP7_SPI_SCn, MPP8_TW_SDA, MPP9_TW_SCK, MPP10_UART0_TXD, @@ -61,8 +61,8 @@ int board_early_init_f(void) MPP15_SD_D1, MPP16_SD_D2, MPP17_SD_D3, - MPP18_NF_IO0, - MPP19_NF_IO1, + MPP18_GPO, + MPP19_GPO, MPP20_GE1_0, MPP21_GE1_1, MPP22_GE1_2, diff --git a/board/Marvell/dreamplug/kwbimage.cfg b/board/Marvell/dreamplug/kwbimage.cfg index 2afd927..ae76b32 100644 --- a/board/Marvell/dreamplug/kwbimage.cfg +++ b/board/Marvell/dreamplug/kwbimage.cfg @@ -26,9 +26,7 @@ # # Boot Media configurations -BOOT_FROM nand -NAND_ECC_MODE default -NAND_PAGE_SIZE 0x0800 +BOOT_FROM spi # SOC registers configuration using bootrom header extension # Maximum KWBIMAGE_MAX_CONFIG configurations allowed diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 7b494cc..bf477b2 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -47,7 +47,7 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_FAT -#define CONFIG_CMD_NAND +#define CONFIG_CMD_SF #define CONFIG_CMD_PING #define CONFIG_CMD_USB #define CONFIG_CMD_IDE