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

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

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index b0bd0508bb7702fbc944404c26d81b9c432bfe30..2783f9e04ea0c9e63044e50320c798ad4777b4d3 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -64,7 +64,6 @@
  */
 #define CONFIG_L2_CACHE                                /* toggle L2 cache             */
 #define  CONFIG_BTB                            /* toggle branch predition */
-#define  CONFIG_ADDR_STREAMING                 /* toggle addr streaming        */
 
 #define CONFIG_BOARD_EARLY_INIT_F   1          /* Call board_pre_init   */
 
@@ -164,7 +163,6 @@
 #define CONFIG_SYS_LBC_LSDMR_4         0x1861b723
 #define CONFIG_SYS_LBC_LSDMR_5         0x4061b723
 
-#define CONFIG_L1_INIT_RAM
 #define CONFIG_SYS_INIT_RAM_LOCK       1
 #define CONFIG_SYS_INIT_RAM_ADDR       0x60000000      /* Initial RAM address  */
 #define CONFIG_SYS_INIT_RAM_END        0x4000          /* End of used area in RAM */
@@ -365,7 +363,7 @@
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #else
     #define CONFIG_CMD_ELF