Remove <common.h> from this board vendor directory and when needed add missing include files directly.
Signed-off-by: Tom Rini <tr...@konsulko.com> --- Cc: Uri Mashiach <uri.mashi...@compulab.co.il> Cc: Nikita Kiryanov <nik...@compulab.co.il> Cc: "Ying-Chun Liu (PaulLiu)" <paul....@linaro.org> Cc: Tom Warren <twar...@nvidia.com> Cc: Stephen Warren <swar...@nvidia.com> Cc: Tom Rini <tr...@konsulko.com> --- board/compulab/cl-som-imx7/cl-som-imx7.c | 2 +- board/compulab/cl-som-imx7/common.c | 1 - board/compulab/cl-som-imx7/mux.c | 2 +- board/compulab/cl-som-imx7/spl.c | 1 - board/compulab/cm_fx6/cm_fx6.c | 2 +- board/compulab/cm_fx6/common.c | 1 - board/compulab/cm_fx6/spl.c | 1 - board/compulab/cm_t43/cm_t43.c | 2 +- board/compulab/cm_t43/mux.c | 1 - board/compulab/cm_t43/spl.c | 2 +- board/compulab/common/common.c | 1 - board/compulab/common/eeprom.c | 3 ++- board/compulab/common/omap3_smc911x.c | 1 - board/compulab/imx8mm-cl-iot-gate/ddr/ddr.c | 1 - .../imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.1_2.c | 1 - board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.c | 1 - board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff000110.c | 1 - board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff020008.c | 1 - board/compulab/imx8mm-cl-iot-gate/eeprom_spl.c | 2 +- board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c | 1 - board/compulab/imx8mm-cl-iot-gate/spl.c | 1 - board/compulab/trimslice/trimslice.c | 1 - 22 files changed, 8 insertions(+), 22 deletions(-) diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c index af19a658b542..7853c4d024a3 100644 --- a/board/compulab/cl-som-imx7/cl-som-imx7.c +++ b/board/compulab/cl-som-imx7/cl-som-imx7.c @@ -7,7 +7,7 @@ * Author: Uri Mashiach <uri.mashi...@compulab.co.il> */ -#include <common.h> +#include <config.h> #include <env.h> #include <init.h> #include <mmc.h> diff --git a/board/compulab/cl-som-imx7/common.c b/board/compulab/cl-som-imx7/common.c index 40ba0f7a9605..ae8e83466207 100644 --- a/board/compulab/cl-som-imx7/common.c +++ b/board/compulab/cl-som-imx7/common.c @@ -7,7 +7,6 @@ * Author: Uri Mashiach <uri.mashi...@compulab.co.il> */ -#include <common.h> #include <fsl_esdhc_imx.h> #include <asm-generic/gpio.h> #include "common.h" diff --git a/board/compulab/cl-som-imx7/mux.c b/board/compulab/cl-som-imx7/mux.c index 18f16a48738c..25123ee145a6 100644 --- a/board/compulab/cl-som-imx7/mux.c +++ b/board/compulab/cl-som-imx7/mux.c @@ -7,7 +7,7 @@ * Author: Uri Mashiach <uri.mashi...@compulab.co.il> */ -#include <common.h> +#include <linux/kernel.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/arch-mx7/mx7-pins.h> diff --git a/board/compulab/cl-som-imx7/spl.c b/board/compulab/cl-som-imx7/spl.c index 98c3b831f1e1..9b6bbb974da7 100644 --- a/board/compulab/cl-som-imx7/spl.c +++ b/board/compulab/cl-som-imx7/spl.c @@ -7,7 +7,6 @@ * Author: Uri Mashiach <uri.mashi...@compulab.co.il> */ -#include <common.h> #include <hang.h> #include <init.h> #include <spl.h> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 7bce09e432c0..4a6cc3e56308 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -7,7 +7,7 @@ * Author: Nikita Kiryanov <nik...@compulab.co.il> */ -#include <common.h> +#include <config.h> #include <ahci.h> #include <dm.h> #include <dwc_ahsata.h> diff --git a/board/compulab/cm_fx6/common.c b/board/compulab/cm_fx6/common.c index ed8c7a3bf5f8..a71861b1731b 100644 --- a/board/compulab/cm_fx6/common.c +++ b/board/compulab/cm_fx6/common.c @@ -7,7 +7,6 @@ * Author: Nikita Kiryanov <nik...@compulab.co.il> */ -#include <common.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/mach-imx/spi.h> diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c index 079f196200e5..b11bf2d28c68 100644 --- a/board/compulab/cm_fx6/spl.c +++ b/board/compulab/cm_fx6/spl.c @@ -7,7 +7,6 @@ * Author: Nikita Kiryanov <nik...@compulab.co.il> */ -#include <common.h> #include <clock_legacy.h> #include <hang.h> #include <init.h> diff --git a/board/compulab/cm_t43/cm_t43.c b/board/compulab/cm_t43/cm_t43.c index 5df378a62e3c..181581926c37 100644 --- a/board/compulab/cm_t43/cm_t43.c +++ b/board/compulab/cm_t43/cm_t43.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Compulab, Ltd. */ -#include <common.h> +#include <config.h> #include <i2c.h> #include <miiphy.h> #include <cpsw.h> diff --git a/board/compulab/cm_t43/mux.c b/board/compulab/cm_t43/mux.c index 778ea05e84cb..f10910565d50 100644 --- a/board/compulab/cm_t43/mux.c +++ b/board/compulab/cm_t43/mux.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Compulab, Ltd. */ -#include <common.h> #include <asm/arch/sys_proto.h> #include <asm/arch/mux.h> #include "board.h" diff --git a/board/compulab/cm_t43/spl.c b/board/compulab/cm_t43/spl.c index a6223a477fef..212bfeb5c307 100644 --- a/board/compulab/cm_t43/spl.c +++ b/board/compulab/cm_t43/spl.c @@ -3,7 +3,7 @@ * Copyright (C) 2016 Compulab, Ltd. */ -#include <common.h> +#include <config.h> #include <hang.h> #include <init.h> #include <spl.h> diff --git a/board/compulab/common/common.c b/board/compulab/common/common.c index 528c97df19a4..6ffebe6bdb41 100644 --- a/board/compulab/common/common.c +++ b/board/compulab/common/common.c @@ -5,7 +5,6 @@ * Authors: Igor Grinberg <grinb...@compulab.co.il> */ -#include <common.h> #include <malloc.h> #include <asm/bootm.h> #include <asm/gpio.h> diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c index 4c752821d6cd..efdaf342d5c3 100644 --- a/board/compulab/common/eeprom.c +++ b/board/compulab/common/eeprom.c @@ -6,12 +6,13 @@ * Igor Grinberg <grinb...@compulab.co.il> */ -#include <common.h> #include <i2c.h> +#include <vsprintf.h> #include <eeprom_layout.h> #include <eeprom_field.h> #include <asm/setup.h> #include <linux/kernel.h> +#include <linux/string.h> #include "eeprom.h" #define EEPROM_LAYOUT_VER_OFFSET 44 diff --git a/board/compulab/common/omap3_smc911x.c b/board/compulab/common/omap3_smc911x.c index f0d365272c1b..411fc4943bac 100644 --- a/board/compulab/common/omap3_smc911x.c +++ b/board/compulab/common/omap3_smc911x.c @@ -5,7 +5,6 @@ * Authors: Igor Grinberg <grinb...@compulab.co.il> */ -#include <common.h> #include <netdev.h> #include <linux/delay.h> diff --git a/board/compulab/imx8mm-cl-iot-gate/ddr/ddr.c b/board/compulab/imx8mm-cl-iot-gate/ddr/ddr.c index b230478b611a..99d3bf3af3bc 100644 --- a/board/compulab/imx8mm-cl-iot-gate/ddr/ddr.c +++ b/board/compulab/imx8mm-cl-iot-gate/ddr/ddr.c @@ -5,7 +5,6 @@ * */ -#include <common.h> #include <spl.h> #include <asm/io.h> #include <errno.h> diff --git a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.1_2.c b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.1_2.c index 9019a1f2035c..efcc95c739fd 100644 --- a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.1_2.c +++ b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.1_2.c @@ -7,7 +7,6 @@ */ #include <linux/kernel.h> -#include <common.h> #include <asm/arch/ddr.h> #include <asm/arch/lpddr4_define.h> diff --git a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.c b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.c index 5141c04f12dc..67f59ed9407f 100644 --- a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.c +++ b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.c @@ -7,7 +7,6 @@ */ #include <linux/kernel.h> -#include <common.h> #include <asm/arch/ddr.h> #include <asm/arch/lpddr4_define.h> diff --git a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff000110.c b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff000110.c index 2334722497db..273ee89c0bc6 100644 --- a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff000110.c +++ b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff000110.c @@ -7,7 +7,6 @@ */ #include <linux/kernel.h> -#include <common.h> #include <asm/arch/ddr.h> #include <asm/arch/lpddr4_define.h> diff --git a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff020008.c b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff020008.c index e65445e01559..1243800b3241 100644 --- a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff020008.c +++ b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff020008.c @@ -7,7 +7,6 @@ */ #include <linux/kernel.h> -#include <common.h> #include <asm/arch/ddr.h> #include <asm/arch/lpddr4_define.h> diff --git a/board/compulab/imx8mm-cl-iot-gate/eeprom_spl.c b/board/compulab/imx8mm-cl-iot-gate/eeprom_spl.c index 90cc33a6e460..1256848f9a98 100644 --- a/board/compulab/imx8mm-cl-iot-gate/eeprom_spl.c +++ b/board/compulab/imx8mm-cl-iot-gate/eeprom_spl.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* (C) Copyright 2019 CompuLab, Ltd. <www.compulab.co.il> */ -#include <common.h> +#include <config.h> #include <i2c.h> #include <linux/kernel.h> #include <asm/arch/imx8mq_pins.h> diff --git a/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c b/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c index af070ec315c4..ba1587341428 100644 --- a/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c +++ b/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c @@ -4,7 +4,6 @@ * Copyright 2020 Linaro */ -#include <common.h> #include <efi.h> #include <efi_loader.h> #include <env.h> diff --git a/board/compulab/imx8mm-cl-iot-gate/spl.c b/board/compulab/imx8mm-cl-iot-gate/spl.c index 19c1acd8a525..6d9af2538b63 100644 --- a/board/compulab/imx8mm-cl-iot-gate/spl.c +++ b/board/compulab/imx8mm-cl-iot-gate/spl.c @@ -4,7 +4,6 @@ * Copyright 2020 Linaro */ -#include <common.h> #include <command.h> #include <cpu_func.h> #include <hang.h> diff --git a/board/compulab/trimslice/trimslice.c b/board/compulab/trimslice/trimslice.c index 21ff0cda7f70..af05c0c0f059 100644 --- a/board/compulab/trimslice/trimslice.c +++ b/board/compulab/trimslice/trimslice.c @@ -4,7 +4,6 @@ * NVIDIA Corporation <www.nvidia.com> */ -#include <common.h> #include <asm/io.h> #include <asm/arch/tegra.h> #include <asm/arch/clock.h> -- 2.34.1