ARM: renesas: Factor out DRAM setup on R-Car Gen3

Pull DRAM layout configuration code into rcar-common.c instead of
having it in multiple copies across board files. This poses no
change for Salvator-X/XS, ULCB and Ebisu boards, however it adds
a bit of extra code for Draak and Eagle boards, which now gain
the capability of being passed in the DRAM layout by the ATF.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Eugeniu Rosca <roscaeugeniu@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/board/renesas/draak/Makefile b/board/renesas/draak/Makefile
index 0140b61..1fc90d1 100644 (file)
--- a/board/renesas/draak/Makefile
+++ b/board/renesas/draak/Makefile
@@ -9,5 +9,5 @@
 ifdef CONFIG_SPL_BUILD
 obj-y  := ../rcar-common/gen3-spl.o
 else
-obj-y  := draak.o
+obj-y  := draak.o ../rcar-common/common.o
 endif

diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c
index 8f3d391..46d9f74 100644 (file)
--- a/board/renesas/draak/draak.c
+++ b/board/renesas/draak/draak.c
@@ -70,21 +70,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;
-}
-
 #define RST_BASE       0xE6160000
 #define RST_CA57RESCNT (RST_BASE + 0x40)
 #define RST_CA53RESCNT (RST_BASE + 0x44)

diff --git a/board/renesas/eagle/Makefile b/board/renesas/eagle/Makefile
index 04402a2..062c46b 100644 (file)
--- a/board/renesas/eagle/Makefile
+++ b/board/renesas/eagle/Makefile
@@ -9,5 +9,5 @@
 ifdef CONFIG_SPL_BUILD
 obj-y  := ../rcar-common/gen3-spl.o
 else
-obj-y  := eagle.o
+obj-y  := eagle.o ../rcar-common/common.o
 endif

diff --git a/board/renesas/eagle/eagle.c b/board/renesas/eagle/eagle.c
index 0e5efea..d6240b1 100644 (file)
--- a/board/renesas/eagle/eagle.c
+++ b/board/renesas/eagle/eagle.c
@@ -67,21 +67,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;
-}
-
 #define RST_BASE       0xE6160000
 #define RST_CA57RESCNT (RST_BASE + 0x40)
 #define RST_CA53RESCNT (RST_BASE + 0x44)

diff --git a/board/renesas/ebisu/Makefile b/board/renesas/ebisu/Makefile
index 39971f1..1fd9a03 100644 (file)
--- a/board/renesas/ebisu/Makefile
+++ b/board/renesas/ebisu/Makefile
@@ -9,5 +9,5 @@
 ifdef CONFIG_SPL_BUILD
 obj-y  := ../rcar-common/gen3-spl.o
 else
-obj-y  := ebisu.o
+obj-y  := ebisu.o ../rcar-common/common.o
 endif

diff --git a/board/renesas/ebisu/ebisu.c b/board/renesas/ebisu/ebisu.c
index 60429e4..cb7d432 100644 (file)
--- a/board/renesas/ebisu/ebisu.c
+++ b/board/renesas/ebisu/ebisu.c
@@ -43,41 +43,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)

diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 1ce6e2e..292867e 100644 (file)
--- a/board/renesas/rcar-common/common.c
+++ b/board/renesas/rcar-common/common.c
@@ -9,3 +9,41 @@
 
 #include <common.h>
 #include <asm/arch/rmobile.h>
+
+#ifdef CONFIG_RCAR_GEN3
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* 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;
+}
+#endif

diff --git a/board/renesas/salvator-x/Makefile b/board/renesas/salvator-x/Makefile
index fb506be..9525807 100644 (file)
--- a/board/renesas/salvator-x/Makefile
+++ b/board/renesas/salvator-x/Makefile
@@ -9,5 +9,5 @@
 ifdef CONFIG_SPL_BUILD
 obj-y  := ../rcar-common/gen3-spl.o
 else
-obj-y  := salvator-x.o
+obj-y  := salvator-x.o ../rcar-common/common.o
 endif

diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index 1db08fc..22fe961 100644 (file)
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -69,41 +69,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)

diff --git a/board/renesas/ulcb/Makefile b/board/renesas/ulcb/Makefile
index cd9a583..f4d24c6 100644 (file)
--- a/board/renesas/ulcb/Makefile
+++ b/board/renesas/ulcb/Makefile
@@ -9,5 +9,5 @@
 ifdef CONFIG_SPL_BUILD
 obj-y  := ../rcar-common/gen3-spl.o
 else
-obj-y  := ulcb.o cpld.o
+obj-y  := ulcb.o cpld.o ../rcar-common/common.o
 endif

diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index faf19c3..bcae6ff 100644 (file)
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -68,41 +68,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;
-}
-
 #ifdef CONFIG_MULTI_DTB_FIT
 int board_fit_config_name_match(const char *name)
 {