From 889d90c474d70702c52e62c5bd833535d2a360a2 Mon Sep 17 00:00:00 2001 From: Tom Rini <trini@konsulko.com> Date: Tue, 30 Apr 2024 20:42:07 -0600 Subject: [PATCH] board: kontron: Remove <common.h> and add needed includes Remove <common.h> from this board vendor directory and when needed add missing include files directly. Acked-by: Frieder Schrempf <frieder.schrempf@kontron.de> Acked-by: Michael Walle <michael@walle.cc> Signed-off-by: Tom Rini <trini@konsulko.com> --- board/kontron/pitx_imx8m/pitx_imx8m.c | 1 - board/kontron/pitx_imx8m/spl.c | 2 +- board/kontron/sl-mx8mm/lpddr4_timing.c | 1 - board/kontron/sl28/cmds.c | 3 ++- board/kontron/sl28/common.c | 2 +- board/kontron/sl28/ddr.c | 2 +- board/kontron/sl28/sl28.c | 1 - board/kontron/sl28/spl.c | 2 +- board/kontron/sl28/spl_atf.c | 2 +- 9 files changed, 7 insertions(+), 9 deletions(-) diff --git a/board/kontron/pitx_imx8m/pitx_imx8m.c b/board/kontron/pitx_imx8m/pitx_imx8m.c index 4548e7c1df..a908aee9ec 100644 --- a/board/kontron/pitx_imx8m/pitx_imx8m.c +++ b/board/kontron/pitx_imx8m/pitx_imx8m.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ #include "pitx_misc.h" -#include <common.h> #include <efi.h> #include <efi_loader.h> #include <init.h> diff --git a/board/kontron/pitx_imx8m/spl.c b/board/kontron/pitx_imx8m/spl.c index a247803a4b..475e52f623 100644 --- a/board/kontron/pitx_imx8m/spl.c +++ b/board/kontron/pitx_imx8m/spl.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ -#include <common.h> +#include <config.h> #include <errno.h> #include <fsl_esdhc_imx.h> #include <hang.h> diff --git a/board/kontron/sl-mx8mm/lpddr4_timing.c b/board/kontron/sl-mx8mm/lpddr4_timing.c index 74b79c7a00..851aeef8f8 100644 --- a/board/kontron/sl-mx8mm/lpddr4_timing.c +++ b/board/kontron/sl-mx8mm/lpddr4_timing.c @@ -4,7 +4,6 @@ */ #include <linux/kernel.h> -#include <common.h> #include <asm/arch/ddr.h> #include <asm/arch/lpddr4_define.h> diff --git a/board/kontron/sl28/cmds.c b/board/kontron/sl28/cmds.c index 08a22b5d01..7851361c48 100644 --- a/board/kontron/sl28/cmds.c +++ b/board/kontron/sl28/cmds.c @@ -5,10 +5,11 @@ * Copyright (c) 2020 Kontron Europe GmbH */ -#include <common.h> #include <command.h> #include <i2c.h> +#include <vsprintf.h> #include <linux/delay.h> +#include <linux/errno.h> #define CPLD_I2C_ADDR 0x4a #define REG_UFM_CTRL 0x02 diff --git a/board/kontron/sl28/common.c b/board/kontron/sl28/common.c index 331de29bae..d8d0172a21 100644 --- a/board/kontron/sl28/common.c +++ b/board/kontron/sl28/common.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ -#include <common.h> +#include <config.h> #include <asm/global_data.h> #include <asm/io.h> diff --git a/board/kontron/sl28/ddr.c b/board/kontron/sl28/ddr.c index 315d9f99c7..9b881fdc26 100644 --- a/board/kontron/sl28/ddr.c +++ b/board/kontron/sl28/ddr.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ -#include <common.h> +#include <config.h> #include <asm/global_data.h> #include <asm/io.h> #include <fsl_ddr_sdram.h> diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index 4ab221c12b..adfec8ba23 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ -#include <common.h> #include <dm.h> #include <malloc.h> #include <efi.h> diff --git a/board/kontron/sl28/spl.c b/board/kontron/sl28/spl.c index 80acde7495..45a4fc6512 100644 --- a/board/kontron/sl28/spl.c +++ b/board/kontron/sl28/spl.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ -#include <common.h> +#include <config.h> #include <asm/io.h> #include <asm/spl.h> #include <asm/arch-fsl-layerscape/fsl_serdes.h> diff --git a/board/kontron/sl28/spl_atf.c b/board/kontron/sl28/spl_atf.c index a9cd6850e9..0710316a48 100644 --- a/board/kontron/sl28/spl_atf.c +++ b/board/kontron/sl28/spl_atf.c @@ -5,7 +5,7 @@ * Copyright (c) 2020 Michael Walle <michael@walle.cc> */ -#include <common.h> +#include <config.h> #include <asm/global_data.h> #include <asm/io.h> #include <atf_common.h> -- 2.39.5