Convert CONFIG_SHOW_BOOT_PROGRESS to Kconfig

[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 d779297..146a30b 100644 (file)
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/configs/rcar-gen2-common.h
  *
  * Copyright (C) 2013,2014 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0
  */
 
 #ifndef __RCAR_GEN2_COMMON_H
@@ -14,30 +13,29 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
 
-#undef CONFIG_SHOW_BOOT_PROGRESS
+#ifdef CONFIG_SPL
+#define CONFIG_SPL_TARGET      "spl/u-boot-spl.srec"
+#endif
 
 #define CONFIG_ARCH_CPU_INIT
 
-#define CONFIG_TMU_TIMER
+#ifndef CONFIG_PINCTRL_PFC
 #define CONFIG_SH_GPIO_PFC
+#endif
 
 /* console */
-
-#define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PBSIZE              256
 #define CONFIG_SYS_BAUDRATE_TABLE      { 38400, 115200 }
 
 #define CONFIG_SYS_SDRAM_BASE          (RCAR_GEN2_SDRAM_BASE)
 #define CONFIG_SYS_SDRAM_SIZE          (RCAR_GEN2_UBOOT_SDRAM_SIZE)
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x7fc0)
-#define CONFIG_NR_DRAM_BANKS           1
+#define CONFIG_SYS_LOAD_ADDR           0x50000000
+#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 #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
@@ -49,4 +47,18 @@
 #define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE_REDUND (CONFIG_SYS_MONITOR_LEN)
 
+/* 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
+
+/* Timer */
+#define CONFIG_TMU_TIMER
+#define CONFIG_SYS_TIMER_COUNTS_DOWN
+#define CONFIG_SYS_TIMER_COUNTER       (TMU_BASE + 0xc)        /* TCNT0 */
+#define CONFIG_SYS_TIMER_RATE          (CONFIG_SYS_CLK_FREQ / 8)
+
 #endif /* __RCAR_GEN2_COMMON_H */