[PATCH] Update AMCC Yucca 440SPe eval board support

[u-boot] / include / configs / dnp1110.h

diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index 5a7642b0c66a456ba0efbac477c98d9058eb971c..9ac2856f65317e1c48de73fc9ad730fb5c348f1d 100644 (file)
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -31,8 +31,8 @@
  * If we are developing, we might want to start armboot from ram
  * so we MUST NOT initialize critical regs like mem-timing ...
  */
-#define CONFIG_INIT_CRITICAL           /* undef for developing */
-#undef CONFIG_INIT_CRITICAL            /* undef for developing */
+#define CONFIG_SKIP_LOWLEVEL_INIT      1
+#undef  CONFIG_SKIP_RELOCATE_UBOOT
 
 /*
  * High Level Configuration Options
@@ -47,6 +47,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
@@ -76,7 +77,7 @@
 #define CONFIG_NETMASK          255.255.0.0
 #define CONFIG_IPADDR          172.22.2.23
 #define CONFIG_SERVERIP                172.22.2.22
-#define CONFIG_BOOTFILE                "elinos-dnp1110"
+#define CONFIG_BOOTFILE                "dnp1110"
 #define CONFIG_BOOTCOMMAND     "tftp; bootm"
 
 #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
@@ -128,21 +129,23 @@
 
 #define PHYS_FLASH_1           0x00000000 /* Flash Bank #1 */
 #define PHYS_FLASH_SIZE                0x01000000 /* 16 MB */
+#define PHYS_FLASH_BANK_SIZE    0x01000000 /* 32 MB Banks */
+#define PHYS_FLASH_SECT_SIZE    0x00020000 /* 256 KB sectors (x2) */
 
 #define CFG_FLASH_BASE         PHYS_FLASH_1
 
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-#define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */
-#define CFG_MAX_FLASH_SECT     (31+8)  /* max number of sectors on one chip    */
+#define CFG_MAX_FLASH_BANKS    1               /* max number of memory banks           */
+#define CFG_MAX_FLASH_SECT     128             /* max number of sectors on one chip    */
 
 /* timeout values are in ticks */
 #define CFG_FLASH_ERASE_TOUT   (2*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #define        CFG_ENV_IS_IN_FLASH     1
-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x1C000)        /* Addr of Environment Sector   */
-#define CFG_ENV_SIZE           0x4000  /* Total Size of Environment Sector     */
+#define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0xF80000)       /* Addr of Environment Sector   */
+#define CFG_ENV_SIZE                   0x20000                                         /* Total Size of Environment Sector     */
 
 #endif /* __CONFIG_H */