Merge branch '2019-03-25-master-imports'

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

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index dd950f3..3f84fab 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -60,7 +60,6 @@
 #define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_CCSRBAR
 
 /* DDR Setup */
-#undef CONFIG_FSL_DDR_INTERACTIVE
 #define CONFIG_SPD_EEPROM              /* Use SPD EEPROM for DDR setup */
 #define CONFIG_DDR_SPD
 
@@ -109,9 +108,6 @@
 #define CONFIG_SYS_BR1_PRELIM          0xfc001001      /* port size 16bit      */
 #define CONFIG_SYS_OR1_PRELIM          0xfe000030      /* 32MB Flash           */
 
-#define CONFIG_SYS_FLASH_CFI                           /* flash is CFI compat. */
-#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver*/
-
 #define CONFIG_SYS_MAX_FLASH_BANKS     2               /* number of banks      */
 #define CONFIG_SYS_MAX_FLASH_SECT      256             /* sectors per device   */
 #undef CONFIG_SYS_FLASH_CHECKSUM