diff options
author | Marek Vasut <marek.vasut+renesas@mailbox.org> | 2023-05-31 20:33:04 +0200 |
---|---|---|
committer | Marek Vasut <marek.vasut+renesas@mailbox.org> | 2023-06-08 22:26:52 +0200 |
commit | 9fddd3612b2826717fb786b0ade2c13cc02793fe (patch) | |
tree | b348c4b4823dc3aafe98b4576e5cc228b4abd398 /board | |
parent | 79fedab62af1efe301a9aaa6ecb4cb49431cac83 (diff) | |
download | u-boot-9fddd3612b2826717fb786b0ade2c13cc02793fe.zip u-boot-9fddd3612b2826717fb786b0ade2c13cc02793fe.tar.gz u-boot-9fddd3612b2826717fb786b0ade2c13cc02793fe.tar.bz2 |
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>
Diffstat (limited to 'board')
-rw-r--r-- | board/renesas/condor/Makefile | 2 | ||||
-rw-r--r-- | board/renesas/condor/condor.c | 14 | ||||
-rw-r--r-- | board/renesas/ebisu/Makefile | 2 | ||||
-rw-r--r-- | board/renesas/ebisu/ebisu.c | 14 | ||||
-rw-r--r-- | board/renesas/rcar-common/common.c | 5 | ||||
-rw-r--r-- | board/renesas/rcar-common/v3-common.c | 5 |
6 files changed, 7 insertions, 35 deletions
diff --git a/board/renesas/condor/Makefile b/board/renesas/condor/Makefile index cf6d566..19e6038 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 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 1fd9a03..956ce8a 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 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 17940aa..3a0e88b 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 be8be0c..7c6202e 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; -} |