[PATCH 3/3] ARM: renesas: Drop include common.h

The header file is not necessary in either of those files, remove it as common.h is going away.

Include missing asm/arch/rmobile.h in board/renesas/rcar-common/v3-common.c to prevent build failure of r8a77970_eagle r8a779a0_falcon r8a77980_v3hsk and r8a77970_v3msk .

Include missing asm/u-boot.h in falcon.c and grpeach.c to fix build failure due to missing definition of struct bd_info . Include errno.h in grpeach.c to fix build error due to missing definition of EINVAL.

Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Adam Ford aford173@gmail.com Cc: Paul Barker paul.barker.ct@bp.renesas.com --- board/renesas/alt/alt.c | 1 - board/renesas/alt/alt_spl.c | 1 - board/renesas/alt/qos.c | 1 - board/renesas/blanche/blanche.c | 1 - board/renesas/blanche/qos.c | 1 - board/renesas/draak/draak.c | 1 - board/renesas/falcon/falcon.c | 2 +- board/renesas/gose/gose.c | 1 - board/renesas/gose/gose_spl.c | 1 - board/renesas/gose/qos.c | 1 - board/renesas/grpeach/grpeach.c | 3 ++- board/renesas/koelsch/koelsch.c | 1 - board/renesas/koelsch/koelsch_spl.c | 1 - board/renesas/koelsch/qos.c | 1 - board/renesas/lager/lager.c | 1 - board/renesas/lager/lager_spl.c | 1 - board/renesas/lager/qos.c | 1 - board/renesas/porter/porter.c | 1 - board/renesas/porter/porter_spl.c | 1 - board/renesas/porter/qos.c | 1 - board/renesas/r2dplus/r2dplus.c | 1 - board/renesas/rcar-common/common.c | 1 - board/renesas/rcar-common/gen3-spl.c | 1 - board/renesas/rcar-common/v3-common.c | 2 +- board/renesas/salvator-x/salvator-x.c | 1 - board/renesas/silk/qos.c | 1 - board/renesas/silk/silk.c | 1 - board/renesas/silk/silk_spl.c | 1 - board/renesas/spider/spider.c | 1 - board/renesas/stout/cpld.c | 1 - board/renesas/stout/qos.c | 1 - board/renesas/stout/stout.c | 1 - board/renesas/stout/stout_spl.c | 1 - board/renesas/ulcb/cpld.c | 1 - board/renesas/ulcb/ulcb.c | 1 - board/renesas/v3hsk/cpld.c | 1 - board/renesas/v3msk/cpld.c | 1 - board/renesas/whitehawk/whitehawk.c | 1 - 38 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c index 85fbaf0b28b..be77cade01b 100644 --- a/board/renesas/alt/alt.c +++ b/board/renesas/alt/alt.c @@ -5,7 +5,6 @@ * Copyright (C) 2014, 2015 Renesas Electronics Corporation */

-#include <common.h> #include <cpu_func.h> #include <env.h> #include <hang.h> diff --git a/board/renesas/alt/alt_spl.c b/board/renesas/alt/alt_spl.c index cdaa04e4f4c..fc9dac55e6a 100644 --- a/board/renesas/alt/alt_spl.c +++ b/board/renesas/alt/alt_spl.c @@ -5,7 +5,6 @@ * Copyright (C) 2018 Marek Vasut marek.vasut@gmail.com */

-#include <common.h> #include <cpu_func.h> #include <init.h> #include <malloc.h> diff --git a/board/renesas/alt/qos.c b/board/renesas/alt/qos.c index 2f657505ceb..38dfa647e81 100644 --- a/board/renesas/alt/qos.c +++ b/board/renesas/alt/qos.c @@ -6,7 +6,6 @@ * */

-#include <common.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c index 8e1ae29e221..c6ecea2afcf 100644 --- a/board/renesas/blanche/blanche.c +++ b/board/renesas/blanche/blanche.c @@ -6,7 +6,6 @@ * Copyright (C) 2016 Renesas Electronics Corporation */

-#include <common.h> #include <cpu_func.h> #include <init.h> #include <net.h> diff --git a/board/renesas/blanche/qos.c b/board/renesas/blanche/qos.c index e3ad83ee0c2..3134b36a443 100644 --- a/board/renesas/blanche/qos.c +++ b/board/renesas/blanche/qos.c @@ -5,7 +5,6 @@ * Copyright (C) 2016 Renesas Electronics Corporation */

-#include <common.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c index 1ed72d34a74..06a3a832984 100644 --- a/board/renesas/draak/draak.c +++ b/board/renesas/draak/draak.c @@ -6,7 +6,6 @@ * Copyright (C) 2017 Marek Vasut marek.vasut+renesas@gmail.com */

-#include <common.h> #include <cpu_func.h> #include <hang.h> #include <init.h> diff --git a/board/renesas/falcon/falcon.c b/board/renesas/falcon/falcon.c index 0aa0f1afcbf..cd86bb3108c 100644 --- a/board/renesas/falcon/falcon.c +++ b/board/renesas/falcon/falcon.c @@ -6,7 +6,6 @@ * Copyright (C) 2020 Renesas Electronics Corp. */

-#include <common.h> #include <asm/arch/rmobile.h> #include <asm/arch/sys_proto.h> #include <asm/global_data.h> @@ -15,6 +14,7 @@ #include <asm/processor.h> #include <linux/errno.h> #include <asm/system.h> +#include <asm/u-boot.h>

DECLARE_GLOBAL_DATA_PTR;

diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c index 2d1435acff6..6edbdac3ded 100644 --- a/board/renesas/gose/gose.c +++ b/board/renesas/gose/gose.c @@ -5,7 +5,6 @@ * Copyright (C) 2014 Renesas Electronics Corporation */

-#include <common.h> #include <clock_legacy.h> #include <cpu_func.h> #include <env.h> diff --git a/board/renesas/gose/gose_spl.c b/board/renesas/gose/gose_spl.c index c0bf7204439..87126a0fc15 100644 --- a/board/renesas/gose/gose_spl.c +++ b/board/renesas/gose/gose_spl.c @@ -5,7 +5,6 @@ * Copyright (C) 2018 Marek Vasut marek.vasut@gmail.com */

-#include <common.h> #include <cpu_func.h> #include <init.h> #include <malloc.h> diff --git a/board/renesas/gose/qos.c b/board/renesas/gose/qos.c index 1c4ebfc6a8a..9944df76759 100644 --- a/board/renesas/gose/qos.c +++ b/board/renesas/gose/qos.c @@ -6,7 +6,6 @@ * Copyright (C) 2014 Renesas Electronics Corporation */

-#include <common.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/grpeach/grpeach.c b/board/renesas/grpeach/grpeach.c index f609e4f0728..c475c3f50ab 100644 --- a/board/renesas/grpeach/grpeach.c +++ b/board/renesas/grpeach/grpeach.c @@ -4,12 +4,13 @@ * Copyright (C) Chris Brandt */

-#include <common.h> #include <cpu_func.h> +#include <errno.h> #include <init.h> #include <asm/global_data.h> #include <asm/io.h> #include <asm/arch/sys_proto.h> +#include <asm/u-boot.h>

#define RZA1_WDT_BASE 0xfcfe0000 #define WTCSR 0x00 diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c index c3ebcd3e39f..ee5597ad3d9 100644 --- a/board/renesas/koelsch/koelsch.c +++ b/board/renesas/koelsch/koelsch.c @@ -6,7 +6,6 @@ * */

-#include <common.h> #include <clock_legacy.h> #include <cpu_func.h> #include <env.h> diff --git a/board/renesas/koelsch/koelsch_spl.c b/board/renesas/koelsch/koelsch_spl.c index b377f707158..7581920f577 100644 --- a/board/renesas/koelsch/koelsch_spl.c +++ b/board/renesas/koelsch/koelsch_spl.c @@ -5,7 +5,6 @@ * Copyright (C) 2018 Marek Vasut marek.vasut@gmail.com */

-#include <common.h> #include <cpu_func.h> #include <init.h> #include <malloc.h> diff --git a/board/renesas/koelsch/qos.c b/board/renesas/koelsch/qos.c index f884e5fe650..70cd117ba6b 100644 --- a/board/renesas/koelsch/qos.c +++ b/board/renesas/koelsch/qos.c @@ -6,7 +6,6 @@ * */

-#include <common.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c index 1437875cfa7..0daad0b1e6d 100644 --- a/board/renesas/lager/lager.c +++ b/board/renesas/lager/lager.c @@ -7,7 +7,6 @@ * Copyright (C) 2013 Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com */

-#include <common.h> #include <clock_legacy.h> #include <cpu_func.h> #include <env.h> diff --git a/board/renesas/lager/lager_spl.c b/board/renesas/lager/lager_spl.c index d3d397e8f0a..df3e240599a 100644 --- a/board/renesas/lager/lager_spl.c +++ b/board/renesas/lager/lager_spl.c @@ -5,7 +5,6 @@ * Copyright (C) 2018 Marek Vasut marek.vasut@gmail.com */

-#include <common.h> #include <cpu_func.h> #include <init.h> #include <malloc.h> diff --git a/board/renesas/lager/qos.c b/board/renesas/lager/qos.c index f01ca2fac71..ddc831c0c21 100644 --- a/board/renesas/lager/qos.c +++ b/board/renesas/lager/qos.c @@ -5,7 +5,6 @@ * Copyright (C) 2013,2014 Renesas Electronics Corporation */

-#include <common.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c index db1fb4b035f..2e6051addb1 100644 --- a/board/renesas/porter/porter.c +++ b/board/renesas/porter/porter.c @@ -6,7 +6,6 @@ * Copyright (C) 2015 Cogent Embedded, Inc. */

-#include <common.h> #include <clock_legacy.h> #include <cpu_func.h> #include <env.h> diff --git a/board/renesas/porter/porter_spl.c b/board/renesas/porter/porter_spl.c index 8595770c364..039fc7b719e 100644 --- a/board/renesas/porter/porter_spl.c +++ b/board/renesas/porter/porter_spl.c @@ -5,7 +5,6 @@ * Copyright (C) 2018 Marek Vasut marek.vasut@gmail.com */

-#include <common.h> #include <cpu_func.h> #include <init.h> #include <malloc.h> diff --git a/board/renesas/porter/qos.c b/board/renesas/porter/qos.c index bca54f7f74c..e4d8f3dfafe 100644 --- a/board/renesas/porter/qos.c +++ b/board/renesas/porter/qos.c @@ -7,7 +7,6 @@ * */

-#include <common.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/r2dplus/r2dplus.c b/board/renesas/r2dplus/r2dplus.c index 4b9959a4326..78b8cb4ac34 100644 --- a/board/renesas/r2dplus/r2dplus.c +++ b/board/renesas/r2dplus/r2dplus.c @@ -4,7 +4,6 @@ * Nobuhiro Iwamatsu iwamatsu@nigauri.org */

-#include <common.h> #include <ide.h> #include <init.h> #include <net.h> diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c index ed3f093bf3c..66eb6a2002c 100644 --- a/board/renesas/rcar-common/common.c +++ b/board/renesas/rcar-common/common.c @@ -7,7 +7,6 @@ * Copyright (C) 2015 Nobuhiro Iwamatsu iwamatsu@nigauri.org */

-#include <common.h> #include <dm.h> #include <fdt_support.h> #include <hang.h> diff --git a/board/renesas/rcar-common/gen3-spl.c b/board/renesas/rcar-common/gen3-spl.c index b02a946a21d..44a20cef2df 100644 --- a/board/renesas/rcar-common/gen3-spl.c +++ b/board/renesas/rcar-common/gen3-spl.c @@ -5,7 +5,6 @@ * Copyright (C) 2019 Marek Vasut marek.vasut@gmail.com */

-#include <common.h> #include <cpu_func.h> #include <image.h> #include <init.h> diff --git a/board/renesas/rcar-common/v3-common.c b/board/renesas/rcar-common/v3-common.c index 7c6202ea499..26c589d03e9 100644 --- a/board/renesas/rcar-common/v3-common.c +++ b/board/renesas/rcar-common/v3-common.c @@ -3,8 +3,8 @@ * Copyright (C) 2017-2023 Marek Vasut marek.vasut+renesas@mailbox.org */

-#include <common.h> #include <clock_legacy.h> +#include <asm/arch/rmobile.h> #include <asm/io.h>

#define CPGWPR 0xE6150900 diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index 939b48ee300..d8312ddb8a9 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -7,7 +7,6 @@ * Copyright (C) 2015 Nobuhiro Iwamatsu iwamatsu@nigauri.org */

-#include <common.h> #include <cpu_func.h> #include <image.h> #include <init.h> diff --git a/board/renesas/silk/qos.c b/board/renesas/silk/qos.c index 43a29898657..bdd76461b6a 100644 --- a/board/renesas/silk/qos.c +++ b/board/renesas/silk/qos.c @@ -7,7 +7,6 @@ * */

-#include <common.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c index 6ecebfe814d..18ff7591228 100644 --- a/board/renesas/silk/silk.c +++ b/board/renesas/silk/silk.c @@ -6,7 +6,6 @@ * Copyright (C) 2015 Cogent Embedded, Inc. */

-#include <common.h> #include <cpu_func.h> #include <env.h> #include <hang.h> diff --git a/board/renesas/silk/silk_spl.c b/board/renesas/silk/silk_spl.c index afb9f85ffc2..b899442c25a 100644 --- a/board/renesas/silk/silk_spl.c +++ b/board/renesas/silk/silk_spl.c @@ -5,7 +5,6 @@ * Copyright (C) 2018 Marek Vasut marek.vasut@gmail.com */

-#include <common.h> #include <cpu_func.h> #include <init.h> #include <malloc.h> diff --git a/board/renesas/spider/spider.c b/board/renesas/spider/spider.c index fd83a72229e..1eb75a6397f 100644 --- a/board/renesas/spider/spider.c +++ b/board/renesas/spider/spider.c @@ -6,7 +6,6 @@ * Copyright (C) 2021 Renesas Electronics Corp. */

-#include <common.h> #include <asm/arch/rmobile.h> #include <asm/arch/sys_proto.h> #include <asm/global_data.h> diff --git a/board/renesas/stout/cpld.c b/board/renesas/stout/cpld.c index b7c75f5aa65..f5bb549b7c0 100644 --- a/board/renesas/stout/cpld.c +++ b/board/renesas/stout/cpld.c @@ -7,7 +7,6 @@ * Copyright (C) 2015 Cogent Embedded, Inc. */

-#include <common.h> #include <command.h> #include <cpu_func.h> #include <asm/io.h> diff --git a/board/renesas/stout/qos.c b/board/renesas/stout/qos.c index c2f0b853871..9030ba7f61f 100644 --- a/board/renesas/stout/qos.c +++ b/board/renesas/stout/qos.c @@ -7,7 +7,6 @@ * Copyright (C) 2015 Cogent Embedded, Inc. */

-#include <common.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c index f069eccde97..131deac1c7a 100644 --- a/board/renesas/stout/stout.c +++ b/board/renesas/stout/stout.c @@ -8,7 +8,6 @@ * Copyright (C) 2015 Cogent Embedded, Inc. */

-#include <common.h> #include <clock_legacy.h> #include <env.h> #include <init.h> diff --git a/board/renesas/stout/stout_spl.c b/board/renesas/stout/stout_spl.c index c37c0557132..8ec02168106 100644 --- a/board/renesas/stout/stout_spl.c +++ b/board/renesas/stout/stout_spl.c @@ -5,7 +5,6 @@ * Copyright (C) 2018 Marek Vasut marek.vasut@gmail.com */

-#include <common.h> #include <cpu_func.h> #include <init.h> #include <malloc.h> diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c index 0c060a5323d..e72e45e3fb4 100644 --- a/board/renesas/ulcb/cpld.c +++ b/board/renesas/ulcb/cpld.c @@ -6,7 +6,6 @@ * Copyright (C) 2017 Cogent Embedded, Inc. */

-#include <common.h> #include <command.h> #include <asm/gpio.h> #include <asm/io.h> diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index 1477750f921..b2a16b03513 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -6,7 +6,6 @@ * Copyright (C) 2017 Renesas Electronics Corporation */

-#include <common.h> #include <image.h> #include <init.h> #include <malloc.h> diff --git a/board/renesas/v3hsk/cpld.c b/board/renesas/v3hsk/cpld.c index 6016f6daef9..1272aec7302 100644 --- a/board/renesas/v3hsk/cpld.c +++ b/board/renesas/v3hsk/cpld.c @@ -7,7 +7,6 @@ * */

-#include <common.h> #include <dm.h> #include <errno.h> #include <i2c.h> diff --git a/board/renesas/v3msk/cpld.c b/board/renesas/v3msk/cpld.c index aed616ac859..260755ac746 100644 --- a/board/renesas/v3msk/cpld.c +++ b/board/renesas/v3msk/cpld.c @@ -7,7 +7,6 @@ * */

-#include <common.h> #include <asm/gpio.h> #include <asm/io.h> #include <dm.h> diff --git a/board/renesas/whitehawk/whitehawk.c b/board/renesas/whitehawk/whitehawk.c index 32284b2ecc0..3423ebd2995 100644 --- a/board/renesas/whitehawk/whitehawk.c +++ b/board/renesas/whitehawk/whitehawk.c @@ -6,7 +6,6 @@ * Copyright (C) 2021 Renesas Electronics Corp. */

-#include <common.h> #include <asm/arch/rmobile.h> #include <asm/arch/sys_proto.h> #include <asm/global_data.h>