Merge git://git.denx.de/u-boot-socfpga

[platform/kernel/u-boot.git] / include / configs / rcar-gen2-common.h

diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 01583f8..7f72ff2 100644 (file)
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_MONITOR_BASE                0x00000000
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (1 * 1024 * 1024)
-#define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
 
 /* ENV setting */
 #define CONFIG_ENV_ADDR        0xC0000
@@ -53,6 +52,8 @@
 /* SF MTD */
 #if defined(CONFIG_SPI_FLASH_MTD) && !defined(CONFIG_SPL_BUILD)
 #else
+#undef CONFIG_DM_SPI
+#undef CONFIG_DM_SPI_FLASH
 #undef CONFIG_SPI_FLASH_MTD
 #endif
 
@@ -60,6 +61,6 @@
 #define CONFIG_TMU_TIMER
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 #define CONFIG_SYS_TIMER_COUNTER       (TMU_BASE + 0xc)        /* TCNT0 */
-#define CONFIG_SYS_TIMER_RATE          (32500000 / 4)          /* CP/4 */
+#define CONFIG_SYS_TIMER_RATE          (CONFIG_SYS_CLK_FREQ / 8)
 
 #endif /* __RCAR_GEN2_COMMON_H */