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

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

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 6585298..f27f665 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -59,8 +59,6 @@
 #define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
 
 /* FLASH */
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_SYS_FLASH_CFI
 #undef CONFIG_SYS_FLASH_QUIET_TEST
 #define CONFIG_SYS_FLASH_EMPTY_INFO
 #define CONFIG_SYS_FLASH_BASE          (SH7785LCR_FLASH_BASE_1)
@@ -75,7 +73,6 @@
 #define CONFIG_SYS_FLASH_LOCK_TOUT     (3 * 1000)
 #define CONFIG_SYS_FLASH_UNLOCK_TOUT   (3 * 1000)
 
-#undef CONFIG_SYS_FLASH_PROTECTION
 #undef CONFIG_SYS_DIRECT_FLASH_TFTP
 
 /* R8A66597 */
@@ -126,7 +123,6 @@
 /* Board Clock */
 /* The SCIF used external clock. system clock only used timer. */
 #define CONFIG_SYS_CLK_FREQ    50000000
-#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
 
 #endif /* __SH7785LCR_H */