xtensa: clean up CONFIG_SYS_TEXT_ADDR

[people/ms/u-boot.git] / include / configs / xtfpga.h

diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index b1aa57935dd4e92b157a7d81560909594bbfe6a5..496f3772d5d7a54bb344e86a780f6908c6199fe7 100644 (file)
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -98,9 +98,8 @@
 #define CONFIG_SYS_MEMORY_SIZE         CONFIG_SYS_SDRAM_SIZE
 #endif
 
-#define CONFIG_SYS_MEMORY_TOP          MEMADDR(CONFIG_SYS_MEMORY_SIZE)
-#define CONFIG_SYS_TEXT_ADDR           \
-       (CONFIG_SYS_MEMORY_TOP - CONFIG_SYS_MONITOR_LEN)
+#define XTENSA_SYS_TEXT_ADDR           \
+       (MEMADDR(CONFIG_SYS_MEMORY_SIZE) - CONFIG_SYS_MONITOR_LEN)
 
 /* Used by tftpboot; env var 'loadaddr' */
 #define CONFIG_SYS_LOAD_ADDR           MEMADDR(0x02000000)
@@ -115,38 +114,19 @@
 #define CONFIG_BOOTFILE                        "uImage"
        /* Console I/O Buffer Size  */
 #define CONFIG_SYS_CBSIZE              1024
-       /* Prt buf */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                        sizeof(CONFIG_SYS_PROMPT) + 16)
-       /* max number of command args */
-#define CONFIG_SYS_MAXARGS             16
        /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-/*=================*/
-/* U-Boot commands */
-/*=================*/
-
-#define CONFIG_CMD_DIAG
-#define CONFIG_CMD_SAVES
-
 /*==============================*/
 /* U-Boot autoboot configuration */
 /*==============================*/
 
-#define CONFIG_BOOT_RETRY_TIME         60      /* retry after 60 secs */
-
 #define CONFIG_AUTO_COMPLETE                   /* Support tab autocompletion */
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 #define CONFIG_SHOW_BOOT_PROGRESS
 
-#ifdef DEBUG
-#define CONFIG_PANIC_HANG              1       /* Require manual reboot */
-#endif
-
 
 /*=========================================*/
 /* FPGA Registers (board info and control) */
@@ -252,7 +232,6 @@
  * Put environment in top block (64kB)
  * Another option would be to put env. in 2nd param block offs 8KB, size 8KB
  */
-#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OFFSET    (CONFIG_SYS_FLASH_SIZE - CONFIG_SYS_FLASH_SECT_SZ)
 #define CONFIG_ENV_SIZE             CONFIG_SYS_FLASH_SECT_SZ