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: Tom Rini <tr...@konsulko.com> Cc: Andrew Davis <a...@ti.com> Cc: "Derald D. Woods" <woods.techni...@gmail.com> Cc: Nishanth Menon <n...@ti.com> Cc: Neha Malcom Francis <n-fran...@ti.com> Cc: Prasanth Babu Mantena <p-mant...@ti.com> Cc: Simon Glass <s...@chromium.org> --- board/ti/am335x/board.c | 2 +- board/ti/am335x/board.h | 2 ++ board/ti/am335x/mux.c | 2 +- board/ti/am43xx/board.c | 2 +- board/ti/am43xx/board.h | 1 + board/ti/am43xx/mux.c | 1 - board/ti/am57xx/board.c | 2 +- board/ti/common/board_detect.c | 2 +- board/ti/common/cape_detect.c | 3 ++- board/ti/dra7xx/evm.c | 2 +- board/ti/ks2_evm/board.c | 2 +- board/ti/ks2_evm/board_k2e.c | 1 - board/ti/ks2_evm/board_k2g.c | 2 +- board/ti/ks2_evm/board_k2hk.c | 1 - board/ti/ks2_evm/board_k2l.c | 1 - board/ti/ks2_evm/ddr3_cfg.c | 1 - board/ti/ks2_evm/ddr3_k2e.c | 1 - board/ti/ks2_evm/ddr3_k2g.c | 1 - board/ti/ks2_evm/ddr3_k2hk.c | 1 - board/ti/ks2_evm/ddr3_k2l.c | 1 - board/ti/omap3evm/evm.c | 2 +- board/ti/panda/panda.c | 1 - board/ti/sdp4430/cmd_bat.c | 1 - board/ti/sdp4430/sdp.c | 1 - include/linux/mtd/omap_gpmc.h | 2 ++ 25 files changed, 16 insertions(+), 22 deletions(-) diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 34f987c2b728..34f4a919656e 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -7,7 +7,7 @@ * Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/ */ -#include <common.h> +#include <config.h> #include <dm.h> #include <env.h> #include <errno.h> diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h index 1284c160d811..b0a3842423fb 100644 --- a/board/ti/am335x/board.h +++ b/board/ti/am335x/board.h @@ -10,6 +10,8 @@ #ifndef _BOARD_H_ #define _BOARD_H_ +#include <linux/string.h> + /** * AM335X (EMIF_4D) EMIF REG_COS_COUNT_1, REG_COS_COUNT_2, and * REG_PR_OLD_COUNT values to avoid LCDC DMA FIFO underflows and Frame diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index 0bad154f86ed..960de15398f8 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <common.h> +#include <config.h> #include <asm/arch/sys_proto.h> #include <asm/arch/hardware.h> #include <asm/arch/mux.h> diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index fdeb63d47900..40b7fcfc3876 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -7,7 +7,7 @@ * Copyright (C) 2013, Texas Instruments, Incorporated - https://www.ti.com/ */ -#include <common.h> +#include <config.h> #include <asm/global_data.h> #include <dm/uclass.h> #include <env.h> diff --git a/board/ti/am43xx/board.h b/board/ti/am43xx/board.h index 37a169aaf758..b1025bdda1e1 100644 --- a/board/ti/am43xx/board.h +++ b/board/ti/am43xx/board.h @@ -11,6 +11,7 @@ #ifndef _BOARD_H_ #define _BOARD_H_ +#include <linux/string.h> #include <asm/arch/omap.h> #define DEV_ATTR_MAX_OFFSET 5 diff --git a/board/ti/am43xx/mux.c b/board/ti/am43xx/mux.c index 463f1cc71784..2fcccbd1f043 100644 --- a/board/ti/am43xx/mux.c +++ b/board/ti/am43xx/mux.c @@ -5,7 +5,6 @@ * Copyright (C) 2013 Texas Instruments Incorporated - https://www.ti.com/ */ -#include <common.h> #include <asm/arch/sys_proto.h> #include <asm/arch/mux.h> #include "../common/board_detect.h" diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index b004a89bb324..48668884bdd5 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -7,7 +7,7 @@ * Based on board/ti/dra7xx/evm.c */ -#include <common.h> +#include <config.h> #include <env.h> #include <fastboot.h> #include <fdt_support.h> diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c index 644df3b0b6ab..ea21d48bbc01 100644 --- a/board/ti/common/board_detect.c +++ b/board/ti/common/board_detect.c @@ -7,9 +7,9 @@ * Steve Kipisz */ -#include <common.h> #include <log.h> #include <net.h> +#include <linux/types.h> #include <asm/arch/hardware.h> #include <asm/omap_common.h> #include <dm/uclass.h> diff --git a/board/ti/common/cape_detect.c b/board/ti/common/cape_detect.c index 2e6105cfbf15..da805befabcb 100644 --- a/board/ti/common/cape_detect.c +++ b/board/ti/common/cape_detect.c @@ -4,10 +4,11 @@ * Köry Maincent, Bootlin, <kory.mainc...@bootlin.com> */ -#include <common.h> +#include <stdio.h> #include <malloc.h> #include <i2c.h> #include <extension_board.h> +#include <vsprintf.h> #include "cape_detect.h" diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index a8a216d034a4..2b1db2541b0b 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -9,7 +9,7 @@ * Aneesh V <ane...@ti.com> * Steve Sakoman <st...@sakoman.com> */ -#include <common.h> +#include <config.h> #include <env.h> #include <fdt_support.h> #include <fastboot.h> diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c index 5dcda12105b9..c6735d37dda7 100644 --- a/board/ti/ks2_evm/board.c +++ b/board/ti/ks2_evm/board.c @@ -6,7 +6,7 @@ * Texas Instruments Incorporated, <www.ti.com> */ -#include <common.h> +#include <config.h> #include <asm/global_data.h> #include "board.h" #include <env.h> diff --git a/board/ti/ks2_evm/board_k2e.c b/board/ti/ks2_evm/board_k2e.c index 39abb24e1560..4385be4221b7 100644 --- a/board/ti/ks2_evm/board_k2e.c +++ b/board/ti/ks2_evm/board_k2e.c @@ -6,7 +6,6 @@ * Texas Instruments Incorporated, <www.ti.com> */ -#include <common.h> #include <image.h> #include <init.h> #include <asm/arch/ddr3.h> diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c index 4fed42ec1244..d07b77d23e27 100644 --- a/board/ti/ks2_evm/board_k2g.c +++ b/board/ti/ks2_evm/board_k2g.c @@ -5,7 +5,7 @@ * (C) Copyright 2015 * Texas Instruments Incorporated, <www.ti.com> */ -#include <common.h> +#include <config.h> #include <env.h> #include <hang.h> #include <image.h> diff --git a/board/ti/ks2_evm/board_k2hk.c b/board/ti/ks2_evm/board_k2hk.c index 12c4649c3c4c..2b5d2d756649 100644 --- a/board/ti/ks2_evm/board_k2hk.c +++ b/board/ti/ks2_evm/board_k2hk.c @@ -6,7 +6,6 @@ * Texas Instruments Incorporated, <www.ti.com> */ -#include <common.h> #include <image.h> #include <init.h> #include <asm/arch/clock.h> diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c index f759ee364666..1971bc94f7d3 100644 --- a/board/ti/ks2_evm/board_k2l.c +++ b/board/ti/ks2_evm/board_k2l.c @@ -6,7 +6,6 @@ * Texas Instruments Incorporated, <www.ti.com> */ -#include <common.h> #include <image.h> #include <init.h> #include <asm/arch/ddr3.h> diff --git a/board/ti/ks2_evm/ddr3_cfg.c b/board/ti/ks2_evm/ddr3_cfg.c index 0ade75263f8d..fe350fee795e 100644 --- a/board/ti/ks2_evm/ddr3_cfg.c +++ b/board/ti/ks2_evm/ddr3_cfg.c @@ -6,7 +6,6 @@ * Texas Instruments Incorporated, <www.ti.com> */ -#include <common.h> #include <asm/arch/ddr3.h> #include "ddr3_cfg.h" diff --git a/board/ti/ks2_evm/ddr3_k2e.c b/board/ti/ks2_evm/ddr3_k2e.c index 95fe3a9021e2..28305326e6a1 100644 --- a/board/ti/ks2_evm/ddr3_k2e.c +++ b/board/ti/ks2_evm/ddr3_k2e.c @@ -6,7 +6,6 @@ * Texas Instruments Incorporated, <www.ti.com> */ -#include <common.h> #include "ddr3_cfg.h" #include <asm/arch/ddr3.h> diff --git a/board/ti/ks2_evm/ddr3_k2g.c b/board/ti/ks2_evm/ddr3_k2g.c index 3000d7245eb2..ef39e0781521 100644 --- a/board/ti/ks2_evm/ddr3_k2g.c +++ b/board/ti/ks2_evm/ddr3_k2g.c @@ -6,7 +6,6 @@ * Texas Instruments Incorporated, <www.ti.com> */ -#include <common.h> #include "ddr3_cfg.h" #include <asm/arch/ddr3.h> #include <asm/arch/hardware.h> diff --git a/board/ti/ks2_evm/ddr3_k2hk.c b/board/ti/ks2_evm/ddr3_k2hk.c index 198c5da0e622..05c050cee440 100644 --- a/board/ti/ks2_evm/ddr3_k2hk.c +++ b/board/ti/ks2_evm/ddr3_k2hk.c @@ -6,7 +6,6 @@ * Texas Instruments Incorporated, <www.ti.com> */ -#include <common.h> #include "ddr3_cfg.h" #include <asm/arch/ddr3.h> #include <asm/arch/hardware.h> diff --git a/board/ti/ks2_evm/ddr3_k2l.c b/board/ti/ks2_evm/ddr3_k2l.c index 805bf81f6bdf..aa6d45f0f8af 100644 --- a/board/ti/ks2_evm/ddr3_k2l.c +++ b/board/ti/ks2_evm/ddr3_k2l.c @@ -6,7 +6,6 @@ * Texas Instruments Incorporated, <www.ti.com> */ -#include <common.h> #include "ddr3_cfg.h" #include <asm/arch/ddr3.h> diff --git a/board/ti/omap3evm/evm.c b/board/ti/omap3evm/evm.c index a4d6a0138d9b..4eb08add2564 100644 --- a/board/ti/omap3evm/evm.c +++ b/board/ti/omap3evm/evm.c @@ -10,7 +10,7 @@ * Richard Woodruff <r-woodru...@ti.com> * Syed Mohammed Khasim <kha...@ti.com> */ -#include <common.h> +#include <config.h> #include <dm.h> #include <env.h> #include <init.h> diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index 220931860190..e47d3a952d5c 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -4,7 +4,6 @@ * Texas Instruments Incorporated, <www.ti.com> * Steve Sakoman <st...@sakoman.com> */ -#include <common.h> #include <init.h> #include <log.h> #include <net.h> diff --git a/board/ti/sdp4430/cmd_bat.c b/board/ti/sdp4430/cmd_bat.c index 6c1e6ca393c6..6bf44d926550 100644 --- a/board/ti/sdp4430/cmd_bat.c +++ b/board/ti/sdp4430/cmd_bat.c @@ -3,7 +3,6 @@ * Copyright (C) 2010 Texas Instruments */ -#include <common.h> #include <command.h> #ifdef CONFIG_CMD_BAT diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c index 2c9ae794fd4b..1a71390f543b 100644 --- a/board/ti/sdp4430/sdp.c +++ b/board/ti/sdp4430/sdp.c @@ -5,7 +5,6 @@ * Aneesh V <ane...@ti.com> * Steve Sakoman <st...@sakoman.com> */ -#include <common.h> #include <init.h> #include <net.h> #include <twl6030.h> diff --git a/include/linux/mtd/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h index f08e700a1daf..2dbf988863f9 100644 --- a/include/linux/mtd/omap_gpmc.h +++ b/include/linux/mtd/omap_gpmc.h @@ -8,6 +8,8 @@ #ifndef __ASM_OMAP_GPMC_H #define __ASM_OMAP_GPMC_H +#include <linux/types.h> + /* Maximum Number of Chip Selects */ #define GPMC_CS_NUM 8 -- 2.34.1