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 9d80ce41324fbda6a9f7c74d3fe31b7f343dca5d..bf39d0040e95ab0802241828a054e63b1a3e26a1 100644 (file)
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -33,6 +33,9 @@
 
 #define CONFIG_MPC555          1               /* This is an MPC555 CPU                */
 #define CONFIG_PATI            1               /* ...On a PATI board   */
+
+#define        CONFIG_SYS_TEXT_BASE    0xFFF00000
+
 /* Serial Console Configuration */
 #define        CONFIG_5xx_CONS_SCI1
 #undef CONFIG_5xx_CONS_SCI2
@@ -57,7 +60,7 @@
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_LOADS
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_CONSOLE
@@ -129,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
@@ -144,7 +146,7 @@
 #define PLD_CONFIG_BASE                0x04001000      /* PLD  (CS3) */
 
 #define        CONFIG_SYS_MONITOR_BASE 0xFFF00000
-/* CONFIG_SYS_FLASH_BASE       */ /* TEXT_BASE is defined in the board config.mk file. */
+/* CONFIG_SYS_FLASH_BASE       */ /* CONFIG_SYS_TEXT_BASE is defined in the board config.mk file.      */
                                                /* This adress is given to the linker with -Ttext to    */
                                                /* locate the text section at this adress.              */
 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 192 kB for Monitor                           */
@@ -166,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
@@ -283,16 +290,6 @@
  */
 #define CONFIG_SYS_DER                 0x00000000
 
-
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define        BOOTFLAG_COLD   0x01                    /* Normal Power-On: Boot from FLASH     */
-#define BOOTFLAG_WARM  0x02                    /* Software reboot                      */
-
-
 #define VERSION_TAG "released"
 #define CONFIG_ISO_STRING "MEV-10084-001"