[U-Boot] [PATCH 2/3 v2] dreamplug: switch from NAND flash to SPI flash.

[u-boot at lakedaemon.net]

From: Jason Cooper <u-boot at lakedaemon.net>

MPP._SPI_ configuration copied from
boards/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c

Signed-off-by: Jason Cooper <u-boot at lakedaemon.net>
---
 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
-- 
1.7.0.4