global: Migrate CONFIG_MXC_UART_BASE to CFG

[platform/kernel/u-boot.git] / include / configs / socrates.h

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 11d8402..2b35be8 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -34,11 +34,6 @@
  * in the README.mpc85xxads.
  */
 
-/*
- * These can be toggled for performance analysis, otherwise use default.
- */
-#define CONFIG_L2_CACHE                        /* toggle L2 cache              */
-
 #define CFG_SYS_INIT_DBCR DBCR_IDM             /* Enable Debug Exceptions      */
 
 #undef CFG_SYS_DRAM_TEST                       /* memory test, takes time      */
@@ -47,9 +42,6 @@
 #define CFG_SYS_CCSRBAR_PHYS_LOW       CFG_SYS_CCSRBAR
 
 /* DDR Setup */
-
-#define CONFIG_MEM_INIT_VALUE  0xDeadBeef
-
 #define CFG_SYS_DDR_SDRAM_BASE 0x00000000
 #define CFG_SYS_SDRAM_BASE             CFG_SYS_DDR_SDRAM_BASE
 
@@ -119,7 +111,7 @@
 #define CFG_SYS_BOOTMAPSZ      (8 << 20)       /* Initial Memory map for Linux */
 
 
-#define        CONFIG_EXTRA_ENV_SETTINGS                                       \
+#define        CFG_EXTRA_ENV_SETTINGS                                  \
        "netdev=eth0\0"                                                 \
        "consdev=ttyS0\0"                                               \
        "uboot_file=/home/tftp/syscon3/u-boot.bin\0"                    \