Convert CONFIG_SYS_I2C_LEGACY to Kconfig and add CONFIG_[ST]PL_SYS_I2C_LEGACY

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

diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 9785107..1477750 100644 (file)
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -7,13 +7,17 @@
  */
 
 #include <common.h>
+#include <image.h>
+#include <init.h>
 #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>
 #include <asm/io.h>
+#include <linux/bitops.h>
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
@@ -26,16 +30,12 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void s_init(void)
-{
-}
-
 #define DVFS_MSTP926           BIT(26)
 #define HSUSB_MSTP704          BIT(4)  /* HSUSB */
 
 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
@@ -51,9 +51,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);
 
@@ -68,21 +65,6 @@ int board_init(void)
        return 0;
 }
 
-int dram_init(void)
-{
-       if (fdtdec_setup_mem_size_base() != 0)
-               return -EINVAL;
-
-       return 0;
-}
-
-int dram_init_banksize(void)
-{
-       fdtdec_setup_memory_banksize();
-
-       return 0;
-}
-
 #ifdef CONFIG_MULTI_DTB_FIT
 int board_fit_config_name_match(const char *name)
 {
@@ -90,15 +72,15 @@ int board_fit_config_name_match(const char *name)
        u32 cpu_type = rmobile_get_cpu_type();
 
        if ((cpu_type == RMOBILE_CPU_TYPE_R8A7795) &&
-           !strcmp(name, "r8a7795-h3ulcb-u-boot"))
+           !strcmp(name, "r8a77950-ulcb-u-boot"))
                return 0;
 
        if ((cpu_type == RMOBILE_CPU_TYPE_R8A7796) &&
-           !strcmp(name, "r8a7796-m3ulcb-u-boot"))
+           !strcmp(name, "r8a77960-ulcb-u-boot"))
                return 0;
 
        if ((cpu_type == RMOBILE_CPU_TYPE_R8A77965) &&
-           !strcmp(name, "r8a77965-m3nulcb-u-boot"))
+           !strcmp(name, "r8a77965-ulcb-u-boot"))
                return 0;
 
        return -1;