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

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

diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 779d373a5438261e94d50a649ce304dda4fef274..f824158a6975025e23e78182f6619b4d36570b9f 100644 (file)
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -55,7 +55,6 @@
 #define CONFIG_ENV_OFFSET              0x4000
 #define CONFIG_ENV_SECT_SIZE   0x2000
 #define CONFIG_ENV_IS_IN_FLASH 1
-#define CONFIG_ENV_IS_EMBEDDED 1
 #else
 #define CONFIG_ENV_ADDR                0xffe04000
 #define CONFIG_ENV_SECT_SIZE   0x2000
@@ -194,12 +193,18 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
 
-/*-----------------------------------------------------------------------
+/*
  * FLASH organization
  */
-#define CONFIG_SYS_MAX_FLASH_BANKS     1       /* max number of memory banks           */
-#define CONFIG_SYS_MAX_FLASH_SECT      11      /* max number of sectors on one chip    */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    1000
+#define CONFIG_SYS_FLASH_CFI
+#ifdef CONFIG_SYS_FLASH_CFI
+#      define CONFIG_FLASH_CFI_DRIVER  1
+#      define CONFIG_SYS_FLASH_SIZE            0x800000        /* Max size that the board might have */
+#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_16BIT
+#      define CONFIG_SYS_MAX_FLASH_BANKS       1       /* max number of memory banks */
+#      define CONFIG_SYS_MAX_FLASH_SECT        137     /* max number of sectors on one chip */
+#      define CONFIG_SYS_FLASH_PROTECTION      /* "Real" (hardware) sectors protection */
+#endif
 
 /*-----------------------------------------------------------------------
  * Cache Configuration