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

[platform/kernel/u-boot.git] / include / configs / at91sam9260ek.h

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 137d7f0..95710fb 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -53,7 +53,6 @@
  * SDRAM: 1 bank, min 32, max 128 MB
  * Initialized before u-boot gets started.
  */
-#define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_SYS_SDRAM_BASE          ATMEL_BASE_CS1
 #define CONFIG_SYS_SDRAM_SIZE          0x04000000
 
@@ -90,7 +89,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
@@ -120,7 +118,6 @@
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0:0; " \
                                "sf read 0x22000000 0x84000 0x294000; " \
                                "bootm 0x22000000"
@@ -130,7 +127,6 @@
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0:1; " \
                                "sf read 0x22000000 0x84000 0x294000; " \
                                "bootm 0x22000000"