ARM: rmobile: Introduce weak default board_init()

Introduce weak default board_init() in rcar-common/common.c , which
allows complete removal of ebisu.c and condor.c at the same time .

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

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

diff --git a/board/renesas/condor/condor.c b/board/renesas/condor/condor.c
deleted file mode 100644 (file)
index e29c67b..0000000
--- a/board/renesas/condor/condor.c
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * board/renesas/condor/condor.c
- *     This file is Condor board support.
- *
- * Copyright (C) 2019 Marek Vasut <marek.vasut+renesas@gmail.com>
- */
-
-#include <common.h>
-
-int board_init(void)
-{
-       return 0;
-}

diff --git a/board/renesas/ebisu/Makefile b/board/renesas/ebisu/Makefile
index 1fd9a03ecc979d040ac8014a02031b2094d88bd7..956ce8a90fae5525111e71ba3467e573c3963879 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 ../rcar-common/common.o
+obj-y  := ../rcar-common/common.o
 endif

diff --git a/board/renesas/ebisu/ebisu.c b/board/renesas/ebisu/ebisu.c
deleted file mode 100644 (file)
index 182e980..0000000
--- a/board/renesas/ebisu/ebisu.c
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * board/renesas/ebisu/ebisu.c
- *     This file is Ebisu board support.
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut+renesas@gmail.com>
- */
-
-#include <common.h>
-
-int board_init(void)
-{
-       return 0;
-}

diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 17940aa91462f77fdfd8aa2dc75ac4f4b5fca795..3a0e88b3919d7a3d652e6a1a1f3a88d4754ca3e7 100644 (file)
--- a/board/renesas/rcar-common/common.c
+++ b/board/renesas/rcar-common/common.c
@@ -49,6 +49,11 @@ int dram_init_banksize(void)
        return 0;
 }
 
+int __weak board_init(void)
+{
+       return 0;
+}
+
 #if defined(CONFIG_RCAR_GEN3)
 #define RST_BASE       0xE6160000
 #define RST_CA57RESCNT (RST_BASE + 0x40)

diff --git a/board/renesas/rcar-common/v3-common.c b/board/renesas/rcar-common/v3-common.c
index be8be0cb16da1f4b0f0864c4d9193cb6a8563d1b..7c6202ea4991e0223251d4841f7889811e8b5fc9 100644 (file)
--- a/board/renesas/rcar-common/v3-common.c
+++ b/board/renesas/rcar-common/v3-common.c
@@ -39,8 +39,3 @@ int board_early_init_f(void)
 
        return 0;
 }
-
-int board_init(void)
-{
-       return 0;
-}