Convert CONFIG_SYS_I2C_LEGACY to Kconfig and add CONFIG_[ST]PL_SYS_I2C_LEGACY

[platform/kernel/u-boot.git] / board / renesas / draak / draak.c

diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c
index 7d48cd1..71efeaf 100644 (file)
--- a/board/renesas/draak/draak.c
+++ b/board/renesas/draak/draak.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
@@ -37,7 +38,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_early_init_f(void)
 {
-#if defined(CONFIG_SYS_I2C) && defined(CONFIG_SYS_I2C_SH)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) && defined(CONFIG_SYS_I2C_SH)
        /* DVFS for reset */
        mstp_clrbits_le32(SMSTPCR9, SMSTPCR9, DVFS_MSTP926);
 #endif
@@ -53,9 +54,6 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
-       /* adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000;
-
        /* USB1 pull-up */
        setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);
 
@@ -71,23 +69,10 @@ int board_init(void)
 }
 
 #define RST_BASE       0xE6160000
-#define RST_CA57RESCNT (RST_BASE + 0x40)
 #define RST_CA53RESCNT (RST_BASE + 0x44)
-#define RST_RSTOUTCR   (RST_BASE + 0x58)
-#define RST_CA57_CODE  0xA5A5000F
 #define RST_CA53_CODE  0x5A5A000F
 
-void reset_cpu(ulong addr)
+void reset_cpu(void)
 {
-       unsigned long midr, cputype;
-
-       asm volatile("mrs %0, midr_el1" : "=r" (midr));
-       cputype = (midr >> 4) & 0xfff;
-
-       if (cputype == 0xd03)
-               writel(RST_CA53_CODE, RST_CA53RESCNT);
-       else if (cputype == 0xd07)
-               writel(RST_CA57_CODE, RST_CA57RESCNT);
-       else
-               hang();
+       writel(RST_CA53_CODE, RST_CA53RESCNT);
 }