From e12337915ce9a8bd8451c8dbcdafa2f585866d77 Mon Sep 17 00:00:00 2001 From: Marek Vasut <marek.vasut+renesas@mailbox.org> Date: Sun, 21 Jan 2024 18:31:23 +0100 Subject: [PATCH] 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> Reviewed-by: 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 85fbaf0b28..be77cade01 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 cdaa04e4f4..fc9dac55e6 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 2f657505ce..38dfa647e8 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 8e1ae29e22..c6ecea2afc 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 e3ad83ee0c..3134b36a44 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 1ed72d34a7..06a3a83298 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 0aa0f1afcb..cd86bb3108 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 2d1435acff..6edbdac3de 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 c0bf720443..87126a0fc1 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 1c4ebfc6a8..9944df7675 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 f609e4f072..c475c3f50a 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 c3ebcd3e39..ee5597ad3d 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 b377f70715..7581920f57 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 f884e5fe65..70cd117ba6 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 1437875cfa..0daad0b1e6 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 d3d397e8f0..df3e240599 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 f01ca2fac7..ddc831c0c2 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 db1fb4b035..2e6051addb 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 8595770c36..039fc7b719 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 bca54f7f74..e4d8f3dfaf 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 4b9959a432..78b8cb4ac3 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 ed3f093bf3..66eb6a2002 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 b02a946a21..44a20cef2d 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 7c6202ea49..26c589d03e 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 939b48ee30..d8312ddb8a 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 43a2989865..bdd76461b6 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 6ecebfe814..18ff759122 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 afb9f85ffc..b899442c25 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 fd83a72229..1eb75a6397 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 b7c75f5aa6..f5bb549b7c 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 c2f0b85387..9030ba7f61 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 f069eccde9..131deac1c7 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 c37c055713..8ec0216810 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 0c060a5323..e72e45e3fb 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 1477750f92..b2a16b0351 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 6016f6daef..1272aec730 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 aed616ac85..260755ac74 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 32284b2ecc..3423ebd299 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> -- 2.39.5