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

[karo-tx-uboot.git] / include / configs / PATI.h

diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index b07cac11f4249ae717a374f686a92a3b4362145a..bf39d0040e95ab0802241828a054e63b1a3e26a1 100644 (file)
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -132,9 +132,8 @@
  * Definitions for initial stack pointer and data area
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       (CONFIG_SYS_IMMR + 0x003f9800)  /* Physical start adress of internal MPC555 writable RAM */
-#define        CONFIG_SYS_INIT_RAM_END (CONFIG_SYS_IMMR + 0x003fffff)  /* Physical end adress of internal MPC555 used RAM area */
-#define        CONFIG_SYS_GBL_DATA_SIZE        128                     /* Size in bytes reserved for initial global data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     ((CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_INIT_RAM_ADDR) - CONFIG_SYS_GBL_DATA_SIZE) /* Offset from the beginning of ram */
+#define        CONFIG_SYS_INIT_RAM_SIZE        (CONFIG_SYS_IMMR + 0x003fffff)  /* Physical end adress of internal MPC555 used RAM area */
+#define CONFIG_SYS_GBL_DATA_OFFSET     ((CONFIG_SYS_INIT_RAM_SIZE - CONFIG_SYS_INIT_RAM_ADDR) - GENERATED_GBL_DATA_SIZE) /* Offset from the beginning of ram */
 #define        CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_IMMR + 0x03fa000)   /* Physical start adress of inital stack */
 /*
  * Start addresses for the final memory configuration
@@ -169,11 +168,16 @@
  *
  */
 
-#define CONFIG_SYS_MAX_FLASH_BANKS             1               /* Max number of memory banks           */
-#define CONFIG_SYS_MAX_FLASH_SECT              128             /* Max number of sectors on one chip    */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    180000          /* Timeout for Flash Erase (in ms)      */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    600             /* Timeout for Flash Write (in ms)      */
+#define CONFIG_SYS_FLASH_PROTECTION
+#define CONFIG_SYS_FLASH_EMPTY_INFO
 
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
+
+#define CONFIG_FLASH_SHOW_PROGRESS     45
+
+#define CONFIG_SYS_MAX_FLASH_BANKS     1
+#define CONFIG_SYS_MAX_FLASH_SECT      128
 
 #define        CONFIG_ENV_IS_IN_EEPROM
 #ifdef CONFIG_ENV_IS_IN_EEPROM