Merge branch 'master' of git://git.denx.de/u-boot-spi

[oweals/u-boot.git] / include / configs / corvus.h

diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 61b014638e43ae13b4a38cf425169bc571018b69..749a67d4b0852c2036933259b451fe3148f9fe8c 100644 (file)
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -55,7 +55,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 
 /* SDRAM */
-#define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_CS6
 #define CONFIG_SYS_SDRAM_SIZE          0x08000000
 
@@ -64,7 +63,6 @@
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_NAND_ATMEL
 #define CONFIG_SYS_MAX_NAND_DEVICE             1
 #define CONFIG_SYS_NAND_BASE                   ATMEL_BASE_CS3
 #define CONFIG_SYS_NAND_DBW_8
@@ -82,9 +80,6 @@
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_AT91_WANTS_COMMON_PHY
 
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-
 /* DFU class support */
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE   (SZ_1M)
 #define DFU_MANIFEST_POLL_TIMEOUT      25000
@@ -144,4 +139,7 @@
 #define CONFIG_SYS_MCKR                        0x1301
 #define CONFIG_SYS_MCKR_CSS            0x1302
 
+#define CONFIG_SPL_PAD_TO              CONFIG_SYS_NAND_U_BOOT_OFFS
+#define CONFIG_SYS_SPL_LEN             CONFIG_SPL_PAD_TO
+
 #endif