| Message ID | 20230531211316.497967-6-marek.vasut+renesas@mailbox.org |
|---|---|
| State | Accepted |
| Commit | 9fddd3612b2826717fb786b0ade2c13cc02793fe |
| Delegated to: | Marek Vasut |
| Headers | show |
| Series | [01/10] ARM: rmobile: Deduplicate R-Car Gen3/Gen4 reset_cpu() | expand |
diff --git a/board/renesas/condor/Makefile b/board/renesas/condor/Makefile index cf6d566a9bb..19e6038430b 100644 --- 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 index e29c67b5094..00000000000 --- 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 1fd9a03ecc9..956ce8a90fa 100644 --- 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 index 182e9800063..00000000000 --- 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 17940aa9146..3a0e88b3919 100644 --- 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 be8be0cb16d..7c6202ea499 100644 --- 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; -}
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> --- board/renesas/condor/Makefile | 2 +- board/renesas/condor/condor.c | 14 -------------- board/renesas/ebisu/Makefile | 2 +- board/renesas/ebisu/ebisu.c | 14 -------------- board/renesas/rcar-common/common.c | 5 +++++ board/renesas/rcar-common/v3-common.c | 5 ----- 6 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 board/renesas/condor/condor.c delete mode 100644 board/renesas/ebisu/ebisu.c