[PATCH 30/81] fpga: Remove <common.h> and add needed includes

Remove <common.h> from this driver directory and when needed add missing include files directly.

Signed-off-by: Tom Rini trini@konsulko.com --- Cc: Michal Simek michal.simek@amd.com Cc: Tom Rini trini@konsulko.com --- drivers/fpga/ACEX1K.c | 2 +- drivers/fpga/altera.c | 1 - drivers/fpga/cyclon2.c | 3 ++- drivers/fpga/fpga.c | 1 - drivers/fpga/intel_sdm_mb.c | 4 +++- drivers/fpga/ivm_core.c | 1 - drivers/fpga/lattice.c | 1 - drivers/fpga/socfpga.c | 2 +- drivers/fpga/socfpga_arria10.c | 1 - drivers/fpga/socfpga_gen5.c | 2 +- drivers/fpga/spartan2.c | 2 +- drivers/fpga/spartan3.c | 3 ++- drivers/fpga/stratixII.c | 1 - drivers/fpga/stratixv.c | 1 - drivers/fpga/versalpl.c | 1 - drivers/fpga/virtex2.c | 2 +- drivers/fpga/xilinx.c | 2 +- drivers/fpga/zynqmppl.c | 1 - drivers/fpga/zynqpl.c | 3 ++- 19 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c index 4c00cdf0b57d..cb7877a8afe7 100644 --- a/drivers/fpga/ACEX1K.c +++ b/drivers/fpga/ACEX1K.c @@ -9,7 +9,7 @@

#define LOG_CATEGORY UCLASS_FPGA

-#include <common.h> /* core U-Boot definitions */ +#include <config.h> /* core U-Boot definitions */ #include <console.h> #include <log.h> #include <ACEX1K.h> /* ACEX device family */ diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c index 6a4f0cb9bc06..ae06f0123a03 100644 --- a/drivers/fpga/altera.c +++ b/drivers/fpga/altera.c @@ -12,7 +12,6 @@ /* * Altera FPGA support */ -#include <common.h> #include <errno.h> #include <ACEX1K.h> #include <log.h> diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c index 6e8a313db35b..7e78d6e2d6ce 100644 --- a/drivers/fpga/cyclon2.c +++ b/drivers/fpga/cyclon2.c @@ -7,8 +7,9 @@

#define LOG_CATEGORY UCLASS_FPGA

-#include <common.h> /* core U-Boot definitions */ +#include <config.h> /* core U-Boot definitions */ #include <log.h> +#include <time.h> #include <altera.h> #include <ACEX1K.h> /* ACEX device family */ #include <linux/delay.h> diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c index 81e6d8ffc0bd..38ba6c21ea2b 100644 --- a/drivers/fpga/fpga.c +++ b/drivers/fpga/fpga.c @@ -5,7 +5,6 @@ */

/* Generic FPGA support */ -#include <common.h> /* core U-Boot definitions */ #include <init.h> #include <log.h> #include <xilinx.h> /* xilinx specific definitions */ diff --git a/drivers/fpga/intel_sdm_mb.c b/drivers/fpga/intel_sdm_mb.c index 903d143a361c..45caef4f5c10 100644 --- a/drivers/fpga/intel_sdm_mb.c +++ b/drivers/fpga/intel_sdm_mb.c @@ -3,14 +3,16 @@ * Copyright (C) 2018 Intel Corporation <www.intel.com> */

-#include <common.h> #include <altera.h> #include <log.h> +#include <time.h> #include <watchdog.h> #include <asm/arch/mailbox_s10.h> #include <asm/arch/smc_api.h> #include <linux/delay.h> +#include <linux/errno.h> #include <linux/intel-smc.h> +#include <linux/string.h>

#define RECONFIG_STATUS_POLL_RESP_TIMEOUT_MS 60000 #define RECONFIG_STATUS_INTERVAL_DELAY_US 1000000 diff --git a/drivers/fpga/ivm_core.c b/drivers/fpga/ivm_core.c index adc60919f3b0..b9cecdd8720a 100644 --- a/drivers/fpga/ivm_core.c +++ b/drivers/fpga/ivm_core.c @@ -29,7 +29,6 @@ * the ispVMLCOUNT function */

-#include <common.h> #include <log.h> #include <linux/string.h> #include <malloc.h> diff --git a/drivers/fpga/lattice.c b/drivers/fpga/lattice.c index e292d991cd18..036580cad70f 100644 --- a/drivers/fpga/lattice.c +++ b/drivers/fpga/lattice.c @@ -10,7 +10,6 @@ * Copyright 2009 Lattice Semiconductor Corp. */

-#include <common.h> #include <log.h> #include <malloc.h> #include <fpga.h> diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c index d73414d5ac54..bb98c0e2bcf7 100644 --- a/drivers/fpga/socfpga.c +++ b/drivers/fpga/socfpga.c @@ -4,7 +4,7 @@ * All rights reserved. */

-#include <common.h> +#include <config.h> #include <asm/io.h> #include <linux/errno.h> #include <asm/arch/fpga_manager.h> diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c index 96b195063e08..e9822b2bb0ec 100644 --- a/drivers/fpga/socfpga_arria10.c +++ b/drivers/fpga/socfpga_arria10.c @@ -13,7 +13,6 @@ #include <asm/arch/misc.h> #include <altera.h> #include <asm/arch/pinmux.h> -#include <common.h> #include <dm.h> #include <dm/ofnode.h> #include <errno.h> diff --git a/drivers/fpga/socfpga_gen5.c b/drivers/fpga/socfpga_gen5.c index d73474f29ee1..9473f0573289 100644 --- a/drivers/fpga/socfpga_gen5.c +++ b/drivers/fpga/socfpga_gen5.c @@ -4,7 +4,7 @@ * All rights reserved. */

-#include <common.h> +#include <config.h> #include <asm/io.h> #include <linux/errno.h> #include <asm/arch/fpga_manager.h> diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c index 6eef87b78e16..9cd6cb7f0fbd 100644 --- a/drivers/fpga/spartan2.c +++ b/drivers/fpga/spartan2.c @@ -6,7 +6,7 @@

#define LOG_CATEGORY UCLASS_FPGA

-#include <common.h> /* core U-Boot definitions */ +#include <config.h> /* core U-Boot definitions */ #include <log.h> #include <spartan2.h> /* Spartan-II device family */

diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c index e892fa571f19..b4d87d47d933 100644 --- a/drivers/fpga/spartan3.c +++ b/drivers/fpga/spartan3.c @@ -11,8 +11,9 @@

#define LOG_CATEGORY UCLASS_FPGA

-#include <common.h> /* core U-Boot definitions */ +#include <config.h> /* core U-Boot definitions */ #include <log.h> +#include <time.h> #include <spartan3.h> /* Spartan-II device family */

/* Note: The assumption is that we cannot possibly run fast enough to diff --git a/drivers/fpga/stratixII.c b/drivers/fpga/stratixII.c index b450a81072ed..73fecd9dca55 100644 --- a/drivers/fpga/stratixII.c +++ b/drivers/fpga/stratixII.c @@ -4,7 +4,6 @@ * Eran Liberty, Extricom , eran.liberty@gmail.com */

-#include <common.h> /* core U-Boot definitions */ #include <altera.h> #include <linux/delay.h>

diff --git a/drivers/fpga/stratixv.c b/drivers/fpga/stratixv.c index abae3b5b7511..372f16d92d1a 100644 --- a/drivers/fpga/stratixv.c +++ b/drivers/fpga/stratixv.c @@ -3,7 +3,6 @@ * Copyright (C) 2016 Stefan Roese sr@denx.de */

-#include <common.h> #include <altera.h> #include <log.h> #include <spi.h> diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c index be58db54275c..1957e8dcacac 100644 --- a/drivers/fpga/versalpl.c +++ b/drivers/fpga/versalpl.c @@ -4,7 +4,6 @@ * Siva Durga Prasad Paladugu siva.durga.prasad.paladugu@amd.com> */

-#include <common.h> #include <cpu_func.h> #include <log.h> #include <asm/arch/sys_proto.h> diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c index 3ded27f9b3ff..8e2c12bb58b1 100644 --- a/drivers/fpga/virtex2.c +++ b/drivers/fpga/virtex2.c @@ -14,7 +14,7 @@

#define LOG_CATEGORY UCLASS_FPGA

-#include <common.h> +#include <config.h> #include <console.h> #include <log.h> #include <virtex2.h> diff --git a/drivers/fpga/xilinx.c b/drivers/fpga/xilinx.c index 8170c3368ef6..c46513226d9b 100644 --- a/drivers/fpga/xilinx.c +++ b/drivers/fpga/xilinx.c @@ -11,13 +11,13 @@ * Xilinx FPGA support */

-#include <common.h> #include <fpga.h> #include <log.h> #include <virtex2.h> #include <spartan2.h> #include <spartan3.h> #include <zynqpl.h> +#include <linux/string.h>

/* Local Static Functions */ static int xilinx_validate(xilinx_desc *desc, char *fn); diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c index 2656f5fc5ecf..2b62bbbe3cf5 100644 --- a/drivers/fpga/zynqmppl.c +++ b/drivers/fpga/zynqmppl.c @@ -6,7 +6,6 @@ */

#include <console.h> -#include <common.h> #include <compiler.h> #include <cpu_func.h> #include <fpga.h> diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c index a2e3b305fa41..57467b4d975a 100644 --- a/drivers/fpga/zynqpl.c +++ b/drivers/fpga/zynqpl.c @@ -6,10 +6,11 @@ * Joe Hershberger joe.hershberger@ni.com */

-#include <common.h> +#include <config.h> #include <console.h> #include <cpu_func.h> #include <log.h> +#include <time.h> #include <asm/cache.h> #include <asm/io.h> #include <fs.h>