Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index 1db08fc..91c3728 100644 (file)
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <cpu_func.h>
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
@@ -69,41 +70,6 @@ int board_init(void)
        return 0;
 }
 
-/*
- * If the firmware passed a device tree use it for U-Boot DRAM setup.
- */
-extern u64 rcar_atf_boot_args[];
-
-int dram_init(void)
-{
-       const void *atf_fdt_blob = (const void *)(rcar_atf_boot_args[1]);
-       const void *blob;
-
-       /* Check if ATF passed us DTB. If not, fall back to builtin DTB. */
-       if (fdt_magic(atf_fdt_blob) == FDT_MAGIC)
-               blob = atf_fdt_blob;
-       else
-               blob = gd->fdt_blob;
-
-       return fdtdec_setup_mem_size_base_fdt(blob);
-}
-
-int dram_init_banksize(void)
-{
-       const void *atf_fdt_blob = (const void *)(rcar_atf_boot_args[1]);
-       const void *blob;
-
-       /* Check if ATF passed us DTB. If not, fall back to builtin DTB. */
-       if (fdt_magic(atf_fdt_blob) == FDT_MAGIC)
-               blob = atf_fdt_blob;
-       else
-               blob = gd->fdt_blob;
-
-       fdtdec_setup_memory_banksize_fdt(blob);
-
-       return 0;
-}
-
 #define RST_BASE       0xE6160000
 #define RST_CA57RESCNT (RST_BASE + 0x40)
 #define RST_CA53RESCNT (RST_BASE + 0x44)
@@ -127,11 +93,11 @@ 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-salvator-x-u-boot"))
+           !strcmp(name, "r8a77950-salvator-x-u-boot"))
                return 0;
 
        if ((cpu_type == RMOBILE_CPU_TYPE_R8A7796) &&
-           !strcmp(name, "r8a7796-salvator-x-u-boot"))
+           !strcmp(name, "r8a77960-salvator-x-u-boot"))
                return 0;
 
        if ((cpu_type == RMOBILE_CPU_TYPE_R8A77965) &&