From ba825dad9aa3e382de46a7992390edea51bc0b5d Mon Sep 17 00:00:00 2001 From: Tom Rini <trini@konsulko.com> Date: Tue, 30 Apr 2024 20:43:04 -0600 Subject: [PATCH] board: toradex: Remove <common.h> and add needed includes Remove <common.h> from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini <trini@konsulko.com> --- board/toradex/apalis-imx8/apalis-imx8.c | 1 - board/toradex/apalis-tk1/apalis-tk1.c | 1 - board/toradex/apalis-tk1/as3722_init.c | 1 - board/toradex/apalis_imx6/apalis_imx6.c | 2 +- board/toradex/apalis_imx6/do_fuse.c | 1 - board/toradex/apalis_imx6/pf0100.c | 1 - board/toradex/apalis_t30/apalis_t30-spl.c | 1 - board/toradex/apalis_t30/apalis_t30.c | 1 - board/toradex/colibri-imx6ull/colibri-imx6ull.c | 2 +- board/toradex/colibri-imx8x/colibri-imx8x.c | 1 - board/toradex/colibri_imx6/colibri_imx6.c | 2 +- board/toradex/colibri_imx6/do_fuse.c | 1 - board/toradex/colibri_imx6/pf0100.c | 1 - board/toradex/colibri_imx7/colibri_imx7.c | 1 - board/toradex/colibri_t20/colibri_t20.c | 1 - board/toradex/colibri_t30/colibri_t30-spl.c | 1 - board/toradex/colibri_t30/colibri_t30.c | 1 - board/toradex/colibri_vf/colibri_vf.c | 1 - board/toradex/common/tdx-cfg-block.c | 2 +- board/toradex/common/tdx-common.c | 2 +- board/toradex/verdin-imx8mm/spl.c | 1 - board/toradex/verdin-imx8mm/verdin-imx8mm.c | 2 +- board/toradex/verdin-imx8mp/spl.c | 1 - board/toradex/verdin-imx8mp/verdin-imx8mp.c | 2 +- 24 files changed, 7 insertions(+), 24 deletions(-) diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c index 0f993e644d..72d67d90d4 100644 --- a/board/toradex/apalis-imx8/apalis-imx8.c +++ b/board/toradex/apalis-imx8/apalis-imx8.c @@ -3,7 +3,6 @@ * Copyright 2019 Toradex */ -#include <common.h> #include <cpu_func.h> #include <init.h> #include <asm/global_data.h> diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c index ee87d9f414..4557ed1f1f 100644 --- a/board/toradex/apalis-tk1/apalis-tk1.c +++ b/board/toradex/apalis-tk1/apalis-tk1.c @@ -3,7 +3,6 @@ * Copyright (c) 2016-2018 Toradex, Inc. */ -#include <common.h> #include <dm.h> #include <env.h> #include <init.h> diff --git a/board/toradex/apalis-tk1/as3722_init.c b/board/toradex/apalis-tk1/as3722_init.c index e9bd1028be..8971f7aa16 100644 --- a/board/toradex/apalis-tk1/as3722_init.c +++ b/board/toradex/apalis-tk1/as3722_init.c @@ -3,7 +3,6 @@ * Copyright (c) 2012-2016 Toradex, Inc. */ -#include <common.h> #include <log.h> #include <asm/io.h> #include <asm/arch-tegra/tegra_i2c.h> diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 0da245374a..2dcc042ab2 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -6,7 +6,7 @@ * copied from nitrogen6x */ -#include <common.h> +#include <config.h> #include <cpu_func.h> #include <dm.h> #include <image.h> diff --git a/board/toradex/apalis_imx6/do_fuse.c b/board/toradex/apalis_imx6/do_fuse.c index 6991b1bc13..b404b01e03 100644 --- a/board/toradex/apalis_imx6/do_fuse.c +++ b/board/toradex/apalis_imx6/do_fuse.c @@ -7,7 +7,6 @@ * Helpers for i.MX OTP fusing during module production */ -#include <common.h> #ifndef CONFIG_SPL_BUILD #include <command.h> #include <console.h> diff --git a/board/toradex/apalis_imx6/pf0100.c b/board/toradex/apalis_imx6/pf0100.c index c89052ff5d..157aaec6fe 100644 --- a/board/toradex/apalis_imx6/pf0100.c +++ b/board/toradex/apalis_imx6/pf0100.c @@ -7,7 +7,6 @@ * Helpers for Freescale PMIC PF0100 */ -#include <common.h> #include <command.h> #include <i2c.h> #include <asm/arch/imx-regs.h> diff --git a/board/toradex/apalis_t30/apalis_t30-spl.c b/board/toradex/apalis_t30/apalis_t30-spl.c index 6e54464183..2504945249 100644 --- a/board/toradex/apalis_t30/apalis_t30-spl.c +++ b/board/toradex/apalis_t30/apalis_t30-spl.c @@ -7,7 +7,6 @@ * Svyatoslav Ryhel <clamor95@gmail.com> */ -#include <common.h> #include <asm/arch-tegra/tegra_i2c.h> #include <linux/delay.h> diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c index b10beb4479..02e8f8eb1f 100644 --- a/board/toradex/apalis_t30/apalis_t30.c +++ b/board/toradex/apalis_t30/apalis_t30.c @@ -4,7 +4,6 @@ * Marcel Ziswiler <marcel@ziswiler.com> */ -#include <common.h> #include <env.h> #include <init.h> #include <log.h> diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index 9b9fb342c9..7bfe200d6e 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -2,7 +2,7 @@ /* * Copyright (C) 2018-2019 Toradex AG */ -#include <common.h> +#include <config.h> #include <init.h> #include <asm/global_data.h> #include <linux/delay.h> diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c index 3565785259..2a71e7b92d 100644 --- a/board/toradex/colibri-imx8x/colibri-imx8x.c +++ b/board/toradex/colibri-imx8x/colibri-imx8x.c @@ -3,7 +3,6 @@ * Copyright 2019 Toradex */ -#include <common.h> #include <cpu_func.h> #include <init.h> #include <asm/global_data.h> diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index ce19a9c797..34e82c2b07 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -6,7 +6,7 @@ * copied from nitrogen6x */ -#include <common.h> +#include <config.h> #include <cpu_func.h> #include <dm.h> #include <env.h> diff --git a/board/toradex/colibri_imx6/do_fuse.c b/board/toradex/colibri_imx6/do_fuse.c index 6991b1bc13..b404b01e03 100644 --- a/board/toradex/colibri_imx6/do_fuse.c +++ b/board/toradex/colibri_imx6/do_fuse.c @@ -7,7 +7,6 @@ * Helpers for i.MX OTP fusing during module production */ -#include <common.h> #ifndef CONFIG_SPL_BUILD #include <command.h> #include <console.h> diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c index 8f08d8c733..58b7bc3bb9 100644 --- a/board/toradex/colibri_imx6/pf0100.c +++ b/board/toradex/colibri_imx6/pf0100.c @@ -7,7 +7,6 @@ * Helpers for Freescale PMIC PF0100 */ -#include <common.h> #include <command.h> #include <i2c.h> #include <asm/arch/imx-regs.h> diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index c37c5e0af6..e966ffbf78 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -3,7 +3,6 @@ * Copyright (C) 2016-2018 Toradex AG */ -#include <common.h> #include <cpu_func.h> #include <init.h> #include <net.h> diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c index 97e33d00f0..6425fa881e 100644 --- a/board/toradex/colibri_t20/colibri_t20.c +++ b/board/toradex/colibri_t20/colibri_t20.c @@ -3,7 +3,6 @@ * Copyright (C) 2012 Lucas Stach */ -#include <common.h> #include <env.h> #include <fdt_support.h> #include <init.h> diff --git a/board/toradex/colibri_t30/colibri_t30-spl.c b/board/toradex/colibri_t30/colibri_t30-spl.c index 6e54464183..2504945249 100644 --- a/board/toradex/colibri_t30/colibri_t30-spl.c +++ b/board/toradex/colibri_t30/colibri_t30-spl.c @@ -7,7 +7,6 @@ * Svyatoslav Ryhel <clamor95@gmail.com> */ -#include <common.h> #include <asm/arch-tegra/tegra_i2c.h> #include <linux/delay.h> diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c index 0da247de98..342673ac50 100644 --- a/board/toradex/colibri_t30/colibri_t30.c +++ b/board/toradex/colibri_t30/colibri_t30.c @@ -4,7 +4,6 @@ * Stefan Agner <stefan@agner.ch> */ -#include <common.h> #include <env.h> #include <init.h> #include <asm/arch/gp_padctrl.h> diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index 3592000880..87f82396d6 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -6,7 +6,6 @@ * Copyright 2013 Freescale Semiconductor, Inc. */ -#include <common.h> #include <init.h> #include <asm/global_data.h> diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index dcf00d2b63..2225cefec1 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -3,7 +3,7 @@ * Copyright (c) 2016-2020 Toradex */ -#include <common.h> +#include <config.h> #include <asm/global_data.h> #include "tdx-cfg-block.h" #include "tdx-eeprom.h" diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index 9f09788137..a6b45cdab8 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -4,7 +4,7 @@ */ #include <dm.h> -#include <common.h> +#include <config.h> #include <env.h> #include <g_dnl.h> #include <init.h> diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c index afa3686083..1020078afe 100644 --- a/board/toradex/verdin-imx8mm/spl.c +++ b/board/toradex/verdin-imx8mm/spl.c @@ -3,7 +3,6 @@ * Copyright 2020 Toradex */ -#include <common.h> #include <command.h> #include <image.h> #include <init.h> diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c index 55c02653da..020ee67748 100644 --- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c +++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c @@ -3,7 +3,7 @@ * Copyright 2020-2021 Toradex */ -#include <common.h> +#include <config.h> #include <init.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> diff --git a/board/toradex/verdin-imx8mp/spl.c b/board/toradex/verdin-imx8mp/spl.c index 73729a42b4..8628112a78 100644 --- a/board/toradex/verdin-imx8mp/spl.c +++ b/board/toradex/verdin-imx8mp/spl.c @@ -3,7 +3,6 @@ * Copyright 2022 Toradex */ -#include <common.h> #include <hang.h> #include <init.h> #include <log.h> diff --git a/board/toradex/verdin-imx8mp/verdin-imx8mp.c b/board/toradex/verdin-imx8mp/verdin-imx8mp.c index e16a771e3e..e57ec3b689 100644 --- a/board/toradex/verdin-imx8mp/verdin-imx8mp.c +++ b/board/toradex/verdin-imx8mp/verdin-imx8mp.c @@ -3,7 +3,7 @@ * Copyright 2022 Toradex */ -#include <common.h> +#include <config.h> #include <asm/arch/clock.h> #include <asm/arch/imx8mp_pins.h> #include <asm/arch/sys_proto.h> -- 2.39.5