global: Move remaining CONFIG_SYS_NAND_* to CFG_SYS_NAND_*

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

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 498deb4..388a4e4 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -78,8 +78,6 @@
 /*
  * Flash on the LocalBus
  */
-#define CONFIG_SYS_LBC_CACHE_BASE      0xf0000000      /* Localbus cacheable    */
-
 #define CONFIG_SYS_FLASH0              0xFE000000
 #define CONFIG_SYS_FLASH1              0xFC000000
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH1, CONFIG_SYS_FLASH0 }
@@ -92,25 +90,19 @@
 #define CONFIG_SYS_LBC_LSRT            0x20000000    /* LB sdram refresh timer */
 #define CONFIG_SYS_LBC_MRTPR           0x20000000    /* LB refresh timer presc.*/
 
-#define CONFIG_SYS_INIT_RAM_LOCK       1
 #define CONFIG_SYS_INIT_RAM_ADDR       0xe4010000      /* Initial RAM address  */
 #define CONFIG_SYS_INIT_RAM_SIZE       0x4000          /* Size used area in RAM*/
 
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
-#define CONFIG_SYS_MONITOR_LEN         (384 * 1024)    /* Reserve 384KiB for Mon */
-
 /* FPGA and NAND */
 #define CONFIG_SYS_FPGA_BASE           0xc0000000
 #define CONFIG_SYS_FPGA_SIZE           0x00100000      /* 1 MB         */
-#define CONFIG_SYS_HMI_BASE            0xc0010000
 
-#define CONFIG_SYS_NAND_BASE           (CONFIG_SYS_FPGA_BASE + 0x70)
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define CFG_SYS_NAND_BASE              (CONFIG_SYS_FPGA_BASE + 0x70)
 
 /* LIME GDC */
 #define CONFIG_SYS_LIME_BASE           0xc8000000
-#define CONFIG_SYS_LIME_SIZE           0x04000000      /* 64 MB        */
 
 /*
  * General PCI
@@ -141,13 +133,6 @@
 /* Options are: TSEC[0,1] */
 
 /*
- * Environment
- */
-
-#define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
-#define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
-
-/*
  * Miscellaneous configurable options
  */