* [PATCH 01/33] arm: mach-versatile: Remove dead code
@ 2024-04-30 13:35 Tom Rini
2024-04-30 13:35 ` [PATCH 02/33] include: Add missing headers in a few instances Tom Rini
` (32 more replies)
0 siblings, 33 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot
This platform is no longer supported in tree, remove.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-versatile/Makefile | 7 ----
arch/arm/mach-versatile/reset.S | 28 ---------------
arch/arm/mach-versatile/timer.c | 62 --------------------------------
3 files changed, 97 deletions(-)
delete mode 100644 arch/arm/mach-versatile/Makefile
delete mode 100644 arch/arm/mach-versatile/reset.S
delete mode 100644 arch/arm/mach-versatile/timer.c
diff --git a/arch/arm/mach-versatile/Makefile b/arch/arm/mach-versatile/Makefile
deleted file mode 100644
index 858ca9414c05..000000000000
--- a/arch/arm/mach-versatile/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-
-obj-y = timer.o
-obj-y += reset.o
diff --git a/arch/arm/mach-versatile/reset.S b/arch/arm/mach-versatile/reset.S
deleted file mode 100644
index c7f1225fb298..000000000000
--- a/arch/arm/mach-versatile/reset.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * armboot - Startup Code for ARM926EJS CPU-core
- *
- * Copyright (c) 2003 Texas Instruments
- *
- * ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------
- *
- * Copyright (c) 2001 Marius Gröger <mag@sysgo.de>
- * Copyright (c) 2002 Alex Züpke <azu@sysgo.de>
- * Copyright (c) 2002 Gary Jennejohn <garyj@denx.de>
- * Copyright (c) 2003 Richard Woodruff <r-woodruff2@ti.com>
- * Copyright (c) 2003 Kshitij <kshitij@ti.com>
- */
-
- .align 5
-.globl reset_cpu
-reset_cpu:
- ldr r1, rstctl1 /* get clkm1 reset ctl */
- mov r3, #0x0
- strh r3, [r1] /* clear it */
- mov r3, #0x8
- strh r3, [r1] /* force dsp+arm reset */
-_loop_forever:
- b _loop_forever
-
-rstctl1:
- .word 0xfffece10
diff --git a/arch/arm/mach-versatile/timer.c b/arch/arm/mach-versatile/timer.c
deleted file mode 100644
index b471412186d1..000000000000
--- a/arch/arm/mach-versatile/timer.c
+++ /dev/null
@@ -1,62 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2003
- * Texas Instruments <www.ti.com>
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Alex Zuepke <azu@sysgo.de>
- *
- * (C) Copyright 2002-2004
- * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
- *
- * (C) Copyright 2004
- * Philippe Robin, ARM Ltd. <philippe.robin@arm.com>
- */
-
-#include <common.h>
-
-#define TIMER_ENABLE (1 << 7)
-#define TIMER_MODE_MSK (1 << 6)
-#define TIMER_MODE_FR (0 << 6)
-#define TIMER_MODE_PD (1 << 6)
-
-#define TIMER_INT_EN (1 << 5)
-#define TIMER_PRS_MSK (3 << 2)
-#define TIMER_PRS_8S (1 << 3)
-#define TIMER_SIZE_MSK (1 << 2)
-#define TIMER_ONE_SHT (1 << 0)
-
-int timer_init (void)
-{
- ulong tmr_ctrl_val;
-
- /* 1st disable the Timer */
- tmr_ctrl_val = *(volatile ulong *)(CFG_SYS_TIMERBASE + 8);
- tmr_ctrl_val &= ~TIMER_ENABLE;
- *(volatile ulong *)(CFG_SYS_TIMERBASE + 8) = tmr_ctrl_val;
-
- /*
- * The Timer Control Register has one Undefined/Shouldn't Use Bit
- * So we should do read/modify/write Operation
- */
-
- /*
- * Timer Mode : Free Running
- * Interrupt : Disabled
- * Prescale : 8 Stage, Clk/256
- * Tmr Siz : 16 Bit Counter
- * Tmr in Wrapping Mode
- */
- tmr_ctrl_val = *(volatile ulong *)(CFG_SYS_TIMERBASE + 8);
- tmr_ctrl_val &= ~(TIMER_MODE_MSK | TIMER_INT_EN | TIMER_PRS_MSK | TIMER_SIZE_MSK | TIMER_ONE_SHT );
- tmr_ctrl_val |= (TIMER_ENABLE | TIMER_PRS_8S);
-
- *(volatile ulong *)(CFG_SYS_TIMERBASE + 8) = tmr_ctrl_val;
-
- return 0;
-}
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 02/33] include: Add missing headers in a few instances
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 03/33] arm: xilinx: Remove <common.h> and add needed includes Tom Rini
` (31 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot
A few headers rely on indirect inclusion of <linux/types.h> or
<linux/kernel.h> so add them directly. In the case of <netdev.h> add a
"struct bd_info;" as well rather than the large header chain to resolve
that.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
include/mailbox.h | 2 ++
include/netdev.h | 3 +++
include/phy_interface.h | 1 +
include/u-boot/sha1.h | 2 ++
include/u-boot/sha256.h | 2 ++
include/u-boot/sha512.h | 2 ++
6 files changed, 12 insertions(+)
diff --git a/include/mailbox.h b/include/mailbox.h
index 323b6c2bc5d8..e70266fb61c9 100644
--- a/include/mailbox.h
+++ b/include/mailbox.h
@@ -6,6 +6,8 @@
#ifndef _MAILBOX_H
#define _MAILBOX_H
+#include <linux/types.h>
+
/**
* A mailbox is a hardware mechanism for transferring small fixed-size messages
* and/or notifications between the CPU on which U-Boot runs and some other
diff --git a/include/netdev.h b/include/netdev.h
index 2a7f40e5040e..2a06d9a261bb 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -10,9 +10,12 @@
#ifndef _NETDEV_H_
#define _NETDEV_H_
+
+#include <linux/types.h>
#include <phy_interface.h>
struct udevice;
+struct bd_info;
/*
* Board and CPU-specific initialization functions
diff --git a/include/phy_interface.h b/include/phy_interface.h
index 31be3228c7c4..b74f4ccd84ad 100644
--- a/include/phy_interface.h
+++ b/include/phy_interface.h
@@ -11,6 +11,7 @@
#define _PHY_INTERFACE_H
#include <string.h>
+#include <linux/kernel.h>
typedef enum {
PHY_INTERFACE_MODE_NA, /* don't touch */
diff --git a/include/u-boot/sha1.h b/include/u-boot/sha1.h
index 09fee594d263..c1e9f67068d4 100644
--- a/include/u-boot/sha1.h
+++ b/include/u-boot/sha1.h
@@ -14,6 +14,8 @@
#ifndef _SHA1_H
#define _SHA1_H
+#include <linux/types.h>
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/u-boot/sha256.h b/include/u-boot/sha256.h
index 9aa1251789a3..a4fe176c0b46 100644
--- a/include/u-boot/sha256.h
+++ b/include/u-boot/sha256.h
@@ -1,6 +1,8 @@
#ifndef _SHA256_H
#define _SHA256_H
+#include <linux/types.h>
+
#define SHA256_SUM_LEN 32
#define SHA256_DER_LEN 19
diff --git a/include/u-boot/sha512.h b/include/u-boot/sha512.h
index 516729d77506..90bd96a3f8c2 100644
--- a/include/u-boot/sha512.h
+++ b/include/u-boot/sha512.h
@@ -1,6 +1,8 @@
#ifndef _SHA512_H
#define _SHA512_H
+#include <linux/types.h>
+
#define SHA384_SUM_LEN 48
#define SHA384_DER_LEN 19
#define SHA512_SUM_LEN 64
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 03/33] arm: xilinx: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
2024-04-30 13:35 ` [PATCH 02/33] include: Add missing headers in a few instances Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 04/33] arm: u8500: " Tom Rini
` (30 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Michal Simek
Remove <common.h> from all mach-versal-net, mach-versal, mach-zynq and
mach-zynqmp files and when needed add missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Michal Simek <michal.simek@amd.com>
---
arch/arm/mach-versal-net/clk.c | 2 +-
arch/arm/mach-versal-net/cpu.c | 2 +-
arch/arm/mach-versal/clk.c | 2 +-
arch/arm/mach-versal/cpu.c | 2 +-
arch/arm/mach-versal/mp.c | 3 ++-
arch/arm/mach-zynq/clk.c | 1 -
arch/arm/mach-zynq/cpu.c | 3 ++-
arch/arm/mach-zynq/ddrc.c | 2 +-
arch/arm/mach-zynq/slcr.c | 1 -
arch/arm/mach-zynq/spl.c | 1 -
arch/arm/mach-zynqmp-r5/cpu.c | 1 -
arch/arm/mach-zynqmp/aes.c | 3 +--
arch/arm/mach-zynqmp/clk.c | 2 +-
arch/arm/mach-zynqmp/cpu.c | 4 +++-
arch/arm/mach-zynqmp/ecc_spl_init.c | 1 -
arch/arm/mach-zynqmp/handoff.c | 1 -
arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h | 2 ++
arch/arm/mach-zynqmp/mp.c | 4 +++-
arch/arm/mach-zynqmp/psu_spl_init.c | 1 -
arch/arm/mach-zynqmp/spl.c | 1 -
20 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/arch/arm/mach-versal-net/clk.c b/arch/arm/mach-versal-net/clk.c
index d097de7afa63..a88b5101eb1b 100644
--- a/arch/arm/mach-versal-net/clk.c
+++ b/arch/arm/mach-versal-net/clk.c
@@ -6,10 +6,10 @@
* Michal Simek <michal.simek@amd.com>
*/
-#include <common.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-versal-net/cpu.c b/arch/arm/mach-versal-net/cpu.c
index a82741e70fc8..59b0cb2e78f3 100644
--- a/arch/arm/mach-versal-net/cpu.c
+++ b/arch/arm/mach-versal-net/cpu.c
@@ -6,11 +6,11 @@
* Michal Simek <michal.simek@amd.com>
*/
-#include <common.h>
#include <init.h>
#include <asm/armv8/mmu.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-versal/clk.c b/arch/arm/mach-versal/clk.c
index 5e3f44c77822..0c7d468f1dd0 100644
--- a/arch/arm/mach-versal/clk.c
+++ b/arch/arm/mach-versal/clk.c
@@ -4,10 +4,10 @@
* Michal Simek <michal.simek@amd.com>
*/
-#include <common.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
index e4dc305d9288..7de431e55005 100644
--- a/arch/arm/mach-versal/cpu.c
+++ b/arch/arm/mach-versal/cpu.c
@@ -4,11 +4,11 @@
* Michal Simek <michal.simek@amd.com>
*/
-#include <common.h>
#include <init.h>
#include <asm/armv8/mmu.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c
index 2487b482ddb1..921ca49c3596 100644
--- a/arch/arm/mach-versal/mp.c
+++ b/arch/arm/mach-versal/mp.c
@@ -4,7 +4,8 @@
* Siva Durga Prasad Paladugu <siva.durga.prasad.paladugu@amd.com>
*/
-#include <common.h>
+#include <config.h>
+#include <linux/string.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 5e1ba8d43ed1..c1b018cf22e9 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -4,7 +4,6 @@
* Copyright (C) 2013 Xilinx, Inc. All rights reserved.
*/
#include <clk.h>
-#include <common.h>
#include <dm.h>
#include <init.h>
#include <malloc.h>
diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
index 3b6518c71c90..c75e453d5730 100644
--- a/arch/arm/mach-zynq/cpu.c
+++ b/arch/arm/mach-zynq/cpu.c
@@ -3,10 +3,11 @@
* Copyright (C) 2012 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2012 Xilinx, Inc. All rights reserved.
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <init.h>
#include <zynqpl.h>
+#include <linux/errno.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <asm/arch/clk.h>
diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c
index 28988ef95b5a..b9a2eef5a6f0 100644
--- a/arch/arm/mach-zynq/ddrc.c
+++ b/arch/arm/mach-zynq/ddrc.c
@@ -4,7 +4,7 @@
* Copyright (C) 2012 - 2017 Xilinx, Inc. All rights reserved.
*/
-#include <common.h>
+#include <linux/string.h>
#include <asm/io.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index 5d9f4d23f34b..ef877df0fe85 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -3,7 +3,6 @@
* Copyright (c) 2013 - 2017 Xilinx Inc.
*/
-#include <common.h>
#include <asm/io.h>
#include <malloc.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index fea1c9b12ad1..8ef12ed65ceb 100644
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -2,7 +2,6 @@
/*
* (C) Copyright 2014 - 2017 Xilinx, Inc. Michal Simek
*/
-#include <common.h>
#include <debug_uart.h>
#include <hang.h>
#include <image.h>
diff --git a/arch/arm/mach-zynqmp-r5/cpu.c b/arch/arm/mach-zynqmp-r5/cpu.c
index 0d368443d824..9a912dd5bd7c 100644
--- a/arch/arm/mach-zynqmp-r5/cpu.c
+++ b/arch/arm/mach-zynqmp-r5/cpu.c
@@ -3,7 +3,6 @@
* Copyright (C) 2018 Xilinx, Inc. (Michal Simek)
*/
-#include <common.h>
#include <cpu_func.h>
#include <init.h>
#include <asm/armv7_mpu.h>
diff --git a/arch/arm/mach-zynqmp/aes.c b/arch/arm/mach-zynqmp/aes.c
index 8a2b7fdcbe9f..9a05fbf9c11b 100644
--- a/arch/arm/mach-zynqmp/aes.c
+++ b/arch/arm/mach-zynqmp/aes.c
@@ -7,9 +7,8 @@
* Christian Taedcke <christian.taedcke@weidmueller.com>
*/
-#include <common.h>
#include <mach/zynqmp_aes.h>
-
+#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <cpu_func.h>
#include <memalign.h>
diff --git a/arch/arm/mach-zynqmp/clk.c b/arch/arm/mach-zynqmp/clk.c
index 3b05f8455bf5..dc8e2cbd3da4 100644
--- a/arch/arm/mach-zynqmp/clk.c
+++ b/arch/arm/mach-zynqmp/clk.c
@@ -4,13 +4,13 @@
* Michal Simek <michal.simek@amd.com>
*/
-#include <common.h>
#include <init.h>
#include <time.h>
#include <asm/arch/clk.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index 6ae27894ecd9..d7b5e99504c4 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -4,14 +4,16 @@
* Michal Simek <michal.simek@amd.com>
*/
-#include <common.h>
#include <init.h>
#include <time.h>
+#include <linux/errno.h>
+#include <linux/types.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
#include <asm/armv8/mmu.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
#include <zynqmp_firmware.h>
#include <asm/cache.h>
diff --git a/arch/arm/mach-zynqmp/ecc_spl_init.c b/arch/arm/mach-zynqmp/ecc_spl_init.c
index f547d8e3a5bf..1eef10789514 100644
--- a/arch/arm/mach-zynqmp/ecc_spl_init.c
+++ b/arch/arm/mach-zynqmp/ecc_spl_init.c
@@ -5,7 +5,6 @@
* Jorge Ramirez-Ortiz <jorge@foundries.io>
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/arch/hardware.h>
#include <asm/arch/ecc_spl_init.h>
diff --git a/arch/arm/mach-zynqmp/handoff.c b/arch/arm/mach-zynqmp/handoff.c
index dce92438926e..b007307e1f36 100644
--- a/arch/arm/mach-zynqmp/handoff.c
+++ b/arch/arm/mach-zynqmp/handoff.c
@@ -5,7 +5,6 @@
* Michal Simek <michal.simek@amd.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h b/arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h
index 2a9cffbd0f80..01a13d4c7c06 100644
--- a/arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h
+++ b/arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h
@@ -9,6 +9,8 @@
#ifndef ZYNQMP_AES_H
#define ZYNQMP_AES_H
+#include <linux/types.h>
+
struct zynqmp_aes {
u64 srcaddr;
u64 ivaddr;
diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c
index aff9054212c5..9b46a25a1cbe 100644
--- a/arch/arm/mach-zynqmp/mp.c
+++ b/arch/arm/mach-zynqmp/mp.c
@@ -4,14 +4,16 @@
* Michal Simek <michal.simek@amd.com>
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <log.h>
+#include <vsprintf.h>
#include <zynqmp_firmware.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
#include <asm/io.h>
#include <linux/delay.h>
+#include <linux/string.h>
#define LOCK 0
#define SPLIT 1
diff --git a/arch/arm/mach-zynqmp/psu_spl_init.c b/arch/arm/mach-zynqmp/psu_spl_init.c
index b4d7f44bbeee..5b4d66359bfb 100644
--- a/arch/arm/mach-zynqmp/psu_spl_init.c
+++ b/arch/arm/mach-zynqmp/psu_spl_init.c
@@ -4,7 +4,6 @@
*
* Michal Simek <michal.simek@amd.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/psu_init_gpl.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
index 979ff3aef6c2..6b67245f348c 100644
--- a/arch/arm/mach-zynqmp/spl.c
+++ b/arch/arm/mach-zynqmp/spl.c
@@ -5,7 +5,6 @@
* Michal Simek <michal.simek@amd.com>
*/
-#include <common.h>
#include <image.h>
#include <init.h>
#include <log.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 04/33] arm: u8500: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
2024-04-30 13:35 ` [PATCH 02/33] include: Add missing headers in a few instances Tom Rini
2024-04-30 13:35 ` [PATCH 03/33] arm: xilinx: Remove <common.h> and add needed includes Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 14:18 ` Linus Walleij
2024-04-30 13:35 ` [PATCH 05/33] arm: tegra: " Tom Rini
` (29 subsequent siblings)
32 siblings, 1 reply; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Stephan Gerhold, Linus Walleij
Remove <common.h> from all mach-u8500 files and when needed add missing
include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Stephan Gerhold <stephan@gerhold.net>
Cc: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/mach-u8500/cache.c | 2 +-
arch/arm/mach-u8500/cpuinfo.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/mach-u8500/cache.c b/arch/arm/mach-u8500/cache.c
index 05a91346a897..7541b567d0fd 100644
--- a/arch/arm/mach-u8500/cache.c
+++ b/arch/arm/mach-u8500/cache.c
@@ -3,7 +3,7 @@
* Copyright (C) 2019 Stephan Gerhold <stephan@gerhold.net>
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <asm/armv7.h>
#include <asm/cache.h>
diff --git a/arch/arm/mach-u8500/cpuinfo.c b/arch/arm/mach-u8500/cpuinfo.c
index ab05b8a51b23..6d4c6196c3df 100644
--- a/arch/arm/mach-u8500/cpuinfo.c
+++ b/arch/arm/mach-u8500/cpuinfo.c
@@ -3,7 +3,6 @@
* Copyright (C) 2019 Stephan Gerhold <stephan@gerhold.net>
*/
-#include <common.h>
#include <init.h>
#include <asm/io.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 05/33] arm: tegra: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (2 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 04/33] arm: u8500: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 06/33] arm: stm32/stm32mp: " Tom Rini
` (28 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Thierry Reding, Svyatoslav Ryhel
Remove <common.h> from all mach-tegra and include/asm/arch-tegra files
and when needed add missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Thierry Reding <treding@nvidia.com>
Cc: Svyatoslav Ryhel <clamor95@gmail.com>
---
arch/arm/include/asm/arch-tegra/ap.h | 1 +
arch/arm/include/asm/arch-tegra/cboot.h | 2 ++
arch/arm/mach-tegra/ap.c | 2 +-
arch/arm/mach-tegra/arm64-mmu.c | 1 -
arch/arm/mach-tegra/board.c | 2 +-
arch/arm/mach-tegra/board2.c | 2 +-
arch/arm/mach-tegra/cache.c | 1 -
arch/arm/mach-tegra/cboot.c | 1 -
arch/arm/mach-tegra/clock.c | 1 -
arch/arm/mach-tegra/cmd_enterrcm.c | 1 -
arch/arm/mach-tegra/cpu.c | 1 -
arch/arm/mach-tegra/crypto.c | 1 -
arch/arm/mach-tegra/dt-setup.c | 1 -
arch/arm/mach-tegra/emc.c | 1 -
arch/arm/mach-tegra/fuse.c | 1 -
arch/arm/mach-tegra/gpu.c | 1 -
arch/arm/mach-tegra/ivc.c | 2 +-
arch/arm/mach-tegra/pmc.c | 1 -
arch/arm/mach-tegra/powergate.c | 2 +-
arch/arm/mach-tegra/spl.c | 1 -
arch/arm/mach-tegra/sys_info.c | 1 -
arch/arm/mach-tegra/tegra114/clock.c | 1 -
arch/arm/mach-tegra/tegra114/cpu.c | 1 -
arch/arm/mach-tegra/tegra124/clock.c | 2 +-
arch/arm/mach-tegra/tegra124/cpu.c | 1 -
arch/arm/mach-tegra/tegra124/pmc.c | 1 -
arch/arm/mach-tegra/tegra124/psci.c | 1 -
arch/arm/mach-tegra/tegra124/xusb-padctl.c | 2 +-
arch/arm/mach-tegra/tegra20/bct.c | 1 -
arch/arm/mach-tegra/tegra20/clock.c | 1 -
arch/arm/mach-tegra/tegra20/cpu.c | 1 -
arch/arm/mach-tegra/tegra20/display.c | 1 -
arch/arm/mach-tegra/tegra20/emc.c | 2 +-
arch/arm/mach-tegra/tegra20/pmu.c | 1 -
arch/arm/mach-tegra/tegra20/warmboot.c | 1 -
arch/arm/mach-tegra/tegra20/warmboot_avp.c | 2 +-
arch/arm/mach-tegra/tegra210/clock.c | 2 +-
arch/arm/mach-tegra/tegra210/xusb-padctl.c | 2 +-
arch/arm/mach-tegra/tegra30/bct.c | 2 +-
arch/arm/mach-tegra/tegra30/clock.c | 1 -
arch/arm/mach-tegra/tegra30/cpu.c | 1 -
arch/arm/mach-tegra/xusb-padctl-common.c | 1 -
arch/arm/mach-tegra/xusb-padctl-dummy.c | 2 +-
43 files changed, 16 insertions(+), 41 deletions(-)
diff --git a/arch/arm/include/asm/arch-tegra/ap.h b/arch/arm/include/asm/arch-tegra/ap.h
index 78aeb25ac78e..b922b2d30ea0 100644
--- a/arch/arm/include/asm/arch-tegra/ap.h
+++ b/arch/arm/include/asm/arch-tegra/ap.h
@@ -4,6 +4,7 @@
* NVIDIA Corporation <www.nvidia.com>
*/
#include <asm/types.h>
+#include <asm/arch-tegra/tegra.h>
/* Stabilization delays, in usec */
#define PLL_STABILIZATION_DELAY (300)
diff --git a/arch/arm/include/asm/arch-tegra/cboot.h b/arch/arm/include/asm/arch-tegra/cboot.h
index 4e1da98d1f21..d0ba83ae8bc8 100644
--- a/arch/arm/include/asm/arch-tegra/cboot.h
+++ b/arch/arm/include/asm/arch-tegra/cboot.h
@@ -6,6 +6,8 @@
#ifndef _TEGRA_CBOOT_H_
#define _TEGRA_CBOOT_H_
+#include <linux/errno.h>
+#include <linux/types.h>
#include <net.h>
#ifdef CONFIG_ARM64
diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
index 532730fe7270..1ea620e4ab59 100644
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
@@ -6,7 +6,7 @@
/* Tegra AP (Application Processor) code */
-#include <common.h>
+#include <config.h>
#include <log.h>
#include <linux/bug.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-tegra/arm64-mmu.c b/arch/arm/mach-tegra/arm64-mmu.c
index ea4eac392d96..4fbe47a91e1e 100644
--- a/arch/arm/mach-tegra/arm64-mmu.c
+++ b/arch/arm/mach-tegra/arm64-mmu.c
@@ -7,7 +7,6 @@
* Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
*/
-#include <common.h>
#include <asm/system.h>
#include <asm/armv8/mmu.h>
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index 327d70bd4cc0..c382e0428603 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -4,7 +4,7 @@
* NVIDIA Corporation <www.nvidia.com>
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <dm.h>
#include <init.h>
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index adea12c9b7f9..479137e457cb 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -4,7 +4,7 @@
* NVIDIA Corporation <www.nvidia.com>
*/
-#include <common.h>
+#include <config.h>
#include <dm.h>
#include <env.h>
#include <errno.h>
diff --git a/arch/arm/mach-tegra/cache.c b/arch/arm/mach-tegra/cache.c
index d7063490e222..462364abf038 100644
--- a/arch/arm/mach-tegra/cache.c
+++ b/arch/arm/mach-tegra/cache.c
@@ -5,7 +5,6 @@
/* Tegra cache routines */
-#include <common.h>
#include <asm/io.h>
#include <asm/arch-tegra/ap.h>
#if IS_ENABLED(CONFIG_TEGRA_GP_PADCTRL)
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 8f5bb2f261a9..c12543d71ac0 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -3,7 +3,6 @@
* Copyright (c) 2016-2018, NVIDIA CORPORATION.
*/
-#include <common.h>
#include <env.h>
#include <fdt_support.h>
#include <fdtdec.h>
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index 575da2bdb5a2..157e6c4911a4 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -5,7 +5,6 @@
/* Tegra SoC common clock control functions */
-#include <common.h>
#include <div64.h>
#include <dm.h>
#include <errno.h>
diff --git a/arch/arm/mach-tegra/cmd_enterrcm.c b/arch/arm/mach-tegra/cmd_enterrcm.c
index 92ff6cb1bf86..8fa1207e97a8 100644
--- a/arch/arm/mach-tegra/cmd_enterrcm.c
+++ b/arch/arm/mach-tegra/cmd_enterrcm.c
@@ -24,7 +24,6 @@
* (C) Copyright 2004 Texas Insturments
*/
-#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
diff --git a/arch/arm/mach-tegra/cpu.c b/arch/arm/mach-tegra/cpu.c
index 59ca8aeabac7..5f2a59171024 100644
--- a/arch/arm/mach-tegra/cpu.c
+++ b/arch/arm/mach-tegra/cpu.c
@@ -3,7 +3,6 @@
* Copyright (c) 2010-2019, NVIDIA CORPORATION. All rights reserved.
*/
-#include <common.h>
#include <log.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/crypto.c b/arch/arm/mach-tegra/crypto.c
index 893da35e0b9d..49e6a45243ad 100644
--- a/arch/arm/mach-tegra/crypto.c
+++ b/arch/arm/mach-tegra/crypto.c
@@ -4,7 +4,6 @@
* (C) Copyright 2010 - 2011 NVIDIA Corporation <www.nvidia.com>
*/
-#include <common.h>
#include <log.h>
#include <linux/errno.h>
#include <asm/arch-tegra/crypto.h>
diff --git a/arch/arm/mach-tegra/dt-setup.c b/arch/arm/mach-tegra/dt-setup.c
index c11494722bc7..f4ae602d5239 100644
--- a/arch/arm/mach-tegra/dt-setup.c
+++ b/arch/arm/mach-tegra/dt-setup.c
@@ -3,7 +3,6 @@
* Copyright (c) 2010-2016, NVIDIA CORPORATION.
*/
-#include <common.h>
#include <fdtdec.h>
#include <stdlib.h>
#include <asm/arch-tegra/cboot.h>
diff --git a/arch/arm/mach-tegra/emc.c b/arch/arm/mach-tegra/emc.c
index 2eea14b5a744..83fad35d4dcc 100644
--- a/arch/arm/mach-tegra/emc.c
+++ b/arch/arm/mach-tegra/emc.c
@@ -3,7 +3,6 @@
* Copyright (c) 2011 The Chromium OS Authors.
*/
-#include <common.h>
#include <asm/global_data.h>
#include "emc.h"
#include <asm/io.h>
diff --git a/arch/arm/mach-tegra/fuse.c b/arch/arm/mach-tegra/fuse.c
index 83bd50553841..e9b5259ac701 100644
--- a/arch/arm/mach-tegra/fuse.c
+++ b/arch/arm/mach-tegra/fuse.c
@@ -7,7 +7,6 @@
* Svyatoslav Ryhel <clamor95@gmail.com>
*/
-#include <common.h>
#include <linux/delay.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c
index 36538e7f96ad..23381759b797 100644
--- a/arch/arm/mach-tegra/gpu.c
+++ b/arch/arm/mach-tegra/gpu.c
@@ -5,7 +5,6 @@
/* Tegra vpr routines */
-#include <common.h>
#include <log.h>
#include <asm/io.h>
#include <asm/arch/tegra.h>
diff --git a/arch/arm/mach-tegra/ivc.c b/arch/arm/mach-tegra/ivc.c
index 66c1276f4b87..0445d5d48e5c 100644
--- a/arch/arm/mach-tegra/ivc.c
+++ b/arch/arm/mach-tegra/ivc.c
@@ -3,11 +3,11 @@
* Copyright (c) 2016, NVIDIA CORPORATION.
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/io.h>
#include <asm/arch-tegra/ivc.h>
#include <linux/bug.h>
+#include <linux/errno.h>
#include <linux/printk.h>
#define TEGRA_IVC_ALIGN 64
diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c
index c4f5106750b8..3f968d4aeae8 100644
--- a/arch/arm/mach-tegra/pmc.c
+++ b/arch/arm/mach-tegra/pmc.c
@@ -3,7 +3,6 @@
* Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved.
*/
-#include <common.h>
#include <cpu_func.h>
#include <log.h>
#include <asm/global_data.h>
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index 631bc04e9506..2a2f8467216e 100644
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@ -3,8 +3,8 @@
* Copyright (c) 2014-2019, NVIDIA CORPORATION. All rights reserved.
*/
-#include <common.h>
#include <errno.h>
+#include <time.h>
#include <linux/delay.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-tegra/spl.c b/arch/arm/mach-tegra/spl.c
index ed897efc5f07..5df0eb28c96f 100644
--- a/arch/arm/mach-tegra/spl.c
+++ b/arch/arm/mach-tegra/spl.c
@@ -5,7 +5,6 @@
*
* Allen Martin <amartin@nvidia.com>
*/
-#include <common.h>
#include <debug_uart.h>
#include <log.h>
#include <spl.h>
diff --git a/arch/arm/mach-tegra/sys_info.c b/arch/arm/mach-tegra/sys_info.c
index 5ad586ac17fb..11b404802466 100644
--- a/arch/arm/mach-tegra/sys_info.c
+++ b/arch/arm/mach-tegra/sys_info.c
@@ -4,7 +4,6 @@
* NVIDIA Corporation <www.nvidia.com>
*/
-#include <common.h>
#include <init.h>
#include <linux/ctype.h>
#if defined(CONFIG_TEGRA124) || defined(CONFIG_TEGRA30)
diff --git a/arch/arm/mach-tegra/tegra114/clock.c b/arch/arm/mach-tegra/tegra114/clock.c
index 2ee755bc649c..d5cc8ac44dde 100644
--- a/arch/arm/mach-tegra/tegra114/clock.c
+++ b/arch/arm/mach-tegra/tegra114/clock.c
@@ -6,7 +6,6 @@
/* Tegra114 Clock control functions */
-#include <common.h>
#include <init.h>
#include <log.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-tegra/tegra114/cpu.c b/arch/arm/mach-tegra/tegra114/cpu.c
index 7d8f080c310c..3fe2d2d73246 100644
--- a/arch/arm/mach-tegra/tegra114/cpu.c
+++ b/arch/arm/mach-tegra/tegra114/cpu.c
@@ -4,7 +4,6 @@
* NVIDIA Corporation <www.nvidia.com>
*/
-#include <common.h>
#include <log.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra124/clock.c b/arch/arm/mach-tegra/tegra124/clock.c
index ed8b6d963816..4ac0c10c597d 100644
--- a/arch/arm/mach-tegra/tegra124/clock.c
+++ b/arch/arm/mach-tegra/tegra124/clock.c
@@ -6,7 +6,7 @@
/* Tegra124 Clock control functions */
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <log.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-tegra/tegra124/cpu.c b/arch/arm/mach-tegra/tegra124/cpu.c
index b1bfe8fb5e13..07892aedd3cb 100644
--- a/arch/arm/mach-tegra/tegra124/cpu.c
+++ b/arch/arm/mach-tegra/tegra124/cpu.c
@@ -4,7 +4,6 @@
* NVIDIA Corporation <www.nvidia.com>
*/
-#include <common.h>
#include <log.h>
#include <asm/io.h>
#include <asm/arch/ahb.h>
diff --git a/arch/arm/mach-tegra/tegra124/pmc.c b/arch/arm/mach-tegra/tegra124/pmc.c
index 3921ffb52af4..2294911501e7 100644
--- a/arch/arm/mach-tegra/tegra124/pmc.c
+++ b/arch/arm/mach-tegra/tegra124/pmc.c
@@ -3,7 +3,6 @@
* Copyright (C) 2017 Google, Inc
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
diff --git a/arch/arm/mach-tegra/tegra124/psci.c b/arch/arm/mach-tegra/tegra124/psci.c
index ab102a622611..a50b681935aa 100644
--- a/arch/arm/mach-tegra/tegra124/psci.c
+++ b/arch/arm/mach-tegra/tegra124/psci.c
@@ -4,7 +4,6 @@
* Author: Jan Kiszka <jan.kiszka@siemens.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/psci.h>
#include <asm/arch/flow.h>
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index 69736aa39255..1153444267d3 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -5,9 +5,9 @@
#define pr_fmt(fmt) "tegra-xusb-padctl: " fmt
-#include <common.h>
#include <errno.h>
#include <log.h>
+#include <time.h>
#include <dm/of_access.h>
#include <dm/ofnode.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-tegra/tegra20/bct.c b/arch/arm/mach-tegra/tegra20/bct.c
index b2c44f3d237c..e155b98cf655 100644
--- a/arch/arm/mach-tegra/tegra20/bct.c
+++ b/arch/arm/mach-tegra/tegra20/bct.c
@@ -4,7 +4,6 @@
* Copyright (c) 2022, Svyatoslav Ryhel <clamor95@gmail.com>
*/
-#include <common.h>
#include <command.h>
#include <log.h>
#include <asm/arch-tegra/crypto.h>
diff --git a/arch/arm/mach-tegra/tegra20/clock.c b/arch/arm/mach-tegra/tegra20/clock.c
index 109b73bfbe7f..6af20e9c782b 100644
--- a/arch/arm/mach-tegra/tegra20/clock.c
+++ b/arch/arm/mach-tegra/tegra20/clock.c
@@ -7,7 +7,6 @@
/* Tegra20 Clock control functions */
-#include <common.h>
#include <errno.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-tegra/tegra20/cpu.c b/arch/arm/mach-tegra/tegra20/cpu.c
index e5b60598f7f7..1ba3930b5e6e 100644
--- a/arch/arm/mach-tegra/tegra20/cpu.c
+++ b/arch/arm/mach-tegra/tegra20/cpu.c
@@ -3,7 +3,6 @@
* Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved.
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/tegra.h>
#include <asm/arch-tegra/pmc.h>
diff --git a/arch/arm/mach-tegra/tegra20/display.c b/arch/arm/mach-tegra/tegra20/display.c
index 4ba3fb23fd63..207e50aac905 100644
--- a/arch/arm/mach-tegra/tegra20/display.c
+++ b/arch/arm/mach-tegra/tegra20/display.c
@@ -4,7 +4,6 @@
* NVIDIA Corporation <www.nvidia.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/tegra.h>
diff --git a/arch/arm/mach-tegra/tegra20/emc.c b/arch/arm/mach-tegra/tegra20/emc.c
index fb5e699c940d..e2ee8f124ac7 100644
--- a/arch/arm/mach-tegra/tegra20/emc.c
+++ b/arch/arm/mach-tegra/tegra20/emc.c
@@ -3,7 +3,7 @@
* Copyright (c) 2011 The Chromium OS Authors.
*/
-#include <common.h>
+#include <config.h>
#include <fdtdec.h>
#include <log.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-tegra/tegra20/pmu.c b/arch/arm/mach-tegra/tegra20/pmu.c
index 05d0668cdbaa..f2fe5d0fa9dc 100644
--- a/arch/arm/mach-tegra/tegra20/pmu.c
+++ b/arch/arm/mach-tegra/tegra20/pmu.c
@@ -4,7 +4,6 @@
* (C) Copyright 2010,2011 NVIDIA Corporation <www.nvidia.com>
*/
-#include <common.h>
#include <i2c.h>
#include <log.h>
#include <tps6586x.h>
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index 5e3a9ebaceb3..18034c83a1c2 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -4,7 +4,6 @@
* NVIDIA Corporation <www.nvidia.com>
*/
-#include <common.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <linux/errno.h>
diff --git a/arch/arm/mach-tegra/tegra20/warmboot_avp.c b/arch/arm/mach-tegra/tegra20/warmboot_avp.c
index 94ce762e01f5..65bbe1825356 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot_avp.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot_avp.c
@@ -4,7 +4,7 @@
* NVIDIA Corporation <www.nvidia.com>
*/
-#include <common.h>
+#include <config.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/flow.h>
diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
index 74817e0440b8..57ff0b2a19af 100644
--- a/arch/arm/mach-tegra/tegra210/clock.c
+++ b/arch/arm/mach-tegra/tegra210/clock.c
@@ -6,10 +6,10 @@
/* Tegra210 Clock control functions */
-#include <common.h>
#include <errno.h>
#include <init.h>
#include <log.h>
+#include <time.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index 30d0395bb0e5..e409c2842e24 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -5,9 +5,9 @@
#define pr_fmt(fmt) "tegra-xusb-padctl: " fmt
-#include <common.h>
#include <errno.h>
#include <log.h>
+#include <time.h>
#include <asm/global_data.h>
#include <dm/of_access.h>
#include <dm/ofnode.h>
diff --git a/arch/arm/mach-tegra/tegra30/bct.c b/arch/arm/mach-tegra/tegra30/bct.c
index cff1a3e98d27..250009ea8d8e 100644
--- a/arch/arm/mach-tegra/tegra30/bct.c
+++ b/arch/arm/mach-tegra/tegra30/bct.c
@@ -4,9 +4,9 @@
* Copyright (c) 2022, Svyatoslav Ryhel <clamor95@gmail.com>
*/
-#include <common.h>
#include <command.h>
#include <log.h>
+#include <vsprintf.h>
#include <asm/arch-tegra/crypto.h>
#include "bct.h"
#include "uboot_aes.h"
diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c
index 0af8cde8c64d..7d61127920be 100644
--- a/arch/arm/mach-tegra/tegra30/clock.c
+++ b/arch/arm/mach-tegra/tegra30/clock.c
@@ -6,7 +6,6 @@
/* Tegra30 Clock control functions */
-#include <common.h>
#include <errno.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-tegra/tegra30/cpu.c b/arch/arm/mach-tegra/tegra30/cpu.c
index 60bbf13ea525..51a9deab1fda 100644
--- a/arch/arm/mach-tegra/tegra30/cpu.c
+++ b/arch/arm/mach-tegra/tegra30/cpu.c
@@ -3,7 +3,6 @@
* Copyright (c) 2010-2014, NVIDIA CORPORATION. All rights reserved.
*/
-#include <common.h>
#include <log.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c
index 28fdebe50a33..a3515d903a69 100644
--- a/arch/arm/mach-tegra/xusb-padctl-common.c
+++ b/arch/arm/mach-tegra/xusb-padctl-common.c
@@ -5,7 +5,6 @@
#define pr_fmt(fmt) "tegra-xusb-padctl: " fmt
-#include <common.h>
#include <errno.h>
#include <log.h>
#include <linux/printk.h>
diff --git a/arch/arm/mach-tegra/xusb-padctl-dummy.c b/arch/arm/mach-tegra/xusb-padctl-dummy.c
index f2d90302f6d2..1345b80747e8 100644
--- a/arch/arm/mach-tegra/xusb-padctl-dummy.c
+++ b/arch/arm/mach-tegra/xusb-padctl-dummy.c
@@ -3,9 +3,9 @@
* Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
*/
-#include <common.h>
#include <errno.h>
+#include <linux/compiler.h>
#include <asm/arch-tegra/xusb-padctl.h>
struct tegra_xusb_phy * __weak tegra_xusb_phy_get(unsigned int type)
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 06/33] arm: stm32/stm32mp: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (3 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 05/33] arm: tegra: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 07/33] arm: sunxi: " Tom Rini
` (27 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Patrick Delaunay, Patrice Chotard
Remove <common.h> from all mach-stm32 and mach-stm32mp files and when
needed add missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Patrick Delaunay <patrick.delaunay@foss.st.com>
Cc: Patrice Chotard <patrice.chotard@foss.st.com>
---
arch/arm/mach-stm32/soc.c | 1 -
arch/arm/mach-stm32mp/boot_params.c | 2 +-
arch/arm/mach-stm32mp/bsec.c | 1 -
arch/arm/mach-stm32mp/cmd_stm32key.c | 1 -
arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 1 -
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c | 2 +-
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c | 1 -
arch/arm/mach-stm32mp/dram_init.c | 1 -
arch/arm/mach-stm32mp/stm32mp1/cpu.c | 1 -
arch/arm/mach-stm32mp/stm32mp1/fdt.c | 2 +-
arch/arm/mach-stm32mp/stm32mp1/psci.c | 2 +-
arch/arm/mach-stm32mp/stm32mp1/pwr_regulator.c | 2 +-
arch/arm/mach-stm32mp/stm32mp1/spl.c | 2 +-
arch/arm/mach-stm32mp/stm32mp1/stm32mp13x.c | 2 +-
arch/arm/mach-stm32mp/stm32mp1/stm32mp15x.c | 1 -
arch/arm/mach-stm32mp/syscon.c | 1 -
16 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/arch/arm/mach-stm32/soc.c b/arch/arm/mach-stm32/soc.c
index 0bd8d7b22c4d..737e6809f8d3 100644
--- a/arch/arm/mach-stm32/soc.c
+++ b/arch/arm/mach-stm32/soc.c
@@ -4,7 +4,6 @@
* Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics.
*/
-#include <common.h>
#include <init.h>
#include <asm/io.h>
#include <asm/armv7_mpu.h>
diff --git a/arch/arm/mach-stm32mp/boot_params.c b/arch/arm/mach-stm32mp/boot_params.c
index 158bf40cb97e..ebddf6a7dbcc 100644
--- a/arch/arm/mach-stm32mp/boot_params.c
+++ b/arch/arm/mach-stm32mp/boot_params.c
@@ -5,7 +5,7 @@
#define LOG_CATEGORY LOGC_ARCH
-#include <common.h>
+#include <config.h>
#include <log.h>
#include <linux/libfdt.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index 5b869017ec1a..9ba7a6c9a892 100644
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -5,7 +5,6 @@
#define LOG_CATEGORY UCLASS_MISC
-#include <common.h>
#include <clk.h>
#include <dm.h>
#include <log.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index c7fe232f86e0..0cb3c7a9fa44 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -3,7 +3,6 @@
* Copyright (C) 2019, STMicroelectronics - All Rights Reserved
*/
-#include <common.h>
#include <command.h>
#include <console.h>
#include <log.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
index adee6e05b636..967fa4e06c0e 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
@@ -3,7 +3,6 @@
* Copyright (C) 2020, STMicroelectronics - All Rights Reserved
*/
-#include <common.h>
#include <bootm.h>
#include <command.h>
#include <dfu.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index 35bed3199422..07c5e0456f82 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -3,12 +3,12 @@
* Copyright (C) 2020, STMicroelectronics - All Rights Reserved
*/
-#include <common.h>
#include <console.h>
#include <dm.h>
#include <dfu.h>
#include <malloc.h>
#include <serial.h>
+#include <time.h>
#include <watchdog.h>
#include <asm/arch/sys_proto.h>
#include <dm/lists.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index d18455bf36f1..4b1ed50e9fe5 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -3,7 +3,6 @@
* Copyright (C) 2020, STMicroelectronics - All Rights Reserved
*/
-#include <common.h>
#include <dfu.h>
#include <g_dnl.h>
#include <usb.h>
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index fb1208fc5d57..78b12fcbb6ac 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -5,7 +5,6 @@
#define LOG_CATEGORY LOGC_ARCH
-#include <common.h>
#include <dm.h>
#include <image.h>
#include <init.h>
diff --git a/arch/arm/mach-stm32mp/stm32mp1/cpu.c b/arch/arm/mach-stm32mp/stm32mp1/cpu.c
index 524778f00c67..478c3efae73e 100644
--- a/arch/arm/mach-stm32mp/stm32mp1/cpu.c
+++ b/arch/arm/mach-stm32mp/stm32mp1/cpu.c
@@ -5,7 +5,6 @@
#define LOG_CATEGORY LOGC_ARCH
-#include <common.h>
#include <clk.h>
#include <cpu_func.h>
#include <debug_uart.h>
diff --git a/arch/arm/mach-stm32mp/stm32mp1/fdt.c b/arch/arm/mach-stm32mp/stm32mp1/fdt.c
index d0b6c3cc5a55..e1e4dc04e01c 100644
--- a/arch/arm/mach-stm32mp/stm32mp1/fdt.c
+++ b/arch/arm/mach-stm32mp/stm32mp1/fdt.c
@@ -5,11 +5,11 @@
#define LOG_CATEGORY LOGC_ARCH
-#include <common.h>
#include <fdtdec.h>
#include <fdt_support.h>
#include <log.h>
#include <tee.h>
+#include <mach/stm32.h>
#include <asm/arch/sys_proto.h>
#include <dt-bindings/pinctrl/stm32-pinfunc.h>
#include <linux/io.h>
diff --git a/arch/arm/mach-stm32mp/stm32mp1/psci.c b/arch/arm/mach-stm32mp/stm32mp1/psci.c
index 4f2379df45fb..7772546b2fef 100644
--- a/arch/arm/mach-stm32mp/stm32mp1/psci.c
+++ b/arch/arm/mach-stm32mp/stm32mp1/psci.c
@@ -4,7 +4,6 @@
*/
#include <config.h>
-#include <common.h>
#include <asm/armv7.h>
#include <asm/cache.h>
#include <asm/gic.h>
@@ -13,6 +12,7 @@
#include <asm/secure.h>
#include <hang.h>
#include <linux/bitops.h>
+#include <linux/errno.h>
/* PWR */
#define PWR_CR3 0x0c
diff --git a/arch/arm/mach-stm32mp/stm32mp1/pwr_regulator.c b/arch/arm/mach-stm32mp/stm32mp1/pwr_regulator.c
index 846637ab162e..79c44188cc56 100644
--- a/arch/arm/mach-stm32mp/stm32mp1/pwr_regulator.c
+++ b/arch/arm/mach-stm32mp/stm32mp1/pwr_regulator.c
@@ -5,10 +5,10 @@
#define LOG_CATEGORY UCLASS_REGULATOR
-#include <common.h>
#include <dm.h>
#include <errno.h>
#include <syscon.h>
+#include <time.h>
#include <asm/io.h>
#include <dm/device_compat.h>
#include <dm/device-internal.h>
diff --git a/arch/arm/mach-stm32mp/stm32mp1/spl.c b/arch/arm/mach-stm32mp/stm32mp1/spl.c
index 6c79259b2c82..7a8fd3178adf 100644
--- a/arch/arm/mach-stm32mp/stm32mp1/spl.c
+++ b/arch/arm/mach-stm32mp/stm32mp1/spl.c
@@ -5,7 +5,7 @@
#define LOG_CATEGORY LOGC_ARCH
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <dm.h>
#include <hang.h>
diff --git a/arch/arm/mach-stm32mp/stm32mp1/stm32mp13x.c b/arch/arm/mach-stm32mp/stm32mp1/stm32mp13x.c
index 845d973ad1b2..4a811065fc31 100644
--- a/arch/arm/mach-stm32mp/stm32mp1/stm32mp13x.c
+++ b/arch/arm/mach-stm32mp/stm32mp1/stm32mp13x.c
@@ -5,7 +5,7 @@
#define LOG_CATEGORY LOGC_ARCH
-#include <common.h>
+#include <config.h>
#include <log.h>
#include <syscon.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-stm32mp/stm32mp1/stm32mp15x.c b/arch/arm/mach-stm32mp/stm32mp1/stm32mp15x.c
index d75ec99d6a17..f096fe538d88 100644
--- a/arch/arm/mach-stm32mp/stm32mp1/stm32mp15x.c
+++ b/arch/arm/mach-stm32mp/stm32mp1/stm32mp15x.c
@@ -5,7 +5,6 @@
#define LOG_CATEGORY LOGC_ARCH
-#include <common.h>
#include <env.h>
#include <log.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-stm32mp/syscon.c b/arch/arm/mach-stm32mp/syscon.c
index a2e351d74a7a..8bcbd9793404 100644
--- a/arch/arm/mach-stm32mp/syscon.c
+++ b/arch/arm/mach-stm32mp/syscon.c
@@ -3,7 +3,6 @@
* Copyright (C) 2018, STMicroelectronics - All Rights Reserved
*/
-#include <common.h>
#include <clk.h>
#include <dm.h>
#include <syscon.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 07/33] arm: sunxi: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (4 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 06/33] arm: stm32/stm32mp: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 14:23 ` Andre Przywara
2024-04-30 13:35 ` [PATCH 08/33] arm: socfpga: " Tom Rini
` (26 subsequent siblings)
32 siblings, 1 reply; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Jagan Teki, Andre Przywara
Remove <common.h> from all mach-sunxi and board/sunxi files and when
needed add missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Andre Przywara <andre.przywara@arm.com>
---
arch/arm/cpu/armv7/sunxi/psci.c | 1 -
arch/arm/cpu/armv7/sunxi/sram.c | 1 -
arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c | 1 -
arch/arm/mach-sunxi/dram_timings/ddr3_1333.c | 1 -
arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c | 1 -
arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c | 1 -
arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c | 1 -
arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c | 1 -
arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c | 1 -
arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c | 1 -
board/sunxi/board.c | 1 -
board/sunxi/chip.c | 1 -
board/sunxi/dram_sun4i_auto.c | 1 -
board/sunxi/dram_sun5i_auto.c | 1 -
board/sunxi/gmac.c | 1 -
15 files changed, 15 deletions(-)
diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c
index 5cb8cfa6cf3f..4c30f3294b7a 100644
--- a/arch/arm/cpu/armv7/sunxi/psci.c
+++ b/arch/arm/cpu/armv7/sunxi/psci.c
@@ -7,7 +7,6 @@
* which was based on code by Carl van Schaik <carl@ok-labs.com>.
*/
#include <config.h>
-#include <common.h>
#include <asm/cache.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/cpu/armv7/sunxi/sram.c b/arch/arm/cpu/armv7/sunxi/sram.c
index 28ff6a1b7c23..bc25719c9c46 100644
--- a/arch/arm/cpu/armv7/sunxi/sram.c
+++ b/arch/arm/cpu/armv7/sunxi/sram.c
@@ -9,7 +9,6 @@
* SRAM init for older sunxi SoCs.
*/
-#include <common.h>
#include <init.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
index 9077f86a8b4c..3666dddca15c 100644
--- a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
+++ b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
@@ -1,4 +1,3 @@
-#include <common.h>
#include <asm/arch/dram.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
index 0471e8a49e58..ceaafd6ec6fa 100644
--- a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
+++ b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
@@ -1,4 +1,3 @@
-#include <common.h>
#include <asm/arch/dram.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c
index 232b4fe2df7f..3faf8d5bd974 100644
--- a/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c
+++ b/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c
@@ -11,7 +11,6 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#include <common.h>
#include <asm/arch/dram.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c b/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c
index b6d6a6874682..ce2ffa7a020e 100644
--- a/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c
+++ b/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c
@@ -11,7 +11,6 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#include <common.h>
#include <asm/arch/dram.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c b/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c
index c11cb8678f64..e6446b9180da 100644
--- a/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c
+++ b/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c
@@ -9,7 +9,6 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#include <common.h>
#include <asm/arch/dram.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
index 2136ca3a4cb0..afe8e25c7f58 100644
--- a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
+++ b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
@@ -19,7 +19,6 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#include <common.h>
#include <asm/arch/dram.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
index 10008601134a..c243b574406d 100644
--- a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
+++ b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
@@ -6,7 +6,6 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#include <common.h>
#include <asm/arch/dram.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
index bd57e2f6aac2..bc47a4638533 100644
--- a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
+++ b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
@@ -1,4 +1,3 @@
-#include <common.h>
#include <asm/arch/dram.h>
#include <asm/arch/cpu.h>
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 1313b01dcea5..ed86f1df5dc4 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -10,7 +10,6 @@
* Some board init for the Allwinner A10-evb board.
*/
-#include <common.h>
#include <clock_legacy.h>
#include <dm.h>
#include <env.h>
diff --git a/board/sunxi/chip.c b/board/sunxi/chip.c
index eeee6319e799..270af2506d21 100644
--- a/board/sunxi/chip.c
+++ b/board/sunxi/chip.c
@@ -5,7 +5,6 @@
* Based on initial code from Maxime Ripard
*/
-#include <common.h>
#include <malloc.h>
#include <dm.h>
#include <w1.h>
diff --git a/board/sunxi/dram_sun4i_auto.c b/board/sunxi/dram_sun4i_auto.c
index 547d1c0cb4de..4b78919a5baa 100644
--- a/board/sunxi/dram_sun4i_auto.c
+++ b/board/sunxi/dram_sun4i_auto.c
@@ -1,4 +1,3 @@
-#include <common.h>
#include <init.h>
#include <asm/arch/dram.h>
diff --git a/board/sunxi/dram_sun5i_auto.c b/board/sunxi/dram_sun5i_auto.c
index 517506ccc4f0..8976e3b16d68 100644
--- a/board/sunxi/dram_sun5i_auto.c
+++ b/board/sunxi/dram_sun5i_auto.c
@@ -1,6 +1,5 @@
/* DRAM parameters for auto dram configuration on sun5i and sun7i */
-#include <common.h>
#include <init.h>
#include <asm/arch/dram.h>
diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
index 2a885305ebe0..710e821e3fc8 100644
--- a/board/sunxi/gmac.c
+++ b/board/sunxi/gmac.c
@@ -1,4 +1,3 @@
-#include <common.h>
#include <netdev.h>
#include <miiphy.h>
#include <asm/io.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 08/33] arm: socfpga: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (5 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 07/33] arm: sunxi: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 09/33] arm: s5pc1xx: " Tom Rini
` (25 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Marek Vasut, Simon Goldschmidt, Tien Fong Chee
Remove <common.h> from all mach-socfpga files and when needed add missing
include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Marek Vasut <marex@denx.de>
Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Cc: Tien Fong Chee <tien.fong.chee@intel.com>
---
arch/arm/mach-socfpga/board.c | 2 +-
arch/arm/mach-socfpga/clock_manager.c | 2 +-
arch/arm/mach-socfpga/clock_manager_agilex.c | 1 -
arch/arm/mach-socfpga/clock_manager_arria10.c | 1 -
arch/arm/mach-socfpga/clock_manager_gen5.c | 1 -
arch/arm/mach-socfpga/clock_manager_n5x.c | 1 -
arch/arm/mach-socfpga/clock_manager_s10.c | 2 +-
arch/arm/mach-socfpga/firewall.c | 2 +-
arch/arm/mach-socfpga/fpga_manager.c | 2 +-
arch/arm/mach-socfpga/freeze_controller.c | 2 +-
arch/arm/mach-socfpga/include/mach/clock_manager.h | 2 ++
arch/arm/mach-socfpga/mailbox_s10.c | 1 -
arch/arm/mach-socfpga/misc.c | 2 +-
arch/arm/mach-socfpga/misc_arria10.c | 2 +-
arch/arm/mach-socfpga/misc_gen5.c | 2 +-
arch/arm/mach-socfpga/misc_soc64.c | 1 -
arch/arm/mach-socfpga/mmu-arm64_s10.c | 1 -
arch/arm/mach-socfpga/pinmux_arria10.c | 2 +-
arch/arm/mach-socfpga/reset_manager_arria10.c | 1 -
arch/arm/mach-socfpga/reset_manager_gen5.c | 2 +-
arch/arm/mach-socfpga/reset_manager_s10.c | 1 -
arch/arm/mach-socfpga/scan_manager.c | 2 +-
arch/arm/mach-socfpga/secure_reg_helper.c | 1 -
arch/arm/mach-socfpga/secure_vab.c | 1 -
arch/arm/mach-socfpga/smc_api.c | 3 ++-
arch/arm/mach-socfpga/spl_a10.c | 2 +-
arch/arm/mach-socfpga/spl_agilex.c | 1 -
arch/arm/mach-socfpga/spl_gen5.c | 1 -
arch/arm/mach-socfpga/spl_n5x.c | 1 -
arch/arm/mach-socfpga/spl_s10.c | 1 -
arch/arm/mach-socfpga/spl_soc64.c | 1 -
arch/arm/mach-socfpga/system_manager_gen5.c | 1 -
arch/arm/mach-socfpga/system_manager_soc64.c | 1 -
arch/arm/mach-socfpga/timer.c | 2 +-
arch/arm/mach-socfpga/timer_s10.c | 1 -
arch/arm/mach-socfpga/vab.c | 2 +-
arch/arm/mach-socfpga/wrap_handoff_soc64.c | 1 -
arch/arm/mach-socfpga/wrap_iocsr_config.c | 2 +-
arch/arm/mach-socfpga/wrap_pinmux_config.c | 3 ++-
arch/arm/mach-socfpga/wrap_pll_config.c | 2 +-
arch/arm/mach-socfpga/wrap_pll_config_soc64.c | 1 -
arch/arm/mach-socfpga/wrap_sdram_config.c | 4 +++-
42 files changed, 26 insertions(+), 41 deletions(-)
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index 616e1afe5de6..feaf5ce45964 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -5,7 +5,7 @@
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch/clock_manager.h>
#include <asm/arch/mailbox_s10.h>
#include <asm/arch/misc.h>
diff --git a/arch/arm/mach-socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c
index 9e645a425317..4fcb13f17e6c 100644
--- a/arch/arm/mach-socfpga/clock_manager.c
+++ b/arch/arm/mach-socfpga/clock_manager.c
@@ -3,10 +3,10 @@
* Copyright (C) 2013-2017 Altera Corporation <www.altera.com>
*/
-#include <common.h>
#include <asm/arch/clock_manager.h>
#include <asm/arch/system_manager.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
#include <command.h>
#include <init.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_agilex.c b/arch/arm/mach-socfpga/clock_manager_agilex.c
index 28f593b60e63..9987d5bcee6f 100644
--- a/arch/arm/mach-socfpga/clock_manager_agilex.c
+++ b/arch/arm/mach-socfpga/clock_manager_agilex.c
@@ -5,7 +5,6 @@
*/
#include <clk.h>
-#include <common.h>
#include <dm.h>
#include <log.h>
#include <malloc.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c
index 8ab18f6b7252..58b9321131a9 100644
--- a/arch/arm/mach-socfpga/clock_manager_arria10.c
+++ b/arch/arm/mach-socfpga/clock_manager_arria10.c
@@ -3,7 +3,6 @@
* Copyright (C) 2016-2017 Intel Corporation
*/
-#include <common.h>
#include <fdtdec.h>
#include <malloc.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_gen5.c b/arch/arm/mach-socfpga/clock_manager_gen5.c
index 8fa2760798b8..154ad2154ae7 100644
--- a/arch/arm/mach-socfpga/clock_manager_gen5.c
+++ b/arch/arm/mach-socfpga/clock_manager_gen5.c
@@ -3,7 +3,6 @@
* Copyright (C) 2013-2017 Altera Corporation <www.altera.com>
*/
-#include <common.h>
#include <time.h>
#include <asm/io.h>
#include <dm.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_n5x.c b/arch/arm/mach-socfpga/clock_manager_n5x.c
index 0ed480de670d..c4c071330fc3 100644
--- a/arch/arm/mach-socfpga/clock_manager_n5x.c
+++ b/arch/arm/mach-socfpga/clock_manager_n5x.c
@@ -4,7 +4,6 @@
*
*/
-#include <common.h>
#include <asm/arch/clock_manager.h>
#include <asm/arch/system_manager.h>
#include <asm/global_data.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_s10.c b/arch/arm/mach-socfpga/clock_manager_s10.c
index 45300336d52a..1e148947a338 100644
--- a/arch/arm/mach-socfpga/clock_manager_s10.c
+++ b/arch/arm/mach-socfpga/clock_manager_s10.c
@@ -4,7 +4,7 @@
*
*/
-#include <common.h>
+#include <linux/errno.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/clock_manager.h>
diff --git a/arch/arm/mach-socfpga/firewall.c b/arch/arm/mach-socfpga/firewall.c
index 69229dc651e4..4dec47b8e960 100644
--- a/arch/arm/mach-socfpga/firewall.c
+++ b/arch/arm/mach-socfpga/firewall.c
@@ -4,8 +4,8 @@
*
*/
+#include <mach/base_addr_soc64.h>
#include <asm/io.h>
-#include <common.h>
#include <asm/arch/firewall.h>
#include <asm/arch/system_manager.h>
diff --git a/arch/arm/mach-socfpga/fpga_manager.c b/arch/arm/mach-socfpga/fpga_manager.c
index 18d692c63144..c946d4c38d96 100644
--- a/arch/arm/mach-socfpga/fpga_manager.c
+++ b/arch/arm/mach-socfpga/fpga_manager.c
@@ -7,7 +7,7 @@
* platform code, the real meat is located in drivers/fpga/socfpga.c .
*/
-#include <common.h>
+#include <config.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/fpga_manager.h>
diff --git a/arch/arm/mach-socfpga/freeze_controller.c b/arch/arm/mach-socfpga/freeze_controller.c
index 561d3408cd8f..7c86350d5eac 100644
--- a/arch/arm/mach-socfpga/freeze_controller.c
+++ b/arch/arm/mach-socfpga/freeze_controller.c
@@ -4,7 +4,7 @@
*/
-#include <common.h>
+#include <config.h>
#include <asm/io.h>
#include <asm/arch/clock_manager.h>
#include <asm/arch/freeze_controller.h>
diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager.h b/arch/arm/mach-socfpga/include/mach/clock_manager.h
index 6c9d32b9dd8a..49f3fb2e7057 100644
--- a/arch/arm/mach-socfpga/include/mach/clock_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/clock_manager.h
@@ -6,6 +6,8 @@
#ifndef _CLOCK_MANAGER_H_
#define _CLOCK_MANAGER_H_
+#include <linux/types.h>
+
phys_addr_t socfpga_get_clkmgr_addr(void);
#ifndef __ASSEMBLY__
diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c
index 101af2385529..4c86f1e99170 100644
--- a/arch/arm/mach-socfpga/mailbox_s10.c
+++ b/arch/arm/mach-socfpga/mailbox_s10.c
@@ -4,7 +4,6 @@
*
*/
-#include <common.h>
#include <asm/arch/clock_manager.h>
#include <asm/arch/mailbox_s10.h>
#include <asm/arch/system_manager.h>
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 80ad0870341b..495ba2a0d418 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -3,7 +3,7 @@
* Copyright (C) 2012-2017 Altera Corporation <www.altera.com>
*/
-#include <common.h>
+#include <config.h>
#include <command.h>
#include <cpu_func.h>
#include <hang.h>
diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c
index 93c9e8b0fb40..34c21317894d 100644
--- a/arch/arm/mach-socfpga/misc_arria10.c
+++ b/arch/arm/mach-socfpga/misc_arria10.c
@@ -4,7 +4,7 @@
*/
#include <altera.h>
-#include <common.h>
+#include <config.h>
#include <errno.h>
#include <fdtdec.h>
#include <init.h>
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index e7500c16f720..b898b6f8f226 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -3,7 +3,7 @@
* Copyright (C) 2012-2017 Altera Corporation <www.altera.com>
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <init.h>
#include <asm/global_data.h>
diff --git a/arch/arm/mach-socfpga/misc_soc64.c b/arch/arm/mach-socfpga/misc_soc64.c
index 2acdfad07b35..ad1ef0db1869 100644
--- a/arch/arm/mach-socfpga/misc_soc64.c
+++ b/arch/arm/mach-socfpga/misc_soc64.c
@@ -5,7 +5,6 @@
*/
#include <altera.h>
-#include <common.h>
#include <asm/arch/mailbox_s10.h>
#include <asm/arch/misc.h>
#include <asm/arch/reset_manager.h>
diff --git a/arch/arm/mach-socfpga/mmu-arm64_s10.c b/arch/arm/mach-socfpga/mmu-arm64_s10.c
index 91c6d7c55f13..b8e40d9a7889 100644
--- a/arch/arm/mach-socfpga/mmu-arm64_s10.c
+++ b/arch/arm/mach-socfpga/mmu-arm64_s10.c
@@ -4,7 +4,6 @@
*
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
#include <asm/global_data.h>
diff --git a/arch/arm/mach-socfpga/pinmux_arria10.c b/arch/arm/mach-socfpga/pinmux_arria10.c
index f378fce7f02d..c8074f47e760 100644
--- a/arch/arm/mach-socfpga/pinmux_arria10.c
+++ b/arch/arm/mach-socfpga/pinmux_arria10.c
@@ -4,9 +4,9 @@
*/
#include <log.h>
+#include <linux/errno.h>
#include <asm/arch/pinmux.h>
#include <asm/io.h>
-#include <common.h>
#include <fdtdec.h>
static int do_pinctr_pin(const void *blob, int child, const char *node_name)
diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c b/arch/arm/mach-socfpga/reset_manager_arria10.c
index 27c030801134..da335f4292cb 100644
--- a/arch/arm/mach-socfpga/reset_manager_arria10.c
+++ b/arch/arm/mach-socfpga/reset_manager_arria10.c
@@ -9,7 +9,6 @@
#include <asm/arch/misc.h>
#include <asm/arch/reset_manager.h>
#include <asm/arch/system_manager.h>
-#include <common.h>
#include <errno.h>
#include <fdtdec.h>
#include <wait_bit.h>
diff --git a/arch/arm/mach-socfpga/reset_manager_gen5.c b/arch/arm/mach-socfpga/reset_manager_gen5.c
index a65860ef021a..9395122dae13 100644
--- a/arch/arm/mach-socfpga/reset_manager_gen5.c
+++ b/arch/arm/mach-socfpga/reset_manager_gen5.c
@@ -4,7 +4,7 @@
*/
-#include <common.h>
+#include <mach/base_addr_ac5.h>
#include <asm/io.h>
#include <asm/arch/fpga_manager.h>
#include <asm/arch/reset_manager.h>
diff --git a/arch/arm/mach-socfpga/reset_manager_s10.c b/arch/arm/mach-socfpga/reset_manager_s10.c
index f47fec10a0c6..dd0383c7c76d 100644
--- a/arch/arm/mach-socfpga/reset_manager_s10.c
+++ b/arch/arm/mach-socfpga/reset_manager_s10.c
@@ -4,7 +4,6 @@
*
*/
-#include <common.h>
#include <hang.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-socfpga/scan_manager.c b/arch/arm/mach-socfpga/scan_manager.c
index 36d6880141ea..f8811525da4d 100644
--- a/arch/arm/mach-socfpga/scan_manager.c
+++ b/arch/arm/mach-socfpga/scan_manager.c
@@ -3,7 +3,7 @@
* Copyright (C) 2013 Altera Corporation <www.altera.com>
*/
-#include <common.h>
+#include <config.h>
#include <errno.h>
#include <asm/io.h>
#include <asm/arch/freeze_controller.h>
diff --git a/arch/arm/mach-socfpga/secure_reg_helper.c b/arch/arm/mach-socfpga/secure_reg_helper.c
index 0d4f45f33da5..802a966ce87a 100644
--- a/arch/arm/mach-socfpga/secure_reg_helper.c
+++ b/arch/arm/mach-socfpga/secure_reg_helper.c
@@ -4,7 +4,6 @@
*
*/
-#include <common.h>
#include <hang.h>
#include <asm/io.h>
#include <asm/system.h>
diff --git a/arch/arm/mach-socfpga/secure_vab.c b/arch/arm/mach-socfpga/secure_vab.c
index e2db58850643..4347bf6e7927 100644
--- a/arch/arm/mach-socfpga/secure_vab.c
+++ b/arch/arm/mach-socfpga/secure_vab.c
@@ -8,7 +8,6 @@
#include <asm/arch/secure_vab.h>
#include <asm/arch/smc_api.h>
#include <asm/unaligned.h>
-#include <common.h>
#include <exports.h>
#include <linux/errno.h>
#include <linux/intel-smc.h>
diff --git a/arch/arm/mach-socfpga/smc_api.c b/arch/arm/mach-socfpga/smc_api.c
index 8ffc7a472b5b..ebaa0b8fa170 100644
--- a/arch/arm/mach-socfpga/smc_api.c
+++ b/arch/arm/mach-socfpga/smc_api.c
@@ -4,10 +4,11 @@
*
*/
-#include <common.h>
#include <asm/ptrace.h>
#include <asm/system.h>
+#include <linux/errno.h>
#include <linux/intel-smc.h>
+#include <linux/string.h>
int invoke_smc(u32 func_id, u64 *args, int arg_len, u64 *ret_arg, int ret_len)
{
diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c
index 3981d2d4f140..af5bed162e2f 100644
--- a/arch/arm/mach-socfpga/spl_a10.c
+++ b/arch/arm/mach-socfpga/spl_a10.c
@@ -3,7 +3,7 @@
* Copyright (C) 2012-2021 Altera Corporation <www.altera.com>
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <hang.h>
#include <init.h>
diff --git a/arch/arm/mach-socfpga/spl_agilex.c b/arch/arm/mach-socfpga/spl_agilex.c
index ee5a9dc1e2f5..cd1bf48d8324 100644
--- a/arch/arm/mach-socfpga/spl_agilex.c
+++ b/arch/arm/mach-socfpga/spl_agilex.c
@@ -10,7 +10,6 @@
#include <asm/io.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
-#include <common.h>
#include <hang.h>
#include <image.h>
#include <spl.h>
diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
index 287fbd1713c6..d53592cba4d8 100644
--- a/arch/arm/mach-socfpga/spl_gen5.c
+++ b/arch/arm/mach-socfpga/spl_gen5.c
@@ -3,7 +3,6 @@
* Copyright (C) 2012 Altera Corporation <www.altera.com>
*/
-#include <common.h>
#include <hang.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-socfpga/spl_n5x.c b/arch/arm/mach-socfpga/spl_n5x.c
index d056871d2924..a19602039397 100644
--- a/arch/arm/mach-socfpga/spl_n5x.c
+++ b/arch/arm/mach-socfpga/spl_n5x.c
@@ -4,7 +4,6 @@
*
*/
-#include <common.h>
#include <asm/arch/clock_manager.h>
#include <asm/arch/firewall.h>
#include <asm/arch/mailbox_s10.h>
diff --git a/arch/arm/mach-socfpga/spl_s10.c b/arch/arm/mach-socfpga/spl_s10.c
index c20e87cdbef3..9b3c75f97677 100644
--- a/arch/arm/mach-socfpga/spl_s10.c
+++ b/arch/arm/mach-socfpga/spl_s10.c
@@ -11,7 +11,6 @@
#include <asm/io.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
-#include <common.h>
#include <debug_uart.h>
#include <image.h>
#include <spl.h>
diff --git a/arch/arm/mach-socfpga/spl_soc64.c b/arch/arm/mach-socfpga/spl_soc64.c
index ba6efc1d8641..4fe67ea08112 100644
--- a/arch/arm/mach-socfpga/spl_soc64.c
+++ b/arch/arm/mach-socfpga/spl_soc64.c
@@ -4,7 +4,6 @@
*
*/
-#include <common.h>
#include <spl.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/system_manager_gen5.c b/arch/arm/mach-socfpga/system_manager_gen5.c
index 09caebb3c882..c377d1c32c79 100644
--- a/arch/arm/mach-socfpga/system_manager_gen5.c
+++ b/arch/arm/mach-socfpga/system_manager_gen5.c
@@ -3,7 +3,6 @@
* Copyright (C) 2013-2017 Altera Corporation <www.altera.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/system_manager.h>
#include <asm/arch/fpga_manager.h>
diff --git a/arch/arm/mach-socfpga/system_manager_soc64.c b/arch/arm/mach-socfpga/system_manager_soc64.c
index 958bb5107b5b..4b42158be9d9 100644
--- a/arch/arm/mach-socfpga/system_manager_soc64.c
+++ b/arch/arm/mach-socfpga/system_manager_soc64.c
@@ -8,7 +8,6 @@
#include <asm/arch/system_manager.h>
#include <asm/global_data.h>
#include <asm/io.h>
-#include <common.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/timer.c b/arch/arm/mach-socfpga/timer.c
index d9e8c84bfcfe..99de5744c48f 100644
--- a/arch/arm/mach-socfpga/timer.c
+++ b/arch/arm/mach-socfpga/timer.c
@@ -3,7 +3,7 @@
* Copyright (C) 2012 Altera Corporation <www.altera.com>
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <asm/io.h>
#include <asm/arch/timer.h>
diff --git a/arch/arm/mach-socfpga/timer_s10.c b/arch/arm/mach-socfpga/timer_s10.c
index 84b13ce9d3a9..809335863190 100644
--- a/arch/arm/mach-socfpga/timer_s10.c
+++ b/arch/arm/mach-socfpga/timer_s10.c
@@ -4,7 +4,6 @@
*
*/
-#include <common.h>
#include <init.h>
#include <div64.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-socfpga/vab.c b/arch/arm/mach-socfpga/vab.c
index e146f2c52901..e74c71cfbb44 100644
--- a/arch/arm/mach-socfpga/vab.c
+++ b/arch/arm/mach-socfpga/vab.c
@@ -4,9 +4,9 @@
*
*/
+#include <vsprintf.h>
#include <asm/arch/secure_vab.h>
#include <command.h>
-#include <common.h>
#include <linux/ctype.h>
static int do_vab(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/arch/arm/mach-socfpga/wrap_handoff_soc64.c b/arch/arm/mach-socfpga/wrap_handoff_soc64.c
index 6aa9bb26b4ec..92051d19b737 100644
--- a/arch/arm/mach-socfpga/wrap_handoff_soc64.c
+++ b/arch/arm/mach-socfpga/wrap_handoff_soc64.c
@@ -6,7 +6,6 @@
#include <asm/arch/handoff_soc64.h>
#include <asm/io.h>
-#include <common.h>
#include <errno.h>
#include "log.h"
diff --git a/arch/arm/mach-socfpga/wrap_iocsr_config.c b/arch/arm/mach-socfpga/wrap_iocsr_config.c
index ce86f04cad1f..43ce329dd10f 100644
--- a/arch/arm/mach-socfpga/wrap_iocsr_config.c
+++ b/arch/arm/mach-socfpga/wrap_iocsr_config.c
@@ -3,7 +3,7 @@
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
*/
-#include <common.h>
+#include <config.h>
#include <errno.h>
#include <asm/arch/clock_manager.h>
diff --git a/arch/arm/mach-socfpga/wrap_pinmux_config.c b/arch/arm/mach-socfpga/wrap_pinmux_config.c
index 33ca14c9dc76..e494d2eb3f9f 100644
--- a/arch/arm/mach-socfpga/wrap_pinmux_config.c
+++ b/arch/arm/mach-socfpga/wrap_pinmux_config.c
@@ -3,8 +3,9 @@
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
*/
-#include <common.h>
#include <errno.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
/* Board-specific header. */
#include <qts/pinmux_config.h>
diff --git a/arch/arm/mach-socfpga/wrap_pll_config.c b/arch/arm/mach-socfpga/wrap_pll_config.c
index 0c40ae987613..e0d0f8f81b7c 100644
--- a/arch/arm/mach-socfpga/wrap_pll_config.c
+++ b/arch/arm/mach-socfpga/wrap_pll_config.c
@@ -3,7 +3,7 @@
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch/clock_manager.h>
#include <qts/pll_config.h>
diff --git a/arch/arm/mach-socfpga/wrap_pll_config_soc64.c b/arch/arm/mach-socfpga/wrap_pll_config_soc64.c
index 6a0d6b5ead72..f13581033e6b 100644
--- a/arch/arm/mach-socfpga/wrap_pll_config_soc64.c
+++ b/arch/arm/mach-socfpga/wrap_pll_config_soc64.c
@@ -4,7 +4,6 @@
*
*/
-#include <common.h>
#include <asm/arch/clock_manager.h>
#include <asm/io.h>
#include <asm/arch/handoff_soc64.h>
diff --git a/arch/arm/mach-socfpga/wrap_sdram_config.c b/arch/arm/mach-socfpga/wrap_sdram_config.c
index cd3a0f663355..8f3fbaf80c8c 100644
--- a/arch/arm/mach-socfpga/wrap_sdram_config.c
+++ b/arch/arm/mach-socfpga/wrap_sdram_config.c
@@ -3,8 +3,10 @@
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
*/
-#include <common.h>
+#include <config.h>
#include <errno.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
#include <asm/arch/sdram.h>
/* Board-specific header. */
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 09/33] arm: s5pc1xx: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (6 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 08/33] arm: socfpga: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 10/33] arm: rockchip: " Tom Rini
` (24 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Minkyu Kang
Remove <common.h> from all mach-s5pc1xx and cpu/armv7/s5p-common files
and when needed add missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
arch/arm/cpu/armv7/s5p-common/cpu_info.c | 1 -
arch/arm/cpu/armv7/s5p-common/pwm.c | 2 +-
arch/arm/cpu/armv7/s5p-common/sromc.c | 2 +-
arch/arm/cpu/armv7/s5p-common/timer.c | 1 -
arch/arm/mach-s5pc1xx/cache.c | 1 -
arch/arm/mach-s5pc1xx/clock.c | 2 +-
arch/arm/mach-s5pc1xx/pinmux.c | 1 -
7 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index fb2920950d42..4331dde7643d 100644
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -3,7 +3,6 @@
* Copyright (C) 2009 Samsung Electronics
* Minkyu Kang <mk7.kang@samsung.com>
*/
-#include <common.h>
#include <display_options.h>
#include <fdtdec.h>
#include <init.h>
diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/s5p-common/pwm.c
index 5068327d3c5f..986b585b70e9 100644
--- a/arch/arm/cpu/armv7/s5p-common/pwm.c
+++ b/arch/arm/cpu/armv7/s5p-common/pwm.c
@@ -5,7 +5,7 @@
* Donghwa Lee <dh09.lee@samsung.com>
*/
-#include <common.h>
+#include <config.h>
#include <errno.h>
#include <asm/io.h>
#include <asm/arch/pwm.h>
diff --git a/arch/arm/cpu/armv7/s5p-common/sromc.c b/arch/arm/cpu/armv7/s5p-common/sromc.c
index 0fc170936ae4..c0035fb18ebb 100644
--- a/arch/arm/cpu/armv7/s5p-common/sromc.c
+++ b/arch/arm/cpu/armv7/s5p-common/sromc.c
@@ -4,7 +4,7 @@
* Naveen Krishna Ch <ch.naveen@samsung.com>
*/
-#include <common.h>
+#include <config.h>
#include <asm/io.h>
#include <asm/arch/sromc.h>
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 9d981cce145d..12994ecc843e 100644
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -6,7 +6,6 @@
* Minkyu Kang <mk7.kang@samsung.com>
*/
-#include <common.h>
#include <div64.h>
#include <init.h>
#include <time.h>
diff --git a/arch/arm/mach-s5pc1xx/cache.c b/arch/arm/mach-s5pc1xx/cache.c
index b390bdf82784..f0aec7c0fe02 100644
--- a/arch/arm/mach-s5pc1xx/cache.c
+++ b/arch/arm/mach-s5pc1xx/cache.c
@@ -7,7 +7,6 @@
* based on arch/arm/cpu/armv7/omap3/cache.S
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/cache.h>
diff --git a/arch/arm/mach-s5pc1xx/clock.c b/arch/arm/mach-s5pc1xx/clock.c
index c90c341b5082..b92ce1152f66 100644
--- a/arch/arm/mach-s5pc1xx/clock.c
+++ b/arch/arm/mach-s5pc1xx/clock.c
@@ -5,7 +5,7 @@
* Heungjun Kim <riverful.kim@samsung.com>
*/
-#include <common.h>
+#include <config.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/clk.h>
diff --git a/arch/arm/mach-s5pc1xx/pinmux.c b/arch/arm/mach-s5pc1xx/pinmux.c
index 818d75164dee..23b9252827ae 100644
--- a/arch/arm/mach-s5pc1xx/pinmux.c
+++ b/arch/arm/mach-s5pc1xx/pinmux.c
@@ -6,7 +6,6 @@
* Written by Simon Glass <sjg@chromium.org>
*/
-#include <common.h>
#include <asm/arch/pinmux.h>
int exynos_pinmux_config(int peripheral, int flags)
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 10/33] arm: rockchip: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (7 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 09/33] arm: s5pc1xx: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 11/33] arm: owl: " Tom Rini
` (23 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Simon Glass, Philipp Tomsich, Kever Yang
Remove <common.h> from all mach-rockchip and include/asm/arch-rockchip
files and when needed add missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Simon Glass <sjg@chromium.org>
Cc: Philipp Tomsich <philipp.tomsich@vrull.eu>
Cc: Kever Yang <kever.yang@rock-chips.com>
---
arch/arm/include/asm/arch-rockchip/bootrom.h | 2 ++
arch/arm/include/asm/arch-rockchip/clock.h | 2 ++
arch/arm/mach-rockchip/board.c | 2 +-
arch/arm/mach-rockchip/boot_mode.c | 1 -
arch/arm/mach-rockchip/bootrom.c | 1 -
arch/arm/mach-rockchip/cpu-info.c | 1 -
arch/arm/mach-rockchip/px30-board-tpl.c | 1 -
arch/arm/mach-rockchip/px30/clk_px30.c | 1 -
arch/arm/mach-rockchip/px30/px30.c | 1 -
arch/arm/mach-rockchip/px30/syscon_px30.c | 1 -
arch/arm/mach-rockchip/rk3036-board-spl.c | 1 -
arch/arm/mach-rockchip/rk3036/clk_rk3036.c | 1 -
arch/arm/mach-rockchip/rk3036/rk3036.c | 1 -
arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 2 +-
arch/arm/mach-rockchip/rk3036/syscon_rk3036.c | 1 -
arch/arm/mach-rockchip/rk3066/clk_rk3066.c | 1 -
arch/arm/mach-rockchip/rk3066/rk3066.c | 1 -
arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 1 -
arch/arm/mach-rockchip/rk3128/clk_rk3128.c | 1 -
arch/arm/mach-rockchip/rk3128/syscon_rk3128.c | 1 -
arch/arm/mach-rockchip/rk3188/clk_rk3188.c | 1 -
arch/arm/mach-rockchip/rk3188/rk3188.c | 1 -
arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 1 -
arch/arm/mach-rockchip/rk322x/clk_rk322x.c | 1 -
arch/arm/mach-rockchip/rk322x/syscon_rk322x.c | 1 -
arch/arm/mach-rockchip/rk3288/clk_rk3288.c | 1 -
arch/arm/mach-rockchip/rk3288/rk3288.c | 1 -
arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 1 -
arch/arm/mach-rockchip/rk3308/clk_rk3308.c | 1 -
arch/arm/mach-rockchip/rk3308/rk3308.c | 1 -
arch/arm/mach-rockchip/rk3308/syscon_rk3308.c | 1 -
arch/arm/mach-rockchip/rk3328/clk_rk3328.c | 1 -
arch/arm/mach-rockchip/rk3328/rk3328.c | 1 -
arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 1 -
arch/arm/mach-rockchip/rk3368/clk_rk3368.c | 1 -
arch/arm/mach-rockchip/rk3368/rk3368.c | 1 -
arch/arm/mach-rockchip/rk3368/syscon_rk3368.c | 1 -
arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 1 -
arch/arm/mach-rockchip/rk3399/rk3399.c | 1 -
arch/arm/mach-rockchip/rk3399/syscon_rk3399.c | 1 -
arch/arm/mach-rockchip/rk3568/clk_rk3568.c | 1 -
arch/arm/mach-rockchip/rk3568/rk3568.c | 1 -
arch/arm/mach-rockchip/rk3568/syscon_rk3568.c | 1 -
arch/arm/mach-rockchip/rk3588/clk_rk3588.c | 1 -
arch/arm/mach-rockchip/rk3588/rk3588.c | 1 -
arch/arm/mach-rockchip/rk3588/syscon_rk3588.c | 1 -
arch/arm/mach-rockchip/rv1108/clk_rv1108.c | 1 -
arch/arm/mach-rockchip/rv1108/syscon_rv1108.c | 1 -
arch/arm/mach-rockchip/rv1126/clk_rv1126.c | 1 -
arch/arm/mach-rockchip/rv1126/rv1126.c | 1 -
arch/arm/mach-rockchip/rv1126/syscon_rv1126.c | 1 -
arch/arm/mach-rockchip/sdram.c | 2 +-
arch/arm/mach-rockchip/spl-boot-order.c | 1 -
arch/arm/mach-rockchip/tpl.c | 1 -
54 files changed, 7 insertions(+), 52 deletions(-)
diff --git a/arch/arm/include/asm/arch-rockchip/bootrom.h b/arch/arm/include/asm/arch-rockchip/bootrom.h
index ecf3b4e7428c..e736772fda75 100644
--- a/arch/arm/include/asm/arch-rockchip/bootrom.h
+++ b/arch/arm/include/asm/arch-rockchip/bootrom.h
@@ -7,6 +7,8 @@
#ifndef _ASM_ARCH_BOOTROM_H
#define _ASM_ARCH_BOOTROM_H
+#include <linux/types.h>
+
/*
* Saved Stack pointer address.
* Access might be needed in some special cases.
diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h
index f01c5aeb71cb..73e5283108b1 100644
--- a/arch/arm/include/asm/arch-rockchip/clock.h
+++ b/arch/arm/include/asm/arch-rockchip/clock.h
@@ -6,6 +6,8 @@
#ifndef _ASM_ARCH_CLOCK_H
#define _ASM_ARCH_CLOCK_H
+#include <linux/types.h>
+
struct udevice;
/* define pll mode */
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index cd226844b638..8a57b8217ff2 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -8,7 +8,7 @@
* Based on puma-rk3399.c:
* (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
*/
-#include <common.h>
+#include <config.h>
#include <clk.h>
#include <cpu_func.h>
#include <env.h>
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index f9be396aa558..55e9456668ae 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -3,7 +3,6 @@
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <adc.h>
#include <command.h>
#include <env.h>
diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c
index b36e559e8719..82a0b3efef92 100644
--- a/arch/arm/mach-rockchip/bootrom.c
+++ b/arch/arm/mach-rockchip/bootrom.c
@@ -3,7 +3,6 @@
* Copyright (c) 2017 Google, Inc
*/
-#include <common.h>
#include <hang.h>
#include <asm/arch-rockchip/bootrom.h>
#include <asm/arch-rockchip/boot_mode.h>
diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c
index a62ff53c6a04..14c7331e1ab2 100644
--- a/arch/arm/mach-rockchip/cpu-info.c
+++ b/arch/arm/mach-rockchip/cpu-info.c
@@ -4,7 +4,6 @@
* Author: Jagan Teki <jagan@amarulasolutions.com>
*/
-#include <common.h>
#include <env.h>
#include <init.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/px30-board-tpl.c b/arch/arm/mach-rockchip/px30-board-tpl.c
index db368a7b8c23..f0b3c5f83f47 100644
--- a/arch/arm/mach-rockchip/px30-board-tpl.c
+++ b/arch/arm/mach-rockchip/px30-board-tpl.c
@@ -3,7 +3,6 @@
* (C) Copyright 2019 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <debug_uart.h>
#include <dm.h>
#include <init.h>
diff --git a/arch/arm/mach-rockchip/px30/clk_px30.c b/arch/arm/mach-rockchip/px30/clk_px30.c
index 7edf1321feb3..410134769f8c 100644
--- a/arch/arm/mach-rockchip/px30/clk_px30.c
+++ b/arch/arm/mach-rockchip/px30/clk_px30.c
@@ -3,7 +3,6 @@
* (C) Copyright 2017 Rockchip Electronics Co., Ltd.
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/px30/px30.c b/arch/arm/mach-rockchip/px30/px30.c
index 2ec3289d75b7..8b1509e55f21 100644
--- a/arch/arm/mach-rockchip/px30/px30.c
+++ b/arch/arm/mach-rockchip/px30/px30.c
@@ -2,7 +2,6 @@
/*
* Copyright (c) 2017 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <clk.h>
#include <dm.h>
#include <fdt_support.h>
diff --git a/arch/arm/mach-rockchip/px30/syscon_px30.c b/arch/arm/mach-rockchip/px30/syscon_px30.c
index 37e88f5ccb91..c9de57493d8c 100644
--- a/arch/arm/mach-rockchip/px30/syscon_px30.c
+++ b/arch/arm/mach-rockchip/px30/syscon_px30.c
@@ -3,7 +3,6 @@
* (C) Copyright 2017 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <log.h>
#include <syscon.h>
diff --git a/arch/arm/mach-rockchip/rk3036-board-spl.c b/arch/arm/mach-rockchip/rk3036-board-spl.c
index 73f6d241a1ce..64e100172fac 100644
--- a/arch/arm/mach-rockchip/rk3036-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3036-board-spl.c
@@ -3,7 +3,6 @@
* (C) Copyright 2015-2019 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <debug_uart.h>
#include <init.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-rockchip/rk3036/clk_rk3036.c b/arch/arm/mach-rockchip/rk3036/clk_rk3036.c
index 116dccd7b87a..9046601a75e8 100644
--- a/arch/arm/mach-rockchip/rk3036/clk_rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/clk_rk3036.c
@@ -4,7 +4,6 @@
* Written by Simon Glass <sjg@chromium.org>
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3036/rk3036.c b/arch/arm/mach-rockchip/rk3036/rk3036.c
index e8130abdd777..6c92b31dc846 100644
--- a/arch/arm/mach-rockchip/rk3036/rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/rk3036.c
@@ -3,7 +3,6 @@
* (C) Copyright 2019 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <init.h>
#include <asm/global_data.h>
#include <asm/arch-rockchip/grf_rk3036.h>
diff --git a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
index 07cd29a33e69..308b9e6b8a8a 100644
--- a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
@@ -2,7 +2,7 @@
/*
* (C) Copyright 2015 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <asm/types.h>
#include <asm/arch-rockchip/cru_rk3036.h>
diff --git a/arch/arm/mach-rockchip/rk3036/syscon_rk3036.c b/arch/arm/mach-rockchip/rk3036/syscon_rk3036.c
index c2fd16079902..23b75269d507 100644
--- a/arch/arm/mach-rockchip/rk3036/syscon_rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/syscon_rk3036.c
@@ -3,7 +3,6 @@
* (C) Copyright 2015 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3066/clk_rk3066.c b/arch/arm/mach-rockchip/rk3066/clk_rk3066.c
index c47526dca5de..88057fad0501 100644
--- a/arch/arm/mach-rockchip/rk3066/clk_rk3066.c
+++ b/arch/arm/mach-rockchip/rk3066/clk_rk3066.c
@@ -4,7 +4,6 @@
* Written by Simon Glass <sjg@chromium.org>
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3066/rk3066.c b/arch/arm/mach-rockchip/rk3066/rk3066.c
index 9a95ff850417..70b55ca8abf6 100644
--- a/arch/arm/mach-rockchip/rk3066/rk3066.c
+++ b/arch/arm/mach-rockchip/rk3066/rk3066.c
@@ -3,7 +3,6 @@
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <asm/arch-rockchip/bootrom.h>
#include <asm/arch-rockchip/grf_rk3066.h>
#include <asm/arch-rockchip/hardware.h>
diff --git a/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c b/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c
index a598f6400de3..ff269b53b542 100644
--- a/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c
+++ b/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c
@@ -4,7 +4,6 @@
* Written by Simon Glass <sjg@chromium.org>
*/
-#include <common.h>
#include <dm.h>
#include <log.h>
#include <syscon.h>
diff --git a/arch/arm/mach-rockchip/rk3128/clk_rk3128.c b/arch/arm/mach-rockchip/rk3128/clk_rk3128.c
index a1b038c64866..ae552af3ff59 100644
--- a/arch/arm/mach-rockchip/rk3128/clk_rk3128.c
+++ b/arch/arm/mach-rockchip/rk3128/clk_rk3128.c
@@ -3,7 +3,6 @@
* Copyright (c) 2017 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3128/syscon_rk3128.c b/arch/arm/mach-rockchip/rk3128/syscon_rk3128.c
index 1406d5d0d325..f81c57a48bee 100644
--- a/arch/arm/mach-rockchip/rk3128/syscon_rk3128.c
+++ b/arch/arm/mach-rockchip/rk3128/syscon_rk3128.c
@@ -3,7 +3,6 @@
* (C) Copyright 2017 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3188/clk_rk3188.c b/arch/arm/mach-rockchip/rk3188/clk_rk3188.c
index 94d1d23e1f45..c0e71c3fa906 100644
--- a/arch/arm/mach-rockchip/rk3188/clk_rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/clk_rk3188.c
@@ -4,7 +4,6 @@
* Written by Simon Glass <sjg@chromium.org>
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c
index ffdcaa49a1e5..53b2eaa2d534 100644
--- a/arch/arm/mach-rockchip/rk3188/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
@@ -2,7 +2,6 @@
/*
* (C) Copyright 2019 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <hang.h>
#include <init.h>
diff --git a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
index 917ff37c0fc1..6df054e5b27d 100644
--- a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
@@ -4,7 +4,6 @@
* Written by Simon Glass <sjg@chromium.org>
*/
-#include <common.h>
#include <dm.h>
#include <log.h>
#include <syscon.h>
diff --git a/arch/arm/mach-rockchip/rk322x/clk_rk322x.c b/arch/arm/mach-rockchip/rk322x/clk_rk322x.c
index 2e57672b246d..4703125392eb 100644
--- a/arch/arm/mach-rockchip/rk322x/clk_rk322x.c
+++ b/arch/arm/mach-rockchip/rk322x/clk_rk322x.c
@@ -3,7 +3,6 @@
* (C) Copyright 2017 Rockchip Electronics Co., Ltd.
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk322x/syscon_rk322x.c b/arch/arm/mach-rockchip/rk322x/syscon_rk322x.c
index 0d9dca8173cd..c471a4c9fb74 100644
--- a/arch/arm/mach-rockchip/rk322x/syscon_rk322x.c
+++ b/arch/arm/mach-rockchip/rk322x/syscon_rk322x.c
@@ -3,7 +3,6 @@
* (C) Copyright 2017 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3288/clk_rk3288.c b/arch/arm/mach-rockchip/rk3288/clk_rk3288.c
index fb4c0891d0dc..af6c5d1f59b2 100644
--- a/arch/arm/mach-rockchip/rk3288/clk_rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/clk_rk3288.c
@@ -4,7 +4,6 @@
* Written by Simon Glass <sjg@chromium.org>
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index 70cf50029121..d1170f7e23d0 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -2,7 +2,6 @@
/*
* Copyright (c) 2016 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <command.h>
#include <dm.h>
#include <env.h>
diff --git a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c
index 8b2c2f323a71..6413d0a88a16 100644
--- a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c
@@ -4,7 +4,6 @@
* Written by Simon Glass <sjg@chromium.org>
*/
-#include <common.h>
#include <dm.h>
#include <dt-structs.h>
#include <log.h>
diff --git a/arch/arm/mach-rockchip/rk3308/clk_rk3308.c b/arch/arm/mach-rockchip/rk3308/clk_rk3308.c
index 201bf661f9bb..557e21f8199e 100644
--- a/arch/arm/mach-rockchip/rk3308/clk_rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/clk_rk3308.c
@@ -3,7 +3,6 @@
* Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
index a0915c72bfa0..6f88638d1569 100644
--- a/arch/arm/mach-rockchip/rk3308/rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
@@ -2,7 +2,6 @@
/*
*Copyright (c) 2018 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <init.h>
#include <malloc.h>
#include <asm/arch-rockchip/bootrom.h>
diff --git a/arch/arm/mach-rockchip/rk3308/syscon_rk3308.c b/arch/arm/mach-rockchip/rk3308/syscon_rk3308.c
index b380ff572336..2d7e97110152 100644
--- a/arch/arm/mach-rockchip/rk3308/syscon_rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/syscon_rk3308.c
@@ -3,7 +3,6 @@
* (C) Copyright 2018 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3328/clk_rk3328.c b/arch/arm/mach-rockchip/rk3328/clk_rk3328.c
index 70c0eb6f98e7..b0c5af53da68 100644
--- a/arch/arm/mach-rockchip/rk3328/clk_rk3328.c
+++ b/arch/arm/mach-rockchip/rk3328/clk_rk3328.c
@@ -3,7 +3,6 @@
* (C) Copyright 2017 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <asm/arch-rockchip/clock.h>
#include <asm/arch-rockchip/cru_rk3328.h>
diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
index ca3fa81e1278..c86d11943d6d 100644
--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
+++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
@@ -3,7 +3,6 @@
* Copyright (c) 2016 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <init.h>
#include <asm/arch-rockchip/bootrom.h>
#include <asm/arch-rockchip/hardware.h>
diff --git a/arch/arm/mach-rockchip/rk3328/syscon_rk3328.c b/arch/arm/mach-rockchip/rk3328/syscon_rk3328.c
index d2f267e63534..02ed366d8b6f 100644
--- a/arch/arm/mach-rockchip/rk3328/syscon_rk3328.c
+++ b/arch/arm/mach-rockchip/rk3328/syscon_rk3328.c
@@ -3,7 +3,6 @@
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <asm/arch-rockchip/clock.h>
#include <dm.h>
#include <syscon.h>
diff --git a/arch/arm/mach-rockchip/rk3368/clk_rk3368.c b/arch/arm/mach-rockchip/rk3368/clk_rk3368.c
index b075319720d9..c4d41e52af08 100644
--- a/arch/arm/mach-rockchip/rk3368/clk_rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/clk_rk3368.c
@@ -4,7 +4,6 @@
* Author: Andy Yan <andy.yan@rock-chips.org>
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c
index 8f5ca1dfa7c9..f589bf67328d 100644
--- a/arch/arm/mach-rockchip/rk3368/rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
@@ -4,7 +4,6 @@
* Copyright (c) 2016 Andreas Färber
*/
-#include <common.h>
#include <init.h>
#include <syscon.h>
#include <asm/armv8/mmu.h>
diff --git a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
index dc2d831dd84f..7389c0283641 100644
--- a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
@@ -5,7 +5,6 @@
* (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
*/
-#include <common.h>
#include <dm.h>
#include <log.h>
#include <syscon.h>
diff --git a/arch/arm/mach-rockchip/rk3399/clk_rk3399.c b/arch/arm/mach-rockchip/rk3399/clk_rk3399.c
index 9d9a837fc748..de552b5903b5 100644
--- a/arch/arm/mach-rockchip/rk3399/clk_rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/clk_rk3399.c
@@ -4,7 +4,6 @@
* Written by Simon Glass <sjg@chromium.org>
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 7fa1d7c7b7af..2d7d0f82a2f1 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -3,7 +3,6 @@
* Copyright (c) 2016 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <fdt_support.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
index 2b5746cb31bb..b92ad54ede5c 100644
--- a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
@@ -3,7 +3,6 @@
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <log.h>
#include <syscon.h>
diff --git a/arch/arm/mach-rockchip/rk3568/clk_rk3568.c b/arch/arm/mach-rockchip/rk3568/clk_rk3568.c
index 8917edcbd304..1c6b2ece602b 100644
--- a/arch/arm/mach-rockchip/rk3568/clk_rk3568.c
+++ b/arch/arm/mach-rockchip/rk3568/clk_rk3568.c
@@ -3,7 +3,6 @@
* (C) Copyright 2021 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3568/rk3568.c b/arch/arm/mach-rockchip/rk3568/rk3568.c
index b30ea04f737a..1b3e40074e3b 100644
--- a/arch/arm/mach-rockchip/rk3568/rk3568.c
+++ b/arch/arm/mach-rockchip/rk3568/rk3568.c
@@ -3,7 +3,6 @@
* (C) Copyright 2021 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <asm/armv8/mmu.h>
#include <asm/arch-rockchip/bootrom.h>
diff --git a/arch/arm/mach-rockchip/rk3568/syscon_rk3568.c b/arch/arm/mach-rockchip/rk3568/syscon_rk3568.c
index 5407e7827f52..255259eabfda 100644
--- a/arch/arm/mach-rockchip/rk3568/syscon_rk3568.c
+++ b/arch/arm/mach-rockchip/rk3568/syscon_rk3568.c
@@ -3,7 +3,6 @@
* (C) Copyright 2021 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3588/clk_rk3588.c b/arch/arm/mach-rockchip/rk3588/clk_rk3588.c
index 3df0bf223e30..250ec423bd24 100644
--- a/arch/arm/mach-rockchip/rk3588/clk_rk3588.c
+++ b/arch/arm/mach-rockchip/rk3588/clk_rk3588.c
@@ -3,7 +3,6 @@
* (C) Copyright 2020 Rockchip Electronics Co., Ltd.
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3588/rk3588.c b/arch/arm/mach-rockchip/rk3588/rk3588.c
index eb65dafe3a24..d3162d3447e0 100644
--- a/arch/arm/mach-rockchip/rk3588/rk3588.c
+++ b/arch/arm/mach-rockchip/rk3588/rk3588.c
@@ -4,7 +4,6 @@
* Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
*/
-#include <common.h>
#include <spl.h>
#include <asm/armv8/mmu.h>
#include <asm/arch-rockchip/bootrom.h>
diff --git a/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c b/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c
index 7b2cf37d9da1..f86567fcaf4f 100644
--- a/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c
+++ b/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c
@@ -3,7 +3,6 @@
* (C) Copyright 2021 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rv1108/clk_rv1108.c b/arch/arm/mach-rockchip/rv1108/clk_rv1108.c
index 44b53c407a78..5659ae03d711 100644
--- a/arch/arm/mach-rockchip/rv1108/clk_rv1108.c
+++ b/arch/arm/mach-rockchip/rv1108/clk_rv1108.c
@@ -4,7 +4,6 @@
* Author: Andy Yan <andy.yan@rock-chips.com>
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rv1108/syscon_rv1108.c b/arch/arm/mach-rockchip/rv1108/syscon_rv1108.c
index babdf5720b24..d68fbf1bd251 100644
--- a/arch/arm/mach-rockchip/rv1108/syscon_rv1108.c
+++ b/arch/arm/mach-rockchip/rv1108/syscon_rv1108.c
@@ -3,7 +3,6 @@
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rv1126/clk_rv1126.c b/arch/arm/mach-rockchip/rv1126/clk_rv1126.c
index bd8902718f20..3d64fcd45949 100644
--- a/arch/arm/mach-rockchip/rv1126/clk_rv1126.c
+++ b/arch/arm/mach-rockchip/rv1126/clk_rv1126.c
@@ -4,7 +4,6 @@
* Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
*/
-#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rv1126/rv1126.c b/arch/arm/mach-rockchip/rv1126/rv1126.c
index 40eb9eb7b196..1c10e9b9f233 100644
--- a/arch/arm/mach-rockchip/rv1126/rv1126.c
+++ b/arch/arm/mach-rockchip/rv1126/rv1126.c
@@ -4,7 +4,6 @@
* Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
*/
-#include <common.h>
#include <asm/arch-rockchip/bootrom.h>
#include <asm/arch-rockchip/hardware.h>
#include <asm/arch-rockchip/grf_rv1126.h>
diff --git a/arch/arm/mach-rockchip/rv1126/syscon_rv1126.c b/arch/arm/mach-rockchip/rv1126/syscon_rv1126.c
index 599ea66e3d67..67d2f18a8d0f 100644
--- a/arch/arm/mach-rockchip/rv1126/syscon_rv1126.c
+++ b/arch/arm/mach-rockchip/rv1126/syscon_rv1126.c
@@ -4,7 +4,6 @@
* Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
*/
-#include <common.h>
#include <dm.h>
#include <log.h>
#include <syscon.h>
diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c
index f2a3d6b14001..1fb01e1c4b13 100644
--- a/arch/arm/mach-rockchip/sdram.c
+++ b/arch/arm/mach-rockchip/sdram.c
@@ -3,7 +3,7 @@
* Copyright (C) 2017 Rockchip Electronics Co., Ltd.
*/
-#include <common.h>
+#include <config.h>
#include <dm.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c
index 3543267aa574..3dce9b30898d 100644
--- a/arch/arm/mach-rockchip/spl-boot-order.c
+++ b/arch/arm/mach-rockchip/spl-boot-order.c
@@ -3,7 +3,6 @@
* (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
*/
-#include <common.h>
#include <dm.h>
#include <fdt_support.h>
#include <log.h>
diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index 2c3e9789cc89..50f04f9474a0 100644
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@@ -3,7 +3,6 @@
* (C) Copyright 2019 Rockchip Electronics Co., Ltd
*/
-#include <common.h>
#include <bootstage.h>
#include <debug_uart.h>
#include <dm.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 11/33] arm: owl: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (8 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 10/33] arm: rockchip: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 12/33] arm: orion5x: " Tom Rini
` (22 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Manivannan Sadhasivam
Remove <common.h> from all mach-owl files and when needed add missing
include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
arch/arm/mach-owl/soc.c | 3 ++-
arch/arm/mach-owl/sysmap-owl.c | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c
index f0f46f2dcb74..e6332452e3ee 100644
--- a/arch/arm/mach-owl/soc.c
+++ b/arch/arm/mach-owl/soc.c
@@ -5,13 +5,14 @@
* Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
*/
+#include <config.h>
#include <cpu_func.h>
#include <init.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/arm-smccc.h>
#include <linux/psci.h>
-#include <common.h>
#include <asm/io.h>
#include <asm/mach-types.h>
#include <asm/psci.h>
diff --git a/arch/arm/mach-owl/sysmap-owl.c b/arch/arm/mach-owl/sysmap-owl.c
index 81f6ca2e4919..6f0a220320e4 100644
--- a/arch/arm/mach-owl/sysmap-owl.c
+++ b/arch/arm/mach-owl/sysmap-owl.c
@@ -6,7 +6,6 @@
* Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
static struct mm_region owl_mem_map[] = {
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 12/33] arm: orion5x: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (9 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 11/33] arm: owl: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 13/33] arm: omap2: " Tom Rini
` (21 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot
Remove <common.h> from all mach-orion5x files and when needed add
missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-orion5x/cpu.c | 1 -
arch/arm/mach-orion5x/dram.c | 1 -
arch/arm/mach-orion5x/timer.c | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
index ffae9a01e37c..58ee67eca50f 100644
--- a/arch/arm/mach-orion5x/cpu.c
+++ b/arch/arm/mach-orion5x/cpu.c
@@ -8,7 +8,6 @@
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
*/
-#include <common.h>
#include <cpu_func.h>
#include <init.h>
#include <net.h>
diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c
index 5647f847d78f..228a3f7ad075 100644
--- a/arch/arm/mach-orion5x/dram.c
+++ b/arch/arm/mach-orion5x/dram.c
@@ -8,7 +8,6 @@
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
*/
-#include <common.h>
#include <config.h>
#include <init.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-orion5x/timer.c b/arch/arm/mach-orion5x/timer.c
index b373e59e6fe3..85736f04e672 100644
--- a/arch/arm/mach-orion5x/timer.c
+++ b/arch/arm/mach-orion5x/timer.c
@@ -7,7 +7,7 @@
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 13/33] arm: omap2: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (10 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 12/33] arm: orion5x: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 14/33] arm: octeontx2: " Tom Rini
` (20 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot
Remove <common.h> from all mach-omap2 files and when needed add
missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/include/asm/arch-am33xx/clk_synthesizer.h | 2 ++
arch/arm/mach-omap2/abb.c | 1 -
arch/arm/mach-omap2/am33xx/board.c | 2 +-
arch/arm/mach-omap2/am33xx/chilisom.c | 1 -
arch/arm/mach-omap2/am33xx/clk_synthesizer.c | 3 +--
arch/arm/mach-omap2/am33xx/clock.c | 1 -
arch/arm/mach-omap2/am33xx/clock_am33xx.c | 1 -
arch/arm/mach-omap2/am33xx/clock_am43xx.c | 1 -
arch/arm/mach-omap2/am33xx/ddr.c | 2 +-
arch/arm/mach-omap2/am33xx/emif4.c | 1 -
arch/arm/mach-omap2/am33xx/fdt.c | 1 -
arch/arm/mach-omap2/am33xx/mux.c | 1 -
arch/arm/mach-omap2/am33xx/sys_info.c | 1 -
arch/arm/mach-omap2/boot-common.c | 1 -
arch/arm/mach-omap2/clocks-common.c | 1 -
arch/arm/mach-omap2/emif-common.c | 2 +-
arch/arm/mach-omap2/fdt-common.c | 2 +-
arch/arm/mach-omap2/hwinit-common.c | 1 -
arch/arm/mach-omap2/mem-common.c | 2 +-
arch/arm/mach-omap2/omap-cache.c | 3 ++-
arch/arm/mach-omap2/omap3/am35x_musb.c | 2 +-
arch/arm/mach-omap2/omap3/board.c | 1 -
arch/arm/mach-omap2/omap3/boot.c | 1 -
arch/arm/mach-omap2/omap3/clock.c | 3 ++-
arch/arm/mach-omap2/omap3/emac.c | 1 -
arch/arm/mach-omap2/omap3/emif4.c | 3 ++-
arch/arm/mach-omap2/omap3/sdrc.c | 2 +-
arch/arm/mach-omap2/omap3/spl_id_nand.c | 1 -
arch/arm/mach-omap2/omap3/sys_info.c | 3 ++-
arch/arm/mach-omap2/omap4/boot.c | 1 -
arch/arm/mach-omap2/omap4/emif.c | 1 -
arch/arm/mach-omap2/omap4/hw_data.c | 1 -
arch/arm/mach-omap2/omap4/hwinit.c | 1 -
arch/arm/mach-omap2/omap4/sdram_elpida.c | 1 -
arch/arm/mach-omap2/omap5/abb.c | 2 +-
arch/arm/mach-omap2/omap5/boot.c | 1 -
arch/arm/mach-omap2/omap5/dra7xx_iodelay.c | 2 +-
arch/arm/mach-omap2/omap5/emif.c | 1 -
arch/arm/mach-omap2/omap5/fdt.c | 2 +-
arch/arm/mach-omap2/omap5/hw_data.c | 1 -
arch/arm/mach-omap2/omap5/hwinit.c | 1 -
arch/arm/mach-omap2/omap5/sdram.c | 1 -
arch/arm/mach-omap2/sec-common.c | 2 +-
arch/arm/mach-omap2/timer.c | 2 +-
arch/arm/mach-omap2/utils.c | 2 +-
arch/arm/mach-omap2/vc.c | 2 +-
46 files changed, 25 insertions(+), 46 deletions(-)
diff --git a/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h b/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h
index 8e3d55f3e763..393bc7a6a8a5 100644
--- a/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h
+++ b/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h
@@ -10,6 +10,8 @@
#ifndef __CLK_SYNTHESIZER_H
#define __CLK_SYNTHESIZER_H
+#include <linux/types.h>
+
#define CLK_SYNTHESIZER_ID_REG 0x0
#define CLK_SYNTHESIZER_XCSEL 0x05
#define CLK_SYNTHESIZER_MUX_REG 0x14
diff --git a/arch/arm/mach-omap2/abb.c b/arch/arm/mach-omap2/abb.c
index 722e6db0566d..ce33d2fe1297 100644
--- a/arch/arm/mach-omap2/abb.c
+++ b/arch/arm/mach-omap2/abb.c
@@ -8,7 +8,6 @@
* Andrii Tseglytskyi <andrii.tseglytskyi@ti.com>
*/
-#include <common.h>
#include <asm/omap_common.h>
#include <asm/arch/clock.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index 09659da5867d..78c1e965c9f5 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/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 <debug_uart.h>
#include <errno.h>
diff --git a/arch/arm/mach-omap2/am33xx/chilisom.c b/arch/arm/mach-omap2/am33xx/chilisom.c
index d4f2abe17a97..4765ce0adeea 100644
--- a/arch/arm/mach-omap2/am33xx/chilisom.c
+++ b/arch/arm/mach-omap2/am33xx/chilisom.c
@@ -4,7 +4,6 @@
* Copyright (C) 2017, Grinn - http://grinn-global.com/
*/
-#include <common.h>
#include <init.h>
#include <asm/arch/clock.h>
#include <asm/arch/clk_synthesizer.h>
diff --git a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
index 0969a404bf69..b75eb58ee827 100644
--- a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
+++ b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
@@ -7,8 +7,7 @@
* Copyright (C) 2016, Texas Instruments, Incorporated - https://www.ti.com/
*/
-
-#include <common.h>
+#include <stdio.h>
#include <asm/arch/clk_synthesizer.h>
#include <i2c.h>
diff --git a/arch/arm/mach-omap2/am33xx/clock.c b/arch/arm/mach-omap2/am33xx/clock.c
index 3273632c648d..f07003c95bc2 100644
--- a/arch/arm/mach-omap2/am33xx/clock.c
+++ b/arch/arm/mach-omap2/am33xx/clock.c
@@ -7,7 +7,6 @@
*
* Copyright (C) 2013, Texas Instruments, Incorporated - https://www.ti.com/
*/
-#include <common.h>
#include <hang.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-omap2/am33xx/clock_am33xx.c b/arch/arm/mach-omap2/am33xx/clock_am33xx.c
index d39e7e4fed13..c33d974dccdd 100644
--- a/arch/arm/mach-omap2/am33xx/clock_am33xx.c
+++ b/arch/arm/mach-omap2/am33xx/clock_am33xx.c
@@ -7,7 +7,6 @@
* Copyright (C) 2013, Texas Instruments, Incorporated - https://www.ti.com/
*/
-#include <common.h>
#include <asm/arch/cpu.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-omap2/am33xx/clock_am43xx.c b/arch/arm/mach-omap2/am33xx/clock_am43xx.c
index 8039bc2fe751..abd65ffd77fc 100644
--- a/arch/arm/mach-omap2/am33xx/clock_am43xx.c
+++ b/arch/arm/mach-omap2/am33xx/clock_am43xx.c
@@ -8,7 +8,6 @@
* Copyright (C) 2013, Texas Instruments, Incorporated - https://www.ti.com/
*/
-#include <common.h>
#include <asm/arch/cpu.h>
#include <asm/arch/clock.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-omap2/am33xx/ddr.c b/arch/arm/mach-omap2/am33xx/ddr.c
index 61b95c937338..41eec005cb1b 100644
--- a/arch/arm/mach-omap2/am33xx/ddr.c
+++ b/arch/arm/mach-omap2/am33xx/ddr.c
@@ -5,7 +5,7 @@
* Copyright (C) 2011 Texas Instruments Incorporated - https://www.ti.com/
*/
-#include <common.h>
+#include <config.h>
#include <log.h>
#include <asm/arch/cpu.h>
#include <asm/arch/ddr_defs.h>
diff --git a/arch/arm/mach-omap2/am33xx/emif4.c b/arch/arm/mach-omap2/am33xx/emif4.c
index b29250b8d207..f19c66822d20 100644
--- a/arch/arm/mach-omap2/am33xx/emif4.c
+++ b/arch/arm/mach-omap2/am33xx/emif4.c
@@ -7,7 +7,6 @@
* Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/
*/
-#include <common.h>
#include <asm/arch/cpu.h>
#include <asm/arch/ddr_defs.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-omap2/am33xx/fdt.c b/arch/arm/mach-omap2/am33xx/fdt.c
index 2ec30b1f9c38..3e81616cb746 100644
--- a/arch/arm/mach-omap2/am33xx/fdt.c
+++ b/arch/arm/mach-omap2/am33xx/fdt.c
@@ -3,7 +3,6 @@
* Copyright 2017 Texas Instruments, Inc.
*/
-#include <common.h>
#include <hang.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/arch/arm/mach-omap2/am33xx/mux.c b/arch/arm/mach-omap2/am33xx/mux.c
index 496055939798..06b08e89e7fb 100644
--- a/arch/arm/mach-omap2/am33xx/mux.c
+++ b/arch/arm/mach-omap2/am33xx/mux.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <common.h>
#include <asm/arch/mux.h>
#include <asm/arch/hardware.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c
index 390d540e85a0..87afc096602d 100644
--- a/arch/arm/mach-omap2/am33xx/sys_info.c
+++ b/arch/arm/mach-omap2/am33xx/sys_info.c
@@ -11,7 +11,6 @@
* Syed Mohammed Khasim <khasim@ti.com>
*/
-#include <common.h>
#include <init.h>
#include <asm/io.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index aa0ab13d5fb1..e1ea3515ac10 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -7,7 +7,6 @@
* Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/
*/
-#include <common.h>
#include <ahci.h>
#include <log.h>
#include <dm/uclass.h>
diff --git a/arch/arm/mach-omap2/clocks-common.c b/arch/arm/mach-omap2/clocks-common.c
index 390d1f2a649b..2a0c22841d03 100644
--- a/arch/arm/mach-omap2/clocks-common.c
+++ b/arch/arm/mach-omap2/clocks-common.c
@@ -12,7 +12,6 @@
* Santosh Shilimkar <santosh.shilimkar@ti.com>
* Rajendra Nayak <rnayak@ti.com>
*/
-#include <common.h>
#include <hang.h>
#include <i2c.h>
#include <init.h>
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c
index 9daaeef73190..4d431e20779d 100644
--- a/arch/arm/mach-omap2/emif-common.c
+++ b/arch/arm/mach-omap2/emif-common.c
@@ -8,7 +8,7 @@
* Aneesh V <aneesh@ti.com>
*/
-#include <common.h>
+#include <config.h>
#include <hang.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-omap2/fdt-common.c b/arch/arm/mach-omap2/fdt-common.c
index e90d5776703d..c6b4c03b5085 100644
--- a/arch/arm/mach-omap2/fdt-common.c
+++ b/arch/arm/mach-omap2/fdt-common.c
@@ -3,7 +3,7 @@
* Copyright 2016-2017 Texas Instruments, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <log.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
index 0e4572ca41a7..138501602c35 100644
--- a/arch/arm/mach-omap2/hwinit-common.c
+++ b/arch/arm/mach-omap2/hwinit-common.c
@@ -10,7 +10,6 @@
* Aneesh V <aneesh@ti.com>
* Steve Sakoman <steve@sakoman.com>
*/
-#include <common.h>
#include <debug_uart.h>
#include <event.h>
#include <fdtdec.h>
diff --git a/arch/arm/mach-omap2/mem-common.c b/arch/arm/mach-omap2/mem-common.c
index 19197482aa42..00f144eb747b 100644
--- a/arch/arm/mach-omap2/mem-common.c
+++ b/arch/arm/mach-omap2/mem-common.c
@@ -12,7 +12,7 @@
* Syed Mohammed Khasim <khasim@ti.com>
*/
-#include <common.h>
+#include <config.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
#if IS_ENABLED(CONFIG_TARGET_AM335X_GUARDIAN)
diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c
index 36db58824339..132b205220ca 100644
--- a/arch/arm/mach-omap2/omap-cache.c
+++ b/arch/arm/mach-omap2/omap-cache.c
@@ -11,11 +11,12 @@
* Steve Sakoman <steve@sakoman.com>
*/
-#include <common.h>
#include <cpu_func.h>
#include <log.h>
+#include <linux/string.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-omap2/omap3/am35x_musb.c b/arch/arm/mach-omap2/omap3/am35x_musb.c
index 1121acc00589..d3807623bc64 100644
--- a/arch/arm/mach-omap2/omap3/am35x_musb.c
+++ b/arch/arm/mach-omap2/omap3/am35x_musb.c
@@ -8,8 +8,8 @@
* Hema HK <hemahk@ti.com>
*/
-#include <common.h>
#include <log.h>
+#include <time.h>
#include <dm/device.h>
#include <asm/io.h>
#include <asm/arch/am35x_def.h>
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index c76a95dd5d09..c5ada607f978 100644
--- a/arch/arm/mach-omap2/omap3/board.c
+++ b/arch/arm/mach-omap2/omap3/board.c
@@ -15,7 +15,6 @@
* Syed Mohammed Khasim <khasim@ti.com>
*
*/
-#include <common.h>
#include <command.h>
#include <dm.h>
#include <init.h>
diff --git a/arch/arm/mach-omap2/omap3/boot.c b/arch/arm/mach-omap2/omap3/boot.c
index ea26115b7118..2a36a25e2799 100644
--- a/arch/arm/mach-omap2/omap3/boot.c
+++ b/arch/arm/mach-omap2/omap3/boot.c
@@ -5,7 +5,6 @@
* Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/sys_proto.h>
#include <spl.h>
diff --git a/arch/arm/mach-omap2/omap3/clock.c b/arch/arm/mach-omap2/omap3/clock.c
index 13685e0567af..417d1eb846f3 100644
--- a/arch/arm/mach-omap2/omap3/clock.c
+++ b/arch/arm/mach-omap2/omap3/clock.c
@@ -11,11 +11,12 @@
* Syed Mohammed Khasim <khasim@ti.com>
*/
-#include <common.h>
+#include <config.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/clocks_omap3.h>
#include <asm/arch/mem.h>
+#include <asm/arch/omap.h>
#include <asm/arch/sys_proto.h>
#include <command.h>
diff --git a/arch/arm/mach-omap2/omap3/emac.c b/arch/arm/mach-omap2/omap3/emac.c
index d0d0b7a75a61..7348e92cabdf 100644
--- a/arch/arm/mach-omap2/omap3/emac.c
+++ b/arch/arm/mach-omap2/omap3/emac.c
@@ -6,7 +6,6 @@
* (C) Copyright 2011, Ilya Yanok, Emcraft Systems
*/
-#include <common.h>
#include <net.h>
#include <asm/io.h>
#include <asm/arch/am35x_def.h>
diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c
index 4fbfb387ab08..79960bf46f8b 100644
--- a/arch/arm/mach-omap2/omap3/emif4.c
+++ b/arch/arm/mach-omap2/omap3/emif4.c
@@ -9,9 +9,10 @@
* Texas Instruments Incorporated - https://www.ti.com/
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
#include <asm/arch/mem.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap3/sdrc.c b/arch/arm/mach-omap2/omap3/sdrc.c
index 4d27d82c7881..f08e4b3af5e2 100644
--- a/arch/arm/mach-omap2/omap3/sdrc.c
+++ b/arch/arm/mach-omap2/omap3/sdrc.c
@@ -21,9 +21,9 @@
* Manikandan Pillai <mani.pillai@ti.com>
*/
-#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
#include <asm/arch/mem.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap3/spl_id_nand.c b/arch/arm/mach-omap2/omap3/spl_id_nand.c
index 84a0b0ade931..d4712629d9de 100644
--- a/arch/arm/mach-omap2/omap3/spl_id_nand.c
+++ b/arch/arm/mach-omap2/omap3/spl_id_nand.c
@@ -11,7 +11,6 @@
* Jian Zhang <jzhang@ti.com>
*/
-#include <common.h>
#include <jffs2/load_kernel.h>
#include <linux/mtd/rawnand.h>
#include <linux/mtd/omap_gpmc.h>
diff --git a/arch/arm/mach-omap2/omap3/sys_info.c b/arch/arm/mach-omap2/omap3/sys_info.c
index 5f535e278277..1e3fcd597968 100644
--- a/arch/arm/mach-omap2/omap3/sys_info.c
+++ b/arch/arm/mach-omap2/omap3/sys_info.c
@@ -11,9 +11,10 @@
* Syed Mohammed Khasim <khasim@ti.com>
*/
-#include <common.h>
+#include <config.h>
#include <asm/io.h>
#include <asm/arch/mem.h> /* get mem tables */
+#include <asm/arch/omap.h>
#include <asm/arch/sys_proto.h>
#include <asm/bootm.h>
#include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/omap4/boot.c b/arch/arm/mach-omap2/omap4/boot.c
index 90b5380ae398..a60249f7fd62 100644
--- a/arch/arm/mach-omap2/omap4/boot.c
+++ b/arch/arm/mach-omap2/omap4/boot.c
@@ -5,7 +5,6 @@
* Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/omap_common.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap4/emif.c b/arch/arm/mach-omap2/omap4/emif.c
index 35a51645be7f..5b0d3b5c78a0 100644
--- a/arch/arm/mach-omap2/omap4/emif.c
+++ b/arch/arm/mach-omap2/omap4/emif.c
@@ -8,7 +8,6 @@
* Aneesh V <aneesh@ti.com>
*/
-#include <common.h>
#include <asm/emif.h>
#include <asm/arch/sys_proto.h>
#include <asm/utils.h>
diff --git a/arch/arm/mach-omap2/omap4/hw_data.c b/arch/arm/mach-omap2/omap4/hw_data.c
index d587a4d4def0..a81d76554949 100644
--- a/arch/arm/mach-omap2/omap4/hw_data.c
+++ b/arch/arm/mach-omap2/omap4/hw_data.c
@@ -8,7 +8,6 @@
*
* Sricharan R <r.sricharan@ti.com>
*/
-#include <common.h>
#include <asm/arch/omap.h>
#include <asm/arch/sys_proto.h>
#include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/omap4/hwinit.c b/arch/arm/mach-omap2/omap4/hwinit.c
index 27dfa9142dcd..e3e6cc8e5785 100644
--- a/arch/arm/mach-omap2/omap4/hwinit.c
+++ b/arch/arm/mach-omap2/omap4/hwinit.c
@@ -10,7 +10,6 @@
* Aneesh V <aneesh@ti.com>
* Steve Sakoman <steve@sakoman.com>
*/
-#include <common.h>
#include <palmas.h>
#include <asm/armv7.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-omap2/omap4/sdram_elpida.c b/arch/arm/mach-omap2/omap4/sdram_elpida.c
index 2a18cf0215d9..a29a264016ed 100644
--- a/arch/arm/mach-omap2/omap4/sdram_elpida.c
+++ b/arch/arm/mach-omap2/omap4/sdram_elpida.c
@@ -9,7 +9,6 @@
* Aneesh V <aneesh@ti.com>
*/
-#include <common.h>
#include <asm/emif.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap5/abb.c b/arch/arm/mach-omap2/omap5/abb.c
index 2f9f8e65d03e..21da0b11661d 100644
--- a/arch/arm/mach-omap2/omap5/abb.c
+++ b/arch/arm/mach-omap2/omap5/abb.c
@@ -8,7 +8,7 @@
* Andrii Tseglytskyi <andrii.tseglytskyi@ti.com>
*/
-#include <common.h>
+#include <asm/arch/omap.h>
#include <asm/omap_common.h>
#include <asm/io.h>
#include <linux/bitops.h>
diff --git a/arch/arm/mach-omap2/omap5/boot.c b/arch/arm/mach-omap2/omap5/boot.c
index 15d6836c6eae..5b479a87516b 100644
--- a/arch/arm/mach-omap2/omap5/boot.c
+++ b/arch/arm/mach-omap2/omap5/boot.c
@@ -5,7 +5,6 @@
* Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/omap_common.h>
#include <spl.h>
diff --git a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
index 8569eff31ab5..d50452b5a30b 100644
--- a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
+++ b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
@@ -6,7 +6,7 @@
* Lokesh Vutla <lokeshvutla@ti.com>
*/
-#include <common.h>
+#include <config.h>
#include <hang.h>
#include <log.h>
#include <asm/utils.h>
diff --git a/arch/arm/mach-omap2/omap5/emif.c b/arch/arm/mach-omap2/omap5/emif.c
index 2de36b6feca6..d243ff3bd8f0 100644
--- a/arch/arm/mach-omap2/omap5/emif.c
+++ b/arch/arm/mach-omap2/omap5/emif.c
@@ -8,7 +8,6 @@
* Aneesh V <aneesh@ti.com> for OMAP4
*/
-#include <common.h>
#include <log.h>
#include <asm/emif.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c
index 0ca02e664c4b..f75ec47d8210 100644
--- a/arch/arm/mach-omap2/omap5/fdt.c
+++ b/arch/arm/mach-omap2/omap5/fdt.c
@@ -3,7 +3,7 @@
* Copyright 2016 Texas Instruments, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <hang.h>
#include <log.h>
#include <linux/libfdt.h>
diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c
index b39132222ee5..e65727026eff 100644
--- a/arch/arm/mach-omap2/omap5/hw_data.c
+++ b/arch/arm/mach-omap2/omap5/hw_data.c
@@ -8,7 +8,6 @@
*
* Sricharan R <r.sricharan@ti.com>
*/
-#include <common.h>
#include <palmas.h>
#include <asm/arch/omap.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap5/hwinit.c b/arch/arm/mach-omap2/omap5/hwinit.c
index edab9a92982e..7f41e85c4a67 100644
--- a/arch/arm/mach-omap2/omap5/hwinit.c
+++ b/arch/arm/mach-omap2/omap5/hwinit.c
@@ -11,7 +11,6 @@
* Steve Sakoman <steve@sakoman.com>
* Sricharan <r.sricharan@ti.com>
*/
-#include <common.h>
#include <cpu_func.h>
#include <palmas.h>
#include <asm/armv7.h>
diff --git a/arch/arm/mach-omap2/omap5/sdram.c b/arch/arm/mach-omap2/omap5/sdram.c
index 786da45fac83..6bf4cf4a7582 100644
--- a/arch/arm/mach-omap2/omap5/sdram.c
+++ b/arch/arm/mach-omap2/omap5/sdram.c
@@ -10,7 +10,6 @@
* Sricharan R <r.sricharan@ti.com>
*/
-#include <common.h>
#include <asm/emif.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 64560b21e3f5..16bbc93f4a35 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -12,7 +12,7 @@
* Andrew F. Davis <afd@ti.com>
*/
-#include <common.h>
+#include <config.h>
#include <command.h>
#include <cpu_func.h>
#include <hang.h>
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 71fdf5bf487c..ed0620e7b63f 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -15,7 +15,7 @@
* Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 0623281a3c7d..2326d153b12f 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -3,9 +3,9 @@
* Copyright 2011 Linaro Limited
* Aneesh V <aneesh@ti.com>
*/
-#include <common.h>
#include <env.h>
#include <part.h>
+#include <vsprintf.h>
#include <asm/setup.h>
#include <asm/arch/sys_proto.h>
#include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index 054782efbdbd..cb377aa12723 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <common.h>
+#include <config.h>
#include <asm/omap_common.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/clock.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 14/33] arm: octeontx2: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (11 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 13/33] arm: omap2: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 15/33] arm: octeontx: " Tom Rini
` (19 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot
Remove <common.h> from all mach-octeontx2 files and when needed add
missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-octeontx2/clock.c | 1 -
arch/arm/mach-octeontx2/cpu.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/arch/arm/mach-octeontx2/clock.c b/arch/arm/mach-octeontx2/clock.c
index 9da21077ecdc..ffdee8799fb6 100644
--- a/arch/arm/mach-octeontx2/clock.c
+++ b/arch/arm/mach-octeontx2/clock.c
@@ -5,7 +5,6 @@
* https://spdx.org/licenses
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/board.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-octeontx2/cpu.c b/arch/arm/mach-octeontx2/cpu.c
index 723deef719b6..0a44af71a40d 100644
--- a/arch/arm/mach-octeontx2/cpu.c
+++ b/arch/arm/mach-octeontx2/cpu.c
@@ -5,7 +5,6 @@
* https://spdx.org/licenses
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
#include <asm/global_data.h>
#include <asm/io.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 15/33] arm: octeontx: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (12 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 14/33] arm: octeontx2: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 16/33] arm: npcm: " Tom Rini
` (18 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot
Remove <common.h> from all mach-octeontx files and when needed add
missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-octeontx/clock.c | 1 -
arch/arm/mach-octeontx/cpu.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/arch/arm/mach-octeontx/clock.c b/arch/arm/mach-octeontx/clock.c
index 9da21077ecdc..ffdee8799fb6 100644
--- a/arch/arm/mach-octeontx/clock.c
+++ b/arch/arm/mach-octeontx/clock.c
@@ -5,7 +5,6 @@
* https://spdx.org/licenses
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/board.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-octeontx/cpu.c b/arch/arm/mach-octeontx/cpu.c
index aa5f4585c6f5..90454edca257 100644
--- a/arch/arm/mach-octeontx/cpu.c
+++ b/arch/arm/mach-octeontx/cpu.c
@@ -5,7 +5,6 @@
* https://spdx.org/licenses
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
#include <asm/global_data.h>
#include <asm/io.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 16/33] arm: npcm: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (13 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 15/33] arm: octeontx: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 17/33] arm: nexell: " Tom Rini
` (17 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Jim Liu
Remove <common.h> from all mach-npcm files and when needed add missing
include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Jim Liu <jim.t90615@gmail.com>
---
arch/arm/mach-npcm/npcm7xx/cpu.c | 1 -
arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c | 2 +-
arch/arm/mach-npcm/npcm8xx/cpu.c | 1 -
arch/arm/mach-npcm/npcm8xx/reset.c | 1 -
4 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/arm/mach-npcm/npcm7xx/cpu.c b/arch/arm/mach-npcm/npcm7xx/cpu.c
index dd74bb9e0871..47d51cab5c76 100644
--- a/arch/arm/mach-npcm/npcm7xx/cpu.c
+++ b/arch/arm/mach-npcm/npcm7xx/cpu.c
@@ -3,7 +3,6 @@
* Copyright (c) 2021 Nuvoton Technology Corp.
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/armv7.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c b/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c
index ed4b1ca5c983..df80687c8571 100644
--- a/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c
+++ b/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c
@@ -3,7 +3,7 @@
* Copyright (c) 2021 Nuvoton Technology Corp.
*/
-#include <common.h>
+#include <config.h>
#include <asm/io.h>
#include <asm/pl310.h>
diff --git a/arch/arm/mach-npcm/npcm8xx/cpu.c b/arch/arm/mach-npcm/npcm8xx/cpu.c
index af594526094c..a1fb400b2645 100644
--- a/arch/arm/mach-npcm/npcm8xx/cpu.c
+++ b/arch/arm/mach-npcm/npcm8xx/cpu.c
@@ -3,7 +3,6 @@
* Copyright (c) 2022 Nuvoton Technology Corp.
*/
-#include <common.h>
#include <dm.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-npcm/npcm8xx/reset.c b/arch/arm/mach-npcm/npcm8xx/reset.c
index 6954e6c6a17f..e28b4ae7ae4b 100644
--- a/arch/arm/mach-npcm/npcm8xx/reset.c
+++ b/arch/arm/mach-npcm/npcm8xx/reset.c
@@ -3,7 +3,6 @@
* Copyright (c) 2022 Nuvoton Technology Corp.
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/gcr.h>
#include <asm/arch/rst.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 17/33] arm: nexell: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (14 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 16/33] arm: npcm: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-05-08 17:37 ` Stefan Bosch
2024-04-30 13:35 ` [PATCH 18/33] arm: mvebu: " Tom Rini
` (16 subsequent siblings)
32 siblings, 1 reply; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Stefan Bosch
Remove <common.h> from all mach-nexell files and when needed add missing
include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Stefan Bosch <stefan_b@posteo.net>
---
arch/arm/mach-nexell/clock.c | 2 +-
arch/arm/mach-nexell/include/mach/reset.h | 2 ++
arch/arm/mach-nexell/reset.c | 1 -
arch/arm/mach-nexell/tieoff.c | 1 -
arch/arm/mach-nexell/timer.c | 1 -
5 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-nexell/clock.c b/arch/arm/mach-nexell/clock.c
index 59ffa26255f5..3082f6077b73 100644
--- a/arch/arm/mach-nexell/clock.c
+++ b/arch/arm/mach-nexell/clock.c
@@ -4,8 +4,8 @@
* Hyunseok, Jung <hsjung@nexell.co.kr>
*/
-#include <common.h>
#include <command.h>
+#include <vsprintf.h>
#include <linux/err.h>
#include <asm/io.h>
#include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-nexell/include/mach/reset.h b/arch/arm/mach-nexell/include/mach/reset.h
index e1301d4e53d3..0c6a13043f91 100644
--- a/arch/arm/mach-nexell/include/mach/reset.h
+++ b/arch/arm/mach-nexell/include/mach/reset.h
@@ -7,6 +7,8 @@
#ifndef __NEXELL_RESET__
#define __NEXELL_RESET__
+#include <linux/types.h>
+
#define NUMBER_OF_RESET_MODULE_PIN 69
enum rstcon {
diff --git a/arch/arm/mach-nexell/reset.c b/arch/arm/mach-nexell/reset.c
index 1f732a3d3732..627f568270b6 100644
--- a/arch/arm/mach-nexell/reset.c
+++ b/arch/arm/mach-nexell/reset.c
@@ -8,7 +8,6 @@
*FIXME : Not support device tree & reset control driver.
* will remove after support device tree & reset control driver.
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/nexell.h>
#include <asm/arch/reset.h>
diff --git a/arch/arm/mach-nexell/tieoff.c b/arch/arm/mach-nexell/tieoff.c
index 5a4744c296a2..51cca6744d6f 100644
--- a/arch/arm/mach-nexell/tieoff.c
+++ b/arch/arm/mach-nexell/tieoff.c
@@ -4,7 +4,6 @@
* Youngbok, Park <park@nexell.co.kr>
*/
-#include <common.h>
#include <asm/arch/nexell.h>
#include <asm/arch/clk.h>
#include <asm/arch/reset.h>
diff --git a/arch/arm/mach-nexell/timer.c b/arch/arm/mach-nexell/timer.c
index 3b311fd22a56..b35c7b1bb33a 100644
--- a/arch/arm/mach-nexell/timer.c
+++ b/arch/arm/mach-nexell/timer.c
@@ -4,7 +4,6 @@
* Hyunseok, Jung <hsjung@nexell.co.kr>
*/
-#include <common.h>
#include <log.h>
#include <asm/io.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 18/33] arm: mvebu: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (15 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 17/33] arm: nexell: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 19/33] arm: meson: " Tom Rini
` (15 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Stefan Roese, Marek Behún
Remove <common.h> from all mach-mvebu files and when needed add missing
include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Stefan Roese <sr@denx.de>
Cc: "Marek Behún" <kabel@kernel.org>
---
arch/arm/mach-mvebu/alleycat5/cpu.c | 2 +-
arch/arm/mach-mvebu/alleycat5/soc.c | 1 -
arch/arm/mach-mvebu/arm64-common.c | 2 +-
arch/arm/mach-mvebu/armada3700/cpu.c | 1 -
arch/arm/mach-mvebu/armada3700/efuse.c | 3 ++-
arch/arm/mach-mvebu/armada3700/mbox.c | 2 +-
arch/arm/mach-mvebu/armada8k/cpu.c | 1 -
arch/arm/mach-mvebu/armada8k/dram.c | 3 ++-
arch/arm/mach-mvebu/cpu.c | 2 +-
arch/arm/mach-mvebu/dram.c | 2 +-
arch/arm/mach-mvebu/efuse.c | 1 -
arch/arm/mach-mvebu/gpio.c | 1 -
arch/arm/mach-mvebu/mbus.c | 2 +-
arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c | 1 -
arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c | 2 +-
arch/arm/mach-mvebu/serdes/a38x/seq_exec.c | 1 -
arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c | 1 -
arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 2 +-
arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c | 1 -
arch/arm/mach-mvebu/spl.c | 1 -
arch/arm/mach-mvebu/system-controller.c | 1 -
21 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/arch/arm/mach-mvebu/alleycat5/cpu.c b/arch/arm/mach-mvebu/alleycat5/cpu.c
index 0f72ae1709be..be2d9a25bf90 100644
--- a/arch/arm/mach-mvebu/alleycat5/cpu.c
+++ b/arch/arm/mach-mvebu/alleycat5/cpu.c
@@ -3,7 +3,7 @@
* Copyright (C) 2018 Marvell International Ltd.
*/
-#include <common.h>
+#include <config.h>
#include <dm.h>
#include <fdtdec.h>
#include <linux/libfdt.h>
diff --git a/arch/arm/mach-mvebu/alleycat5/soc.c b/arch/arm/mach-mvebu/alleycat5/soc.c
index 734b0a87dd49..98e66735eb9e 100644
--- a/arch/arm/mach-mvebu/alleycat5/soc.c
+++ b/arch/arm/mach-mvebu/alleycat5/soc.c
@@ -3,7 +3,6 @@
* Copyright (C) 2018 Marvell International Ltd.
*/
-#include <common.h>
#include <asm/arch-armada8k/cache_llc.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index 4c67f1aba4de..63a12f7d7743 100644
--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -3,7 +3,7 @@
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
*/
-#include <common.h>
+#include <config.h>
#include <dm.h>
#include <fdtdec.h>
#include <init.h>
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index ab72b304e5da..17525691e682 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -4,7 +4,6 @@
* Copyright (C) 2020 Marek Behún <kabel@kernel.org>
*/
-#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <fdtdec.h>
diff --git a/arch/arm/mach-mvebu/armada3700/efuse.c b/arch/arm/mach-mvebu/armada3700/efuse.c
index 07d5f394354c..84a1e388c11b 100644
--- a/arch/arm/mach-mvebu/armada3700/efuse.c
+++ b/arch/arm/mach-mvebu/armada3700/efuse.c
@@ -5,9 +5,10 @@
*/
#include <config.h>
-#include <common.h>
#include <asm/io.h>
#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/types.h>
#include <mach/mbox.h>
#include <mach/soc.h>
diff --git a/arch/arm/mach-mvebu/armada3700/mbox.c b/arch/arm/mach-mvebu/armada3700/mbox.c
index 6555b8673ce0..5ac543abce5b 100644
--- a/arch/arm/mach-mvebu/armada3700/mbox.c
+++ b/arch/arm/mach-mvebu/armada3700/mbox.c
@@ -4,11 +4,11 @@
* Copyright (C) 2021 Pali Rohár <pali@kernel.org>
*/
-#include <common.h>
#include <asm/arch/soc.h>
#include <asm/io.h>
#include <linux/bitops.h>
#include <linux/delay.h>
+#include <linux/errno.h>
#include <mach/mbox.h>
#define RWTM_BASE (MVEBU_REGISTER(0xb0000))
diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c
index 939abce000f6..7908f75809c5 100644
--- a/arch/arm/mach-mvebu/armada8k/cpu.c
+++ b/arch/arm/mach-mvebu/armada8k/cpu.c
@@ -3,7 +3,6 @@
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
*/
-#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <fdtdec.h>
diff --git a/arch/arm/mach-mvebu/armada8k/dram.c b/arch/arm/mach-mvebu/armada8k/dram.c
index 6c801bfa1db7..8a87e4a8e035 100644
--- a/arch/arm/mach-mvebu/armada8k/dram.c
+++ b/arch/arm/mach-mvebu/armada8k/dram.c
@@ -3,10 +3,11 @@
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/ptrace.h>
#include <asm/system.h>
#include <linux/sizes.h>
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 7c62a5dbb6a0..e603ab9ffb75 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -3,7 +3,7 @@
* Copyright (C) 2014-2016 Stefan Roese <sr@denx.de>
*/
-#include <common.h>
+#include <config.h>
#include <ahci.h>
#include <cpu_func.h>
#include <init.h>
diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c
index d398d0f7676a..daf2f8e3f671 100644
--- a/arch/arm/mach-mvebu/dram.c
+++ b/arch/arm/mach-mvebu/dram.c
@@ -6,9 +6,9 @@
*/
#include <config.h>
-#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
diff --git a/arch/arm/mach-mvebu/efuse.c b/arch/arm/mach-mvebu/efuse.c
index be5dc0e07d9b..475687955e05 100644
--- a/arch/arm/mach-mvebu/efuse.c
+++ b/arch/arm/mach-mvebu/efuse.c
@@ -4,7 +4,6 @@
*/
#include <config.h>
-#include <common.h>
#include <errno.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-mvebu/gpio.c b/arch/arm/mach-mvebu/gpio.c
index 1d1e3df8ba90..587cbb00e7fc 100644
--- a/arch/arm/mach-mvebu/gpio.c
+++ b/arch/arm/mach-mvebu/gpio.c
@@ -5,7 +5,6 @@
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c
index 959ca8e92602..9baeece3c850 100644
--- a/arch/arm/mach-mvebu/mbus.c
+++ b/arch/arm/mach-mvebu/mbus.c
@@ -46,7 +46,7 @@
* mvebu_mbus_del_window().
*/
-#include <common.h>
+#include <config.h>
#include <malloc.h>
#include <linux/bitops.h>
#include <linux/errno.h>
diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
index 12596ec2d8bd..4582871556d9 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
@@ -3,7 +3,6 @@
* Copyright (C) Marvell International Ltd. and its affiliates
*/
-#include <common.h>
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
index 3349f4eb5491..efc31d5218ac 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
@@ -3,7 +3,7 @@
* Copyright (C) Marvell International Ltd. and its affiliates
*/
-#include <common.h>
+#include <config.h>
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
index 2a51b7113ce4..9a1bbba7f2f4 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
@@ -3,7 +3,6 @@
* Copyright (C) Marvell International Ltd. and its affiliates
*/
-#include <common.h>
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
index fb8ec11dfb95..8290b861c079 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
@@ -3,7 +3,6 @@
* Copyright (C) Marvell International Ltd. and its affiliates
*/
-#include <common.h>
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
index 68f8eade2722..61b7f168697b 100644
--- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
+++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
@@ -3,7 +3,7 @@
* Copyright (C) Marvell International Ltd. and its affiliates
*/
-#include <common.h>
+#include <config.h>
#include <i2c.h>
#include <spl.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c
index 539d237623a1..9b7bb2c38511 100644
--- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c
+++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c
@@ -3,7 +3,6 @@
* Copyright (C) Marvell International Ltd. and its affiliates
*/
-#include <common.h>
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index 79f8877745b3..4f4f7e00e3cf 100644
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -3,7 +3,6 @@
* Copyright (C) 2014-2016 Stefan Roese <sr@denx.de>
*/
-#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <fdtdec.h>
diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c
index 682431ee11d9..d94bde0777c8 100644
--- a/arch/arm/mach-mvebu/system-controller.c
+++ b/arch/arm/mach-mvebu/system-controller.c
@@ -4,7 +4,6 @@
* Copyright (C) 2024 Marek Behún <kabel@kernel.org>
*/
-#include <common.h>
#include <dm.h>
#include <dm/lists.h>
#include <regmap.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 19/33] arm: meson: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (16 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 18/33] arm: mvebu: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-05-02 7:39 ` Neil Armstrong
2024-04-30 13:35 ` [PATCH 20/33] arm: mediatek: " Tom Rini
` (14 subsequent siblings)
32 siblings, 1 reply; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Neil Armstrong, u-boot-amlogic
Remove <common.h> from all mach-meson files and when needed add missing
include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: u-boot-amlogic@groups.io
---
arch/arm/mach-meson/board-a1.c | 2 +-
arch/arm/mach-meson/board-axg.c | 1 -
arch/arm/mach-meson/board-common.c | 1 -
arch/arm/mach-meson/board-g12a.c | 1 -
arch/arm/mach-meson/board-gx.c | 1 -
arch/arm/mach-meson/board-info.c | 1 -
arch/arm/mach-meson/sm.c | 1 -
7 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/arm/mach-meson/board-a1.c b/arch/arm/mach-meson/board-a1.c
index 967bb671822e..f848c0f068ed 100644
--- a/arch/arm/mach-meson/board-a1.c
+++ b/arch/arm/mach-meson/board-a1.c
@@ -3,12 +3,12 @@
* (C) Copyright 2023 SberDevices, Inc.
*/
-#include <common.h>
#include <asm/arch/a1.h>
#include <asm/arch/boot.h>
#include <asm/armv8/mmu.h>
#include <asm/io.h>
#include <linux/compiler.h>
+#include <linux/errno.h>
#include <linux/sizes.h>
phys_size_t get_effective_memsize(void)
diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c
index fdf18752cdd0..6535539184cc 100644
--- a/arch/arm/mach-meson/board-axg.c
+++ b/arch/arm/mach-meson/board-axg.c
@@ -4,7 +4,6 @@
* (C) Copyright 2018 Neil Armstrong <narmstrong@baylibre.com>
*/
-#include <common.h>
#include <init.h>
#include <net.h>
#include <asm/arch/boot.h>
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 7ceba7cede85..39774c43049a 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -3,7 +3,6 @@
* (C) Copyright 2016 Beniamino Galvani <b.galvani@gmail.com>
*/
-#include <common.h>
#include <cpu_func.h>
#include <fastboot.h>
#include <init.h>
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index d5a830fb1db8..dc4abe1e1074 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -4,7 +4,6 @@
* (C) Copyright 2018 Neil Armstrong <narmstrong@baylibre.com>
*/
-#include <common.h>
#include <init.h>
#include <log.h>
#include <net.h>
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index c3fbdfffeae8..0370ed57e205 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -4,7 +4,6 @@
* (C) Copyright 2018 Neil Armstrong <narmstrong@baylibre.com>
*/
-#include <common.h>
#include <init.h>
#include <net.h>
#include <asm/arch/boot.h>
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index d51d9b8f0645..b4058f593234 100644
--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
@@ -4,7 +4,6 @@
* (C) Copyright 2019 Neil Armstrong <narmstrong@baylibre.com>
*/
-#include <common.h>
#include <init.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index 914fd11c9894..4d9f83d3b38d 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -5,7 +5,6 @@
* Secure monitor calls.
*/
-#include <common.h>
#include <dm.h>
#include <log.h>
#include <regmap.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 20/33] arm: mediatek: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (17 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 19/33] arm: meson: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 21/33] arm: lpc32xx: " Tom Rini
` (13 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Ryder Lee, Weijie Gao, Chunfeng Yun, GSS_MTK_Uboot_upstream
Remove <common.h> from all mach-mediatek files and when needed add
missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Ryder Lee <ryder.lee@mediatek.com>
Cc: Weijie Gao <weijie.gao@mediatek.com>
Cc: Chunfeng Yun <chunfeng.yun@mediatek.com>
Cc: GSS_MTK_Uboot_upstream <GSS_MTK_Uboot_upstream@mediatek.com>
---
arch/arm/mach-mediatek/cpu.c | 1 -
arch/arm/mach-mediatek/mt7623/init.c | 2 +-
arch/arm/mach-mediatek/mt7629/init.c | 2 +-
arch/arm/mach-mediatek/mt8183/init.c | 1 -
arch/arm/mach-mediatek/mt8512/init.c | 1 -
arch/arm/mach-mediatek/mt8516/init.c | 1 -
arch/arm/mach-mediatek/mt8518/init.c | 1 -
arch/arm/mach-mediatek/spl.c | 1 -
8 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-mediatek/cpu.c b/arch/arm/mach-mediatek/cpu.c
index c329e7cc98a8..8e8bc4f9ceaa 100644
--- a/arch/arm/mach-mediatek/cpu.c
+++ b/arch/arm/mach-mediatek/cpu.c
@@ -3,7 +3,6 @@
* Copyright (C) 2018 MediaTek Inc.
*/
-#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <init.h>
diff --git a/arch/arm/mach-mediatek/mt7623/init.c b/arch/arm/mach-mediatek/mt7623/init.c
index 988b057e5984..3d6ba3f383c5 100644
--- a/arch/arm/mach-mediatek/mt7623/init.c
+++ b/arch/arm/mach-mediatek/mt7623/init.c
@@ -3,7 +3,7 @@
* Copyright (C) 2018 MediaTek Inc.
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <asm/global_data.h>
#include <linux/io.h>
diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c
index 0130554ff35c..7cb8b72c364c 100644
--- a/arch/arm/mach-mediatek/mt7629/init.c
+++ b/arch/arm/mach-mediatek/mt7629/init.c
@@ -5,7 +5,7 @@
*/
#include <clk.h>
-#include <common.h>
+#include <config.h>
#include <dm.h>
#include <fdtdec.h>
#include <init.h>
diff --git a/arch/arm/mach-mediatek/mt8183/init.c b/arch/arm/mach-mediatek/mt8183/init.c
index 7496029705f6..37243547da81 100644
--- a/arch/arm/mach-mediatek/mt8183/init.c
+++ b/arch/arm/mach-mediatek/mt8183/init.c
@@ -6,7 +6,6 @@
*/
#include <clk.h>
-#include <common.h>
#include <dm.h>
#include <fdtdec.h>
#include <ram.h>
diff --git a/arch/arm/mach-mediatek/mt8512/init.c b/arch/arm/mach-mediatek/mt8512/init.c
index 5a21e9a4485c..3b48caf5196c 100644
--- a/arch/arm/mach-mediatek/mt8512/init.c
+++ b/arch/arm/mach-mediatek/mt8512/init.c
@@ -7,7 +7,6 @@
*/
#include <clk.h>
-#include <common.h>
#include <dm.h>
#include <fdtdec.h>
#include <init.h>
diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
index 3460dcc24943..892bd441a33b 100644
--- a/arch/arm/mach-mediatek/mt8516/init.c
+++ b/arch/arm/mach-mediatek/mt8516/init.c
@@ -6,7 +6,6 @@
*/
#include <clk.h>
-#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <fdtdec.h>
diff --git a/arch/arm/mach-mediatek/mt8518/init.c b/arch/arm/mach-mediatek/mt8518/init.c
index f7e03de36507..c04bcb635178 100644
--- a/arch/arm/mach-mediatek/mt8518/init.c
+++ b/arch/arm/mach-mediatek/mt8518/init.c
@@ -7,7 +7,6 @@
*/
#include <clk.h>
-#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <fdtdec.h>
diff --git a/arch/arm/mach-mediatek/spl.c b/arch/arm/mach-mediatek/spl.c
index d3cda94617e1..247d7ee6f1db 100644
--- a/arch/arm/mach-mediatek/spl.c
+++ b/arch/arm/mach-mediatek/spl.c
@@ -5,7 +5,6 @@
*/
#include <clk.h>
-#include <common.h>
#include <hang.h>
#include <init.h>
#include <spl.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 21/33] arm: lpc32xx: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (18 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 20/33] arm: mediatek: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 22/33] arm: kirkwood: " Tom Rini
` (12 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot
Remove <common.h> from all mach-lpc32xx files and when needed add
missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-lpc32xx/clk.c | 1 -
arch/arm/mach-lpc32xx/cpu.c | 1 -
arch/arm/mach-lpc32xx/devices.c | 2 +-
arch/arm/mach-lpc32xx/dram.c | 1 -
arch/arm/mach-lpc32xx/timer.c | 1 -
5 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/arm/mach-lpc32xx/clk.c b/arch/arm/mach-lpc32xx/clk.c
index cb2344d79fec..2e11903e7e07 100644
--- a/arch/arm/mach-lpc32xx/clk.c
+++ b/arch/arm/mach-lpc32xx/clk.c
@@ -3,7 +3,6 @@
* Copyright (C) 2011 by Vladimir Zapolskiy <vz@mleia.com>
*/
-#include <common.h>
#include <clock_legacy.h>
#include <div64.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c
index a97f9a1958ab..80f5e7c88eb4 100644
--- a/arch/arm/mach-lpc32xx/cpu.c
+++ b/arch/arm/mach-lpc32xx/cpu.c
@@ -3,7 +3,6 @@
* Copyright (C) 2011-2015 by Vladimir Zapolskiy <vz@mleia.com>
*/
-#include <common.h>
#include <cpu_func.h>
#include <init.h>
#include <net.h>
diff --git a/arch/arm/mach-lpc32xx/devices.c b/arch/arm/mach-lpc32xx/devices.c
index 6a67a3591aa6..49308d6d4be0 100644
--- a/arch/arm/mach-lpc32xx/devices.c
+++ b/arch/arm/mach-lpc32xx/devices.c
@@ -3,7 +3,7 @@
* Copyright (C) 2011 by Vladimir Zapolskiy <vz@mleia.com>
*/
-#include <common.h>
+#include <config.h>
#include <dm.h>
#include <ns16550.h>
diff --git a/arch/arm/mach-lpc32xx/dram.c b/arch/arm/mach-lpc32xx/dram.c
index 160223792353..ab7c13512a5a 100644
--- a/arch/arm/mach-lpc32xx/dram.c
+++ b/arch/arm/mach-lpc32xx/dram.c
@@ -10,7 +10,6 @@
* This code runs from SRAM.
*/
-#include <common.h>
#include <netdev.h>
#include <asm/arch/cpu.h>
#include <asm/arch/clk.h>
diff --git a/arch/arm/mach-lpc32xx/timer.c b/arch/arm/mach-lpc32xx/timer.c
index 90183e3014eb..523f9cfc8c48 100644
--- a/arch/arm/mach-lpc32xx/timer.c
+++ b/arch/arm/mach-lpc32xx/timer.c
@@ -3,7 +3,6 @@
* Copyright (C) 2011 Vladimir Zapolskiy <vz@mleia.com>
*/
-#include <common.h>
#include <init.h>
#include <time.h>
#include <asm/arch/cpu.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 22/33] arm: kirkwood: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (19 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 21/33] arm: lpc32xx: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 23/33] arm: imx: " Tom Rini
` (11 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Stefan Roese
Remove <common.h> from all mach-kirkwood files and when needed add
missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Stefan Roese <sr@denx.de>
---
arch/arm/mach-kirkwood/cache.c | 1 -
arch/arm/mach-kirkwood/cpu.c | 1 -
arch/arm/mach-kirkwood/mpp.c | 1 -
3 files changed, 3 deletions(-)
diff --git a/arch/arm/mach-kirkwood/cache.c b/arch/arm/mach-kirkwood/cache.c
index 009b7deeca64..acd2e8b1145e 100644
--- a/arch/arm/mach-kirkwood/cache.c
+++ b/arch/arm/mach-kirkwood/cache.c
@@ -3,7 +3,6 @@
* Copyright (c) 2012 Michael Walle
* Michael Walle <michael@walle.cc>
*/
-#include <common.h>
#include <asm/arch/cpu.h>
#include <asm/cache.h>
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index 2b493b36c20d..a432abe615d3 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -5,7 +5,6 @@
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
*/
-#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <env.h>
diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
index 4fdad99cadef..7938820e513f 100644
--- a/arch/arm/mach-kirkwood/mpp.c
+++ b/arch/arm/mach-kirkwood/mpp.c
@@ -9,7 +9,6 @@
* warranty of any kind, whether express or implied.
*/
-#include <common.h>
#include <log.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 23/33] arm: imx: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (20 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 22/33] arm: kirkwood: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 23:51 ` Peng Fan
2024-04-30 13:35 ` [PATCH 24/33] arm: histb: " Tom Rini
` (10 subsequent siblings)
32 siblings, 1 reply; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Stefano Babic, Fabio Estevam, NXP i.MX U-Boot Team
Remove <common.h> from all mach-imx, CPU specific sub-directories and
include/asm/arch-mx* files and when needed add missing include files
directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: "NXP i.MX U-Boot Team" <uboot-imx@nxp.com>
---
arch/arm/cpu/arm1136/mx31/devices.c | 1 -
arch/arm/cpu/arm1136/mx31/generic.c | 1 -
arch/arm/cpu/arm1136/mx31/timer.c | 1 -
arch/arm/cpu/arm926ejs/mxs/clock.c | 1 -
arch/arm/cpu/arm926ejs/mxs/iomux.c | 1 -
arch/arm/cpu/arm926ejs/mxs/mxs.c | 1 -
arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 1 -
arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c | 1 -
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 -
arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 1 -
arch/arm/cpu/arm926ejs/mxs/start.S | 1 -
arch/arm/cpu/arm926ejs/mxs/timer.c | 1 -
arch/arm/include/asm/arch-mx5/clock.h | 2 ++
arch/arm/include/asm/arch-mx7/sys_proto.h | 2 ++
arch/arm/mach-imx/cache.c | 2 +-
arch/arm/mach-imx/cmd_bmode.c | 1 -
arch/arm/mach-imx/cmd_dek.c | 3 ++-
arch/arm/mach-imx/cmd_hdmidet.c | 1 -
arch/arm/mach-imx/cmd_mfgprot.c | 2 +-
arch/arm/mach-imx/cmd_nandbcb.c | 1 -
arch/arm/mach-imx/cpu.c | 1 -
arch/arm/mach-imx/ddrmc-vf610-calibration.c | 1 -
arch/arm/mach-imx/ddrmc-vf610.c | 1 -
arch/arm/mach-imx/ele_ahab.c | 2 +-
arch/arm/mach-imx/hab.c | 1 -
arch/arm/mach-imx/i2c-mxv7.c | 2 +-
arch/arm/mach-imx/image-container.c | 2 +-
arch/arm/mach-imx/imx8/ahab.c | 1 -
arch/arm/mach-imx/imx8/clock.c | 1 -
arch/arm/mach-imx/imx8/cpu.c | 1 -
arch/arm/mach-imx/imx8/fdt.c | 1 -
arch/arm/mach-imx/imx8/iomux.c | 1 -
arch/arm/mach-imx/imx8/misc.c | 1 -
arch/arm/mach-imx/imx8/snvs_security_sc.c | 1 -
arch/arm/mach-imx/imx8m/clock_imx8mm.c | 1 -
arch/arm/mach-imx/imx8m/clock_imx8mq.c | 1 -
arch/arm/mach-imx/imx8m/clock_slice.c | 1 -
arch/arm/mach-imx/imx8m/psci.c | 1 -
arch/arm/mach-imx/imx8m/soc.c | 2 +-
arch/arm/mach-imx/imx8ulp/cgc.c | 1 -
arch/arm/mach-imx/imx8ulp/clock.c | 1 -
arch/arm/mach-imx/imx8ulp/iomux.c | 1 -
arch/arm/mach-imx/imx8ulp/pcc.c | 1 -
arch/arm/mach-imx/imx8ulp/rdc.c | 3 ++-
arch/arm/mach-imx/imx9/clock.c | 1 -
arch/arm/mach-imx/imx9/clock_root.c | 2 +-
arch/arm/mach-imx/imx9/imx_bootaux.c | 3 ++-
arch/arm/mach-imx/imx9/soc.c | 2 +-
arch/arm/mach-imx/imx9/trdc.c | 2 +-
arch/arm/mach-imx/imx_bootaux.c | 5 ++++-
arch/arm/mach-imx/imxrt/soc.c | 1 -
arch/arm/mach-imx/iomux-v3.c | 1 -
arch/arm/mach-imx/mac.c | 1 -
arch/arm/mach-imx/misc.c | 1 -
arch/arm/mach-imx/mmc_env.c | 1 -
arch/arm/mach-imx/mmdc_size.c | 2 +-
arch/arm/mach-imx/mx5/clock.c | 1 -
arch/arm/mach-imx/mx5/mx53_dram.c | 2 +-
arch/arm/mach-imx/mx5/soc.c | 1 -
arch/arm/mach-imx/mx6/clock.c | 2 +-
arch/arm/mach-imx/mx6/ddr.c | 1 -
arch/arm/mach-imx/mx6/litesom.c | 2 +-
arch/arm/mach-imx/mx6/module_fuse.c | 1 -
arch/arm/mach-imx/mx6/mp.c | 1 -
arch/arm/mach-imx/mx6/opos6ul.c | 2 +-
arch/arm/mach-imx/mx6/soc.c | 1 -
arch/arm/mach-imx/mx7/clock.c | 3 ++-
arch/arm/mach-imx/mx7/clock_slice.c | 1 -
arch/arm/mach-imx/mx7/ddr.c | 1 -
arch/arm/mach-imx/mx7/psci-mx7.c | 1 -
arch/arm/mach-imx/mx7/soc.c | 1 -
arch/arm/mach-imx/mx7ulp/clock.c | 2 +-
arch/arm/mach-imx/mx7ulp/iomux.c | 1 -
arch/arm/mach-imx/mx7ulp/pcc.c | 1 -
arch/arm/mach-imx/mx7ulp/scg.c | 2 +-
arch/arm/mach-imx/mx7ulp/soc.c | 2 +-
arch/arm/mach-imx/priblob.c | 1 -
arch/arm/mach-imx/rdc-sema.c | 1 -
arch/arm/mach-imx/speed.c | 2 +-
arch/arm/mach-imx/spl.c | 2 +-
arch/arm/mach-imx/spl_imx_romapi.c | 1 -
arch/arm/mach-imx/syscounter.c | 2 +-
arch/arm/mach-imx/timer.c | 1 -
arch/arm/mach-imx/video.c | 3 ++-
84 files changed, 38 insertions(+), 82 deletions(-)
diff --git a/arch/arm/cpu/arm1136/mx31/devices.c b/arch/arm/cpu/arm1136/mx31/devices.c
index 9997e8fc3396..87ca303e31ba 100644
--- a/arch/arm/cpu/arm1136/mx31/devices.c
+++ b/arch/arm/cpu/arm1136/mx31/devices.c
@@ -6,7 +6,6 @@
* (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
*/
-#include <common.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index a3d4f1479623..fc56baccfcd6 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -4,7 +4,6 @@
* Sascha Hauer, Pengutronix
*/
-#include <common.h>
#include <div64.h>
#include <init.h>
#include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c
index a913860491cb..b41ca68ae552 100644
--- a/arch/arm/cpu/arm1136/mx31/timer.c
+++ b/arch/arm/cpu/arm1136/mx31/timer.c
@@ -4,7 +4,6 @@
* Sascha Hauer, Pengutronix
*/
-#include <common.h>
#include <init.h>
#include <asm/arch/imx-regs.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/clock.c b/arch/arm/cpu/arm926ejs/mxs/clock.c
index 4e1cf3a1e32b..58f6cf80cae0 100644
--- a/arch/arm/cpu/arm926ejs/mxs/clock.c
+++ b/arch/arm/cpu/arm926ejs/mxs/clock.c
@@ -9,7 +9,6 @@
* Copyright (C) 2010 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <log.h>
#include <linux/errno.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/iomux.c b/arch/arm/cpu/arm926ejs/mxs/iomux.c
index 381264b8a18d..851b4deb080b 100644
--- a/arch/arm/cpu/arm926ejs/mxs/iomux.c
+++ b/arch/arm/cpu/arm926ejs/mxs/iomux.c
@@ -6,7 +6,6 @@
* <armlinux@phytec.de>
*/
-#include <common.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index 4f3cb63c56df..7b2bb09551b5 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -9,7 +9,6 @@
* Copyright (C) 2010 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <hang.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 249f8de8fbe1..76a69d7f9586 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -6,7 +6,6 @@
* on behalf of DENX Software Engineering GmbH
*/
-#include <common.h>
#include <config.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
index 2cfbd780953d..b2d3b2b13efd 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
@@ -6,7 +6,6 @@
* on behalf of DENX Software Engineering GmbH
*/
-#include <common.h>
#include <config.h>
#include <log.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
index a94803ee93d9..c3136dd8976a 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
@@ -6,7 +6,6 @@
* on behalf of DENX Software Engineering GmbH
*/
-#include <common.h>
#include <config.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
index 77bca7e331a0..8b65c094a8ad 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
@@ -6,7 +6,6 @@
* on behalf of DENX Software Engineering GmbH
*/
-#include <common.h>
#include <config.h>
#include <hang.h>
#include <log.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/start.S b/arch/arm/cpu/arm926ejs/mxs/start.S
index 61982e38a1d4..a6eb053cadb0 100644
--- a/arch/arm/cpu/arm926ejs/mxs/start.S
+++ b/arch/arm/cpu/arm926ejs/mxs/start.S
@@ -20,7 +20,6 @@
#include <asm-offsets.h>
#include <config.h>
-#include <common.h>
#include <system-constants.h>
/*
diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
index 3dff3d768d1c..cbd3b5d9958a 100644
--- a/arch/arm/cpu/arm926ejs/mxs/timer.c
+++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
@@ -9,7 +9,6 @@
* (C) Copyright 2009-2010 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
diff --git a/arch/arm/include/asm/arch-mx5/clock.h b/arch/arm/include/asm/arch-mx5/clock.h
index d585b5cf4b22..58013a85951a 100644
--- a/arch/arm/include/asm/arch-mx5/clock.h
+++ b/arch/arm/include/asm/arch-mx5/clock.h
@@ -7,6 +7,8 @@
#ifndef __ASM_ARCH_CLOCK_H
#define __ASM_ARCH_CLOCK_H
+#include <stdbool.h>
+
#ifdef CONFIG_SYS_MX5_HCLK
#define MXC_HCLK CONFIG_SYS_MX5_HCLK
#else
diff --git a/arch/arm/include/asm/arch-mx7/sys_proto.h b/arch/arm/include/asm/arch-mx7/sys_proto.h
index 634736cc09cd..5da0037b2c6b 100644
--- a/arch/arm/include/asm/arch-mx7/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx7/sys_proto.h
@@ -7,6 +7,8 @@
#include <asm/mach-imx/sys_proto.h>
+struct wdog_regs;
+
void set_wdog_reset(struct wdog_regs *wdog);
#endif /* __SYS_PROTO_IMX7_ */
diff --git a/arch/arm/mach-imx/cache.c b/arch/arm/mach-imx/cache.c
index ab9b621a2a62..b368db49fce5 100644
--- a/arch/arm/mach-imx/cache.c
+++ b/arch/arm/mach-imx/cache.c
@@ -3,7 +3,7 @@
* Copyright 2015 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <asm/armv7.h>
#include <asm/cache.h>
diff --git a/arch/arm/mach-imx/cmd_bmode.c b/arch/arm/mach-imx/cmd_bmode.c
index 5b2f4686230c..c20e80725f8b 100644
--- a/arch/arm/mach-imx/cmd_bmode.c
+++ b/arch/arm/mach-imx/cmd_bmode.c
@@ -2,7 +2,6 @@
/*
* Copyright (C) 2012 Boundary Devices Inc.
*/
-#include <common.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <asm/mach-imx/boot_mode.h>
diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
index 2f389dbe8df0..c7962ead2d54 100644
--- a/arch/arm/mach-imx/cmd_dek.c
+++ b/arch/arm/mach-imx/cmd_dek.c
@@ -6,7 +6,7 @@
* Command for encapsulating DEK blob
*/
-#include <common.h>
+#include <config.h>
#include <command.h>
#include <log.h>
#include <malloc.h>
@@ -17,6 +17,7 @@
#include <asm/arch/clock.h>
#include <mapmem.h>
#include <tee.h>
+#include <vsprintf.h>
#ifdef CONFIG_IMX_SECO_DEK_ENCAP
#include <imx_container.h>
#include <firmware/imx/sci/sci.h>
diff --git a/arch/arm/mach-imx/cmd_hdmidet.c b/arch/arm/mach-imx/cmd_hdmidet.c
index e2571adfb006..8104ab26b08f 100644
--- a/arch/arm/mach-imx/cmd_hdmidet.c
+++ b/arch/arm/mach-imx/cmd_hdmidet.c
@@ -2,7 +2,6 @@
/*
* Copyright (C) 2012 Boundary Devices Inc.
*/
-#include <common.h>
#include <command.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/mxc_hdmi.h>
diff --git a/arch/arm/mach-imx/cmd_mfgprot.c b/arch/arm/mach-imx/cmd_mfgprot.c
index 9576b48dde30..9925c9922687 100644
--- a/arch/arm/mach-imx/cmd_mfgprot.c
+++ b/arch/arm/mach-imx/cmd_mfgprot.c
@@ -11,7 +11,7 @@
#include <asm/arch/clock.h>
#include <linux/compiler.h>
#include <command.h>
-#include <common.h>
+#include <config.h>
#include <env.h>
#include <fsl_sec.h>
#include <mapmem.h>
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index 70a213a49dd0..c2e452b69270 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -11,7 +11,6 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#include <common.h>
#include <command.h>
#include <log.h>
#include <malloc.h>
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index 488638c90585..ceee31eecd79 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -7,7 +7,6 @@
*/
#include <bootm.h>
-#include <common.h>
#include <dm.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-imx/ddrmc-vf610-calibration.c b/arch/arm/mach-imx/ddrmc-vf610-calibration.c
index 7d787d045980..2cf684322ea3 100644
--- a/arch/arm/mach-imx/ddrmc-vf610-calibration.c
+++ b/arch/arm/mach-imx/ddrmc-vf610-calibration.c
@@ -7,7 +7,6 @@
*
*/
/* #define DEBUG */
-#include <common.h>
#include <log.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/ddrmc-vf610.c b/arch/arm/mach-imx/ddrmc-vf610.c
index 7895ee66f8a8..e449fa6f552d 100644
--- a/arch/arm/mach-imx/ddrmc-vf610.c
+++ b/arch/arm/mach-imx/ddrmc-vf610.c
@@ -6,7 +6,6 @@
* Copyright 2013 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux-vf610.h>
diff --git a/arch/arm/mach-imx/ele_ahab.c b/arch/arm/mach-imx/ele_ahab.c
index d02316ed6cb1..eaeecf600423 100644
--- a/arch/arm/mach-imx/ele_ahab.c
+++ b/arch/arm/mach-imx/ele_ahab.c
@@ -3,7 +3,6 @@
* Copyright 2022 NXP
*/
-#include <common.h>
#include <command.h>
#include <errno.h>
#include <imx_container.h>
@@ -15,6 +14,7 @@
#include <console.h>
#include <cpu_func.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index 27e053ef701c..85d90686f680 100644
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -3,7 +3,6 @@
* Copyright (C) 2010-2015 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <command.h>
#include <config.h>
#include <display_options.h>
diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c
index a5866cf9f703..256db150818a 100644
--- a/arch/arm/mach-imx/i2c-mxv7.c
+++ b/arch/arm/mach-imx/i2c-mxv7.c
@@ -2,8 +2,8 @@
/*
* Copyright (C) 2012 Boundary Devices Inc.
*/
-#include <common.h>
#include <malloc.h>
+#include <time.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-imx/image-container.c b/arch/arm/mach-imx/image-container.c
index 35da0ae04258..e2388e3fef86 100644
--- a/arch/arm/mach-imx/image-container.c
+++ b/arch/arm/mach-imx/image-container.c
@@ -3,7 +3,7 @@
* Copyright 2019 NXP
*/
-#include <common.h>
+#include <config.h>
#include <errno.h>
#include <imx_container.h>
#include <log.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 1c072f6af11d..ed44df394b15 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -3,7 +3,6 @@
* Copyright 2018-2019, 2022 NXP
*/
-#include <common.h>
#include <command.h>
#include <errno.h>
#include <imx_container.h>
diff --git a/arch/arm/mach-imx/imx8/clock.c b/arch/arm/mach-imx/imx8/clock.c
index 9941b57b4be5..4e49b5bf3755 100644
--- a/arch/arm/mach-imx/imx8/clock.c
+++ b/arch/arm/mach-imx/imx8/clock.c
@@ -3,7 +3,6 @@
* Copyright 2018 NXP
*/
-#include <common.h>
#include <asm/global_data.h>
#include <linux/errno.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 6e643188f402..627baa1d83fd 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -3,7 +3,6 @@
* Copyright 2018, 2021 NXP
*/
-#include <common.h>
#include <clk.h>
#include <cpu.h>
#include <cpu_func.h>
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index c2bed3e0c1fb..6d0585f5cc67 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -3,7 +3,6 @@
* Copyright 2019 NXP
*/
-#include <common.h>
#include <log.h>
#include <firmware/imx/sci/sci.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/imx8/iomux.c b/arch/arm/mach-imx/imx8/iomux.c
index e4f7651bd1d4..3e27d75827a5 100644
--- a/arch/arm/mach-imx/imx8/iomux.c
+++ b/arch/arm/mach-imx/imx8/iomux.c
@@ -3,7 +3,6 @@
* Copyright 2018 NXP
*/
-#include <common.h>
#include <log.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-imx/imx8/misc.c b/arch/arm/mach-imx/imx8/misc.c
index 0ce3036818b6..c77104d0338f 100644
--- a/arch/arm/mach-imx/imx8/misc.c
+++ b/arch/arm/mach-imx/imx8/misc.c
@@ -1,5 +1,4 @@
// SPDX-License-Identifier: GPL-2.0+
-#include <common.h>
#include <log.h>
#include <firmware/imx/sci/sci.h>
#include <asm/mach-imx/sys_proto.h>
diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c
index 1eaa68f8d5ff..f13dfc155165 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -14,7 +14,6 @@
#include <command.h>
#include <log.h>
#include <stddef.h>
-#include <common.h>
#include <firmware/imx/sci/sci.h>
#include <asm/arch-imx8/imx8-pins.h>
#include <asm/arch-imx8/snvs_security_sc.h>
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
index 47219957b58c..de630e940c90 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
@@ -5,7 +5,6 @@
* Peng Fan <peng.fan@nxp.com>
*/
-#include <common.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
index 9db62b944e4c..7e6c37487163 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
@@ -5,7 +5,6 @@
* Peng Fan <peng.fan@nxp.com>
*/
-#include <common.h>
#include <command.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/imx8m/clock_slice.c b/arch/arm/mach-imx/imx8m/clock_slice.c
index b5ed27a923e0..7cfdc46d349e 100644
--- a/arch/arm/mach-imx/imx8m/clock_slice.c
+++ b/arch/arm/mach-imx/imx8m/clock_slice.c
@@ -5,7 +5,6 @@
* Peng Fan <peng.fan@nxp.com>
*/
-#include <common.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-imx/imx8m/psci.c b/arch/arm/mach-imx/imx8m/psci.c
index 62f0b768cfa4..f5644c642bd6 100644
--- a/arch/arm/mach-imx/imx8m/psci.c
+++ b/arch/arm/mach-imx/imx8m/psci.c
@@ -10,7 +10,6 @@
#include <asm/io.h>
#include <asm/psci.h>
#include <asm/secure.h>
-#include <common.h>
#include <cpu_func.h>
#include <debug_uart.h>
#include <fsl_wdog.h>
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 0c49fb9cd488..be38ca528850 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -5,7 +5,7 @@
* Peng Fan <peng.fan@nxp.com>
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <event.h>
#include <init.h>
diff --git a/arch/arm/mach-imx/imx8ulp/cgc.c b/arch/arm/mach-imx/imx8ulp/cgc.c
index d2fadb4877c9..f9d8ed5b048b 100644
--- a/arch/arm/mach-imx/imx8ulp/cgc.c
+++ b/arch/arm/mach-imx/imx8ulp/cgc.c
@@ -3,7 +3,6 @@
* Copyright 2021 NXP
*/
-#include <common.h>
#include <div64.h>
#include <asm/io.h>
#include <errno.h>
diff --git a/arch/arm/mach-imx/imx8ulp/clock.c b/arch/arm/mach-imx/imx8ulp/clock.c
index 36d12943a059..fadf165ece27 100644
--- a/arch/arm/mach-imx/imx8ulp/clock.c
+++ b/arch/arm/mach-imx/imx8ulp/clock.c
@@ -3,7 +3,6 @@
* Copyright 2020 NXP
*/
-#include <common.h>
#include <command.h>
#include <div64.h>
#include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/imx8ulp/iomux.c b/arch/arm/mach-imx/imx8ulp/iomux.c
index c6d20f546809..43f856bf7324 100644
--- a/arch/arm/mach-imx/imx8ulp/iomux.c
+++ b/arch/arm/mach-imx/imx8ulp/iomux.c
@@ -3,7 +3,6 @@
* Copyright 2020-2021 NXP
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>
diff --git a/arch/arm/mach-imx/imx8ulp/pcc.c b/arch/arm/mach-imx/imx8ulp/pcc.c
index e3c6d6760be2..449e496521f1 100644
--- a/arch/arm/mach-imx/imx8ulp/pcc.c
+++ b/arch/arm/mach-imx/imx8ulp/pcc.c
@@ -3,7 +3,6 @@
* Copyright 2021 NXP
*/
-#include <common.h>
#include <div64.h>
#include <asm/io.h>
#include <errno.h>
diff --git a/arch/arm/mach-imx/imx8ulp/rdc.c b/arch/arm/mach-imx/imx8ulp/rdc.c
index cfc09e79cbd5..ca657748ed9a 100644
--- a/arch/arm/mach-imx/imx8ulp/rdc.c
+++ b/arch/arm/mach-imx/imx8ulp/rdc.c
@@ -3,7 +3,8 @@
* Copyright 2021 NXP
*/
-#include <common.h>
+#include <config.h>
+#include <linux/errno.h>
#include <asm/io.h>
#include <asm/types.h>
#include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/imx9/clock.c b/arch/arm/mach-imx/imx9/clock.c
index 75d92af036a1..0abf4579a1e0 100644
--- a/arch/arm/mach-imx/imx9/clock.c
+++ b/arch/arm/mach-imx/imx9/clock.c
@@ -5,7 +5,6 @@
* Peng Fan <peng.fan@nxp.com>
*/
-#include <common.h>
#include <command.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/imx9/clock_root.c b/arch/arm/mach-imx/imx9/clock_root.c
index 7d7ae865946f..47106fffefba 100644
--- a/arch/arm/mach-imx/imx9/clock_root.c
+++ b/arch/arm/mach-imx/imx9/clock_root.c
@@ -5,7 +5,7 @@
* Peng Fan <peng.fan@nxp.com>
*/
-#include <common.h>
+#include <config.h>
#include <command.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/imx9/imx_bootaux.c b/arch/arm/mach-imx/imx9/imx_bootaux.c
index 6afb59e05159..73f2e72263d6 100644
--- a/arch/arm/mach-imx/imx9/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx9/imx_bootaux.c
@@ -3,11 +3,12 @@
* Copyright 2022 NXP
*/
-#include <common.h>
#include <command.h>
#include <log.h>
#include <imx_sip.h>
+#include <vsprintf.h>
#include <linux/arm-smccc.h>
+#include <linux/errno.h>
int arch_auxiliary_core_check_up(u32 core_id)
{
diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c
index 2117489f2320..32208220b207 100644
--- a/arch/arm/mach-imx/imx9/soc.c
+++ b/arch/arm/mach-imx/imx9/soc.c
@@ -5,7 +5,7 @@
* Peng Fan <peng.fan@nxp.com>
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-imx/imx9/trdc.c b/arch/arm/mach-imx/imx9/trdc.c
index d0f855bb1bc1..8cdb28459a36 100644
--- a/arch/arm/mach-imx/imx9/trdc.c
+++ b/arch/arm/mach-imx/imx9/trdc.c
@@ -3,8 +3,8 @@
* Copyright 2022 NXP
*/
-#include <common.h>
#include <log.h>
+#include <linux/errno.h>
#include <asm/io.h>
#include <asm/types.h>
#include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
index f7b14ca38d94..26374fdc33ec 100644
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -3,15 +3,18 @@
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <log.h>
+#include <asm/arch/imx-regs.h>
#include <asm/io.h>
#include <asm/mach-imx/sys_proto.h>
#include <command.h>
#include <elf.h>
#include <imx_sip.h>
+#include <vsprintf.h>
#include <linux/arm-smccc.h>
#include <linux/compiler.h>
+#include <linux/errno.h>
+#include <linux/string.h>
#include <cpu_func.h>
#ifndef CONFIG_IMX8
diff --git a/arch/arm/mach-imx/imxrt/soc.c b/arch/arm/mach-imx/imxrt/soc.c
index 34162a3976fb..3028957953bd 100644
--- a/arch/arm/mach-imx/imxrt/soc.c
+++ b/arch/arm/mach-imx/imxrt/soc.c
@@ -4,7 +4,6 @@
* Author(s): Giulio Benetti <giulio.benetti@benettiengineering.com>
*/
-#include <common.h>
#include <init.h>
#include <asm/io.h>
#include <asm/armv7_mpu.h>
diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c
index 18131a20f438..c134e95ed780 100644
--- a/arch/arm/mach-imx/iomux-v3.c
+++ b/arch/arm/mach-imx/iomux-v3.c
@@ -7,7 +7,6 @@
*
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
#include <asm/mach-imx/iomux-v3.h>
diff --git a/arch/arm/mach-imx/mac.c b/arch/arm/mach-imx/mac.c
index 9bb63d25b488..e739fd14c898 100644
--- a/arch/arm/mach-imx/mac.c
+++ b/arch/arm/mach-imx/mac.c
@@ -5,7 +5,6 @@
* Peng Fan <peng.fan@nxp.com>
*/
-#include <common.h>
#include <asm/arch/imx-regs.h>
#include <asm/io.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/misc.c b/arch/arm/mach-imx/misc.c
index 09a758ff6e89..7452b82f1105 100644
--- a/arch/arm/mach-imx/misc.c
+++ b/arch/arm/mach-imx/misc.c
@@ -3,7 +3,6 @@
* Copyright 2013 Stefan Roese <sr@denx.de>
*/
-#include <common.h>
#include <lmb.h>
#include <log.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/mmc_env.c b/arch/arm/mach-imx/mmc_env.c
index 9c822f721c60..34a7d1706f3d 100644
--- a/arch/arm/mach-imx/mmc_env.c
+++ b/arch/arm/mach-imx/mmc_env.c
@@ -3,7 +3,6 @@
* Copyright (C) 2017 NXP
*/
-#include <common.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/sys_proto.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-imx/mmdc_size.c b/arch/arm/mach-imx/mmdc_size.c
index 41a5af6bd307..2b1d203f8635 100644
--- a/arch/arm/mach-imx/mmdc_size.c
+++ b/arch/arm/mach-imx/mmdc_size.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-#include <common.h>
+#include <config.h>
#include <asm/io.h>
#if defined(CONFIG_MX53)
diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c
index bbaddd5a33fa..0b8a10fd7294 100644
--- a/arch/arm/mach-imx/mx5/clock.c
+++ b/arch/arm/mach-imx/mx5/clock.c
@@ -6,7 +6,6 @@
* (C) Copyright 2009 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <command.h>
#include <log.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx5/mx53_dram.c b/arch/arm/mach-imx/mx5/mx53_dram.c
index f74414419470..6459b4a82d25 100644
--- a/arch/arm/mach-imx/mx5/mx53_dram.c
+++ b/arch/arm/mach-imx/mx5/mx53_dram.c
@@ -4,9 +4,9 @@
* Patrick Bruenn <p.bruenn@beckhoff.com>
*/
-#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/mx5/soc.c b/arch/arm/mach-imx/mx5/soc.c
index 47f531dc856c..4df5f9c16416 100644
--- a/arch/arm/mach-imx/mx5/soc.c
+++ b/arch/arm/mach-imx/mx5/soc.c
@@ -6,7 +6,6 @@
* (C) Copyright 2009 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c
index e0da9c239584..fb9f56d2e63c 100644
--- a/arch/arm/mach-imx/mx6/clock.c
+++ b/arch/arm/mach-imx/mx6/clock.c
@@ -3,10 +3,10 @@
* Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <command.h>
#include <div64.h>
#include <log.h>
+#include <time.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c
index 3c87c577737b..5a1258e002d2 100644
--- a/arch/arm/mach-imx/mx6/ddr.c
+++ b/arch/arm/mach-imx/mx6/ddr.c
@@ -4,7 +4,6 @@
* Author: Tim Harvey <tharvey@gateworks.com>
*/
-#include <common.h>
#include <hang.h>
#include <log.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c
index 2ba3245e226c..ab5de2665778 100644
--- a/arch/arm/mach-imx/mx6/litesom.c
+++ b/arch/arm/mach-imx/mx6/litesom.c
@@ -17,7 +17,7 @@
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/boot_mode.h>
#include <asm/io.h>
-#include <common.h>
+#include <config.h>
#include <fsl_esdhc_imx.h>
#include <linux/delay.h>
#include <linux/sizes.h>
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
index b58f11c1e562..8b23d48a854c 100644
--- a/arch/arm/mach-imx/mx6/module_fuse.c
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -3,7 +3,6 @@
* Copyright 2019 NXP
*/
-#include <common.h>
#include <fdt_support.h>
#include <asm/io.h>
#include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c
index de9ace083ce8..091a37238316 100644
--- a/arch/arm/mach-imx/mx6/mp.c
+++ b/arch/arm/mach-imx/mx6/mp.c
@@ -6,7 +6,6 @@
* (C) Copyright 2009 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/io.h>
#include <linux/errno.h>
diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c
index 38ead8ace20c..340e6147b638 100644
--- a/arch/arm/mach-imx/mx6/opos6ul.c
+++ b/arch/arm/mach-imx/mx6/opos6ul.c
@@ -10,7 +10,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
#include <asm/io.h>
-#include <common.h>
+#include <config.h>
#include <env.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
index c2875e727c94..3a3e01f3d0aa 100644
--- a/arch/arm/mach-imx/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -7,7 +7,6 @@
* Copyright 2021 NXP
*/
-#include <common.h>
#include <env.h>
#include <init.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c
index 4e232385afc3..a8606fa9b24b 100644
--- a/arch/arm/mach-imx/mx7/clock.c
+++ b/arch/arm/mach-imx/mx7/clock.c
@@ -6,11 +6,12 @@
* Peng Fan <Peng.Fan@freescale.com>
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <command.h>
#include <div64.h>
#include <log.h>
+#include <time.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <linux/errno.h>
diff --git a/arch/arm/mach-imx/mx7/clock_slice.c b/arch/arm/mach-imx/mx7/clock_slice.c
index dd731d949621..2a1304fc1128 100644
--- a/arch/arm/mach-imx/mx7/clock_slice.c
+++ b/arch/arm/mach-imx/mx7/clock_slice.c
@@ -6,7 +6,6 @@
* Peng Fan <Peng.Fan@freescale.com>
*/
-#include <common.h>
#include <div64.h>
#include <asm/io.h>
#include <linux/errno.h>
diff --git a/arch/arm/mach-imx/mx7/ddr.c b/arch/arm/mach-imx/mx7/ddr.c
index cf25569765ea..c4a90be3945b 100644
--- a/arch/arm/mach-imx/mx7/ddr.c
+++ b/arch/arm/mach-imx/mx7/ddr.c
@@ -12,7 +12,6 @@
#include <asm/arch/imx-regs.h>
#include <asm/arch/crm_regs.h>
#include <asm/arch/mx7-ddr.h>
-#include <common.h>
#include <linux/delay.h>
/*
diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c
index 0b71fa403446..12d6a63b9255 100644
--- a/arch/arm/mach-imx/mx7/psci-mx7.c
+++ b/arch/arm/mach-imx/mx7/psci-mx7.c
@@ -13,7 +13,6 @@
#include <asm/armv7.h>
#include <asm/gic.h>
#include <linux/bitops.h>
-#include <common.h>
#include <fsl_wdog.h>
#define GPC_LPCR_A7_BSC 0x0
diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
index 689dbefe8ee0..16c77cbf7bee 100644
--- a/arch/arm/mach-imx/mx7/soc.c
+++ b/arch/arm/mach-imx/mx7/soc.c
@@ -4,7 +4,6 @@
* Copyright 2021 NXP
*/
-#include <common.h>
#include <init.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c
index 37d8565c20fc..fb19c62a5200 100644
--- a/arch/arm/mach-imx/mx7ulp/clock.c
+++ b/arch/arm/mach-imx/mx7ulp/clock.c
@@ -3,7 +3,7 @@
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <command.h>
#include <div64.h>
diff --git a/arch/arm/mach-imx/mx7ulp/iomux.c b/arch/arm/mach-imx/mx7ulp/iomux.c
index 05ddeed2a64b..2c87a8c18b96 100644
--- a/arch/arm/mach-imx/mx7ulp/iomux.c
+++ b/arch/arm/mach-imx/mx7ulp/iomux.c
@@ -2,7 +2,6 @@
/*
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <log.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c
index aa7ea86a443e..0bfd8f71815a 100644
--- a/arch/arm/mach-imx/mx7ulp/pcc.c
+++ b/arch/arm/mach-imx/mx7ulp/pcc.c
@@ -3,7 +3,6 @@
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <div64.h>
#include <log.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c
index 4c066557c1ca..d4fb5389cacb 100644
--- a/arch/arm/mach-imx/mx7ulp/scg.c
+++ b/arch/arm/mach-imx/mx7ulp/scg.c
@@ -3,7 +3,7 @@
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <div64.h>
#include <log.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index 217b7c45867d..198ae2d919c9 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -4,7 +4,7 @@
* Copyright 2021 NXP
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-imx/priblob.c b/arch/arm/mach-imx/priblob.c
index 5b022d5c8201..65924483bc89 100644
--- a/arch/arm/mach-imx/priblob.c
+++ b/arch/arm/mach-imx/priblob.c
@@ -11,7 +11,6 @@
*/
#include <asm/io.h>
-#include <common.h>
#include <command.h>
#include <fsl_sec.h>
diff --git a/arch/arm/mach-imx/rdc-sema.c b/arch/arm/mach-imx/rdc-sema.c
index e683673753e1..56725cc109f0 100644
--- a/arch/arm/mach-imx/rdc-sema.c
+++ b/arch/arm/mach-imx/rdc-sema.c
@@ -2,7 +2,6 @@
/*
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
#include <asm/mach-imx/rdc-sema.h>
diff --git a/arch/arm/mach-imx/speed.c b/arch/arm/mach-imx/speed.c
index 0e81cc880a1a..98a42b22f9cc 100644
--- a/arch/arm/mach-imx/speed.c
+++ b/arch/arm/mach-imx/speed.c
@@ -7,7 +7,7 @@
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index b30cd9625538..bc291dcd1296 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -6,7 +6,7 @@
* Author: Tim Harvey <tharvey@gateworks.com>
*/
-#include <common.h>
+#include <config.h>
#include <hang.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c
index b9ff9bb83b3c..9a86f5c133f7 100644
--- a/arch/arm/mach-imx/spl_imx_romapi.c
+++ b/arch/arm/mach-imx/spl_imx_romapi.c
@@ -3,7 +3,6 @@
* Copyright 2019 NXP
*/
-#include <common.h>
#include <errno.h>
#include <image.h>
#include <imx_container.h>
diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c
index 16df1186759e..922f851c56b7 100644
--- a/arch/arm/mach-imx/syscounter.c
+++ b/arch/arm/mach-imx/syscounter.c
@@ -5,7 +5,7 @@
* The file use ls102xa/timer.c as a reference.
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c
index fcd45f09f181..5ac8f28e670d 100644
--- a/arch/arm/mach-imx/timer.c
+++ b/arch/arm/mach-imx/timer.c
@@ -6,7 +6,6 @@
* (C) Copyright 2009 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <init.h>
#include <time.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-imx/video.c b/arch/arm/mach-imx/video.c
index 1bc9b7cc7e15..6cbb49da53cc 100644
--- a/arch/arm/mach-imx/video.c
+++ b/arch/arm/mach-imx/video.c
@@ -1,8 +1,9 @@
// SPDX-License-Identifier: GPL-2.0+
-#include <common.h>
+#include <stdio.h>
#include <env.h>
#include <linux/errno.h>
+#include <asm/arch/imx-regs.h>
#include <asm/mach-imx/video.h>
#ifdef CONFIG_IMX_HDMI
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 24/33] arm: histb: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (21 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 23/33] arm: imx: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 25/33] arm: highbank: " Tom Rini
` (9 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Peter Griffin, Manivannan Sadhasivam
Remove <common.h> from all mach-histb files and when needed add missing
include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Peter Griffin <peter.griffin@linaro.org>
Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
arch/arm/mach-histb/board_common.c | 1 -
arch/arm/mach-histb/sysmap-histb.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/arch/arm/mach-histb/board_common.c b/arch/arm/mach-histb/board_common.c
index a26c2066e028..84d02c9aca21 100644
--- a/arch/arm/mach-histb/board_common.c
+++ b/arch/arm/mach-histb/board_common.c
@@ -5,7 +5,6 @@
* (C) Copyright 2023 Yang Xiwen <forbidden405@outlook.com>
*/
-#include <common.h>
#include <fdtdec.h>
#include <init.h>
#include <asm/system.h>
diff --git a/arch/arm/mach-histb/sysmap-histb.c b/arch/arm/mach-histb/sysmap-histb.c
index 83a2bb941799..76414558379f 100644
--- a/arch/arm/mach-histb/sysmap-histb.c
+++ b/arch/arm/mach-histb/sysmap-histb.c
@@ -5,7 +5,6 @@
* (C) Copyright 2023 Yang Xiwen <forbidden405@outlook.com>
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
static struct mm_region histb_mem_map[] = {
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 25/33] arm: highbank: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (22 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 24/33] arm: histb: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 26/33] arm: exynos: " Tom Rini
` (8 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot
Remove <common.h> from all mach-highbank files and when needed add
missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-highbank/timer.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-highbank/timer.c b/arch/arm/mach-highbank/timer.c
index 2423a0e37855..32ec6f0ac0e2 100644
--- a/arch/arm/mach-highbank/timer.c
+++ b/arch/arm/mach-highbank/timer.c
@@ -5,7 +5,6 @@
* Based on arm926ejs/mx27/timer.c
*/
-#include <common.h>
#include <init.h>
#include <asm/io.h>
#include <asm/arch-armv7/systimer.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 26/33] arm: exynos: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (23 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 25/33] arm: highbank: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 27/33] arm: davinci: " Tom Rini
` (7 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Minkyu Kang
Remove <common.h> from all mach-exynos files and when needed add missing
include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
arch/arm/mach-exynos/clock.c | 3 ++-
arch/arm/mach-exynos/clock_init_exynos4.c | 1 -
arch/arm/mach-exynos/clock_init_exynos5.c | 1 -
arch/arm/mach-exynos/common_setup.h | 2 ++
arch/arm/mach-exynos/dmc_common.c | 2 +-
arch/arm/mach-exynos/dmc_init_ddr3.c | 1 -
arch/arm/mach-exynos/exynos5_setup.h | 1 +
arch/arm/mach-exynos/include/mach/power.h | 2 ++
arch/arm/mach-exynos/lowlevel_init.c | 1 -
arch/arm/mach-exynos/mmu-arm64.c | 1 -
arch/arm/mach-exynos/pinmux.c | 1 -
arch/arm/mach-exynos/power.c | 2 +-
arch/arm/mach-exynos/soc.c | 1 -
arch/arm/mach-exynos/spl_boot.c | 1 -
arch/arm/mach-exynos/system.c | 2 +-
arch/arm/mach-exynos/tzpc.c | 2 +-
16 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index f91f2ee862de..ee71b95237df 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -4,9 +4,10 @@
* Minkyu Kang <mk7.kang@samsung.com>
*/
-#include <common.h>
#include <clock_legacy.h>
#include <log.h>
+#include <time.h>
+#include <mach/cpu.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/clk.h>
diff --git a/arch/arm/mach-exynos/clock_init_exynos4.c b/arch/arm/mach-exynos/clock_init_exynos4.c
index 584e4bac09fc..95ed1956a077 100644
--- a/arch/arm/mach-exynos/clock_init_exynos4.c
+++ b/arch/arm/mach-exynos/clock_init_exynos4.c
@@ -23,7 +23,6 @@
* MA 02111-1307 USA
*/
-#include <common.h>
#include <config.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-exynos/clock_init_exynos5.c b/arch/arm/mach-exynos/clock_init_exynos5.c
index 1cb8d391e7c9..232a2482dc65 100644
--- a/arch/arm/mach-exynos/clock_init_exynos5.c
+++ b/arch/arm/mach-exynos/clock_init_exynos5.c
@@ -5,7 +5,6 @@
* Copyright (C) 2012 Samsung Electronics
*/
-#include <common.h>
#include <config.h>
#include <asm/io.h>
#include <asm/arch/clk.h>
diff --git a/arch/arm/mach-exynos/common_setup.h b/arch/arm/mach-exynos/common_setup.h
index d7f02231fdfa..4f56160ee50a 100644
--- a/arch/arm/mach-exynos/common_setup.h
+++ b/arch/arm/mach-exynos/common_setup.h
@@ -23,6 +23,8 @@
* MA 02111-1307 USA
*/
+#include <linux/types.h>
+#include <mach/cpu.h>
#include <asm/arch/system.h>
#define DMC_OFFSET 0x10000
diff --git a/arch/arm/mach-exynos/dmc_common.c b/arch/arm/mach-exynos/dmc_common.c
index 44923dd5520f..a96ded443b9a 100644
--- a/arch/arm/mach-exynos/dmc_common.c
+++ b/arch/arm/mach-exynos/dmc_common.c
@@ -5,7 +5,7 @@
* Copyright (C) 2012 Samsung Electronics
*/
-#include <common.h>
+#include <linux/types.h>
#include <asm/arch/spl.h>
#include "clock_init.h"
diff --git a/arch/arm/mach-exynos/dmc_init_ddr3.c b/arch/arm/mach-exynos/dmc_init_ddr3.c
index cad8ccc5315f..193de4c3a595 100644
--- a/arch/arm/mach-exynos/dmc_init_ddr3.c
+++ b/arch/arm/mach-exynos/dmc_init_ddr3.c
@@ -5,7 +5,6 @@
* Copyright (C) 2012 Samsung Electronics
*/
-#include <common.h>
#include <config.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-exynos/exynos5_setup.h b/arch/arm/mach-exynos/exynos5_setup.h
index e9874a8c1b24..4e508edba0c6 100644
--- a/arch/arm/mach-exynos/exynos5_setup.h
+++ b/arch/arm/mach-exynos/exynos5_setup.h
@@ -8,6 +8,7 @@
#ifndef _SMDK5250_SETUP_H
#define _SMDK5250_SETUP_H
+#include <linux/types.h>
#include <asm/arch/dmc.h>
#define NOT_AVAILABLE 0
diff --git a/arch/arm/mach-exynos/include/mach/power.h b/arch/arm/mach-exynos/include/mach/power.h
index a3d8974dcb5b..757e1586bde4 100644
--- a/arch/arm/mach-exynos/include/mach/power.h
+++ b/arch/arm/mach-exynos/include/mach/power.h
@@ -8,6 +8,8 @@
#define __ASM_ARM_ARCH_POWER_H_
#ifndef __ASSEMBLY__
+#include <linux/types.h>
+
struct exynos4_power {
unsigned int om_stat;
unsigned char res1[0x8];
diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index c57b8aee7989..0967ab995a93 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -23,7 +23,6 @@
* MA 02111-1307 USA
*/
-#include <common.h>
#include <config.h>
#include <debug_uart.h>
#include <asm/system.h>
diff --git a/arch/arm/mach-exynos/mmu-arm64.c b/arch/arm/mach-exynos/mmu-arm64.c
index 30e522804fbf..e2f32547adfc 100644
--- a/arch/arm/mach-exynos/mmu-arm64.c
+++ b/arch/arm/mach-exynos/mmu-arm64.c
@@ -4,7 +4,6 @@
* Thomas Abraham <thomas.ab@samsung.com>
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
#include <linux/sizes.h>
diff --git a/arch/arm/mach-exynos/pinmux.c b/arch/arm/mach-exynos/pinmux.c
index ad3fbf2da7a8..4061dd4aafae 100644
--- a/arch/arm/mach-exynos/pinmux.c
+++ b/arch/arm/mach-exynos/pinmux.c
@@ -4,7 +4,6 @@
* Abhilash Kesavan <a.kesavan@samsung.com>
*/
-#include <common.h>
#include <fdtdec.h>
#include <log.h>
#include <asm/gpio.h>
diff --git a/arch/arm/mach-exynos/power.c b/arch/arm/mach-exynos/power.c
index f2a6c00dd629..599d3ccff603 100644
--- a/arch/arm/mach-exynos/power.c
+++ b/arch/arm/mach-exynos/power.c
@@ -4,7 +4,7 @@
* Donghwa Lee <dh09.lee@samsung.com>
*/
-#include <common.h>
+#include <mach/cpu.h>
#include <asm/io.h>
#include <asm/arch/power.h>
diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c
index aff2b5e1b6e8..be18f181a7aa 100644
--- a/arch/arm/mach-exynos/soc.c
+++ b/arch/arm/mach-exynos/soc.c
@@ -4,7 +4,6 @@
* Minkyu Kang <mk7.kang@samsung.com>
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/cache.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index 553dac75b61d..bd5a06447b9c 100644
--- a/arch/arm/mach-exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
@@ -3,7 +3,6 @@
* Copyright (C) 2012 Samsung Electronics
*/
-#include <common.h>
#include <config.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-exynos/system.c b/arch/arm/mach-exynos/system.c
index 12d0d8fd34a6..f5090613c0d8 100644
--- a/arch/arm/mach-exynos/system.c
+++ b/arch/arm/mach-exynos/system.c
@@ -4,7 +4,7 @@
* Donghwa Lee <dh09.lee@samsung.com>
*/
-#include <common.h>
+#include <config.h>
#include <asm/io.h>
#include <asm/arch/system.h>
diff --git a/arch/arm/mach-exynos/tzpc.c b/arch/arm/mach-exynos/tzpc.c
index abe8e7f45898..320a0cf35136 100644
--- a/arch/arm/mach-exynos/tzpc.c
+++ b/arch/arm/mach-exynos/tzpc.c
@@ -5,7 +5,7 @@
* Copyright (C) 2012 Samsung Electronics
*/
-#include <common.h>
+#include <mach/cpu.h>
#include <asm/arch/tzpc.h>
#include <asm/io.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 27/33] arm: davinci: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (24 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 26/33] arm: exynos: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 28/33] arm: bcm: " Tom Rini
` (6 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot
Remove <common.h> from all mach-davinci files and when needed add
missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/include/asm/ti-common/davinci_nand.h | 1 +
arch/arm/mach-davinci/cpu.c | 3 ++-
arch/arm/mach-davinci/da850_lowlevel.c | 2 +-
arch/arm/mach-davinci/da850_pinmux.c | 1 -
arch/arm/mach-davinci/include/mach/davinci_misc.h | 1 +
arch/arm/mach-davinci/misc.c | 3 ++-
arch/arm/mach-davinci/pinmux.c | 1 -
arch/arm/mach-davinci/psc.c | 1 -
arch/arm/mach-davinci/reset.c | 1 -
arch/arm/mach-davinci/spl.c | 1 -
arch/arm/mach-davinci/timer.c | 2 +-
11 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/arch/arm/include/asm/ti-common/davinci_nand.h b/arch/arm/include/asm/ti-common/davinci_nand.h
index 38a1a6ea0d7b..84fe01e3b712 100644
--- a/arch/arm/include/asm/ti-common/davinci_nand.h
+++ b/arch/arm/include/asm/ti-common/davinci_nand.h
@@ -9,6 +9,7 @@
#ifndef _DAVINCI_NAND_H_
#define _DAVINCI_NAND_H_
+#include <config.h>
#include <asm/arch/hardware.h>
#define NAND_READ_START 0x00
diff --git a/arch/arm/mach-davinci/cpu.c b/arch/arm/mach-davinci/cpu.c
index dae60262f5b7..033411235391 100644
--- a/arch/arm/mach-davinci/cpu.c
+++ b/arch/arm/mach-davinci/cpu.c
@@ -4,11 +4,12 @@
* Copyright (C) 2009 David Brownell
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <init.h>
#include <asm/arch/hardware.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c
index 08c8f5925243..936b5e116679 100644
--- a/arch/arm/mach-davinci/da850_lowlevel.c
+++ b/arch/arm/mach-davinci/da850_lowlevel.c
@@ -5,7 +5,7 @@
* Copyright (C) 2011
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <nand.h>
#include <ns16550.h>
diff --git a/arch/arm/mach-davinci/da850_pinmux.c b/arch/arm/mach-davinci/da850_pinmux.c
index f2536c8dd6d6..4ee3cd0d5b34 100644
--- a/arch/arm/mach-davinci/da850_pinmux.c
+++ b/arch/arm/mach-davinci/da850_pinmux.c
@@ -5,7 +5,6 @@
* Copyright (C) 2011 OMICRON electronics GmbH
*/
-#include <common.h>
#include <asm/arch/davinci_misc.h>
#include <asm/arch/hardware.h>
#include <asm/arch/pinmux_defs.h>
diff --git a/arch/arm/mach-davinci/include/mach/davinci_misc.h b/arch/arm/mach-davinci/include/mach/davinci_misc.h
index 1133a23bdee3..0d0ad1e593e1 100644
--- a/arch/arm/mach-davinci/include/mach/davinci_misc.h
+++ b/arch/arm/mach-davinci/include/mach/davinci_misc.h
@@ -6,6 +6,7 @@
#ifndef __MISC_H
#define __MISC_H
+#include <linux/types.h>
#include <asm/arch/hardware.h>
/* pin muxer definitions */
diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index cfad28c43d0a..93a144757a9e 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -8,7 +8,7 @@
* Copyright (C) 2004 Texas Instruments.
*/
-#include <common.h>
+#include <config.h>
#include <env.h>
#include <i2c.h>
#include <init.h>
@@ -16,6 +16,7 @@
#include <net.h>
#include <asm/arch/hardware.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
#include <asm/arch/davinci_misc.h>
diff --git a/arch/arm/mach-davinci/pinmux.c b/arch/arm/mach-davinci/pinmux.c
index 7904257b4a42..5ecb434b03b6 100644
--- a/arch/arm/mach-davinci/pinmux.c
+++ b/arch/arm/mach-davinci/pinmux.c
@@ -8,7 +8,6 @@
* Copyright (C) 2004 Texas Instruments.
*/
-#include <common.h>
#include <asm/arch/hardware.h>
#include <asm/io.h>
#include <asm/arch/davinci_misc.h>
diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c
index dae10aa03bbb..90b817860a62 100644
--- a/arch/arm/mach-davinci/psc.c
+++ b/arch/arm/mach-davinci/psc.c
@@ -7,7 +7,6 @@
* Copyright (C) 2004 Texas Instruments.
*/
-#include <common.h>
#include <asm/arch/hardware.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-davinci/reset.c b/arch/arm/mach-davinci/reset.c
index 0d59eb6e3cef..e3e2c56a6760 100644
--- a/arch/arm/mach-davinci/reset.c
+++ b/arch/arm/mach-davinci/reset.c
@@ -6,7 +6,6 @@
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/io.h>
#include <asm/arch/timer_defs.h>
diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c
index 5f5b9ebbf97a..4603c8fbc575 100644
--- a/arch/arm/mach-davinci/spl.c
+++ b/arch/arm/mach-davinci/spl.c
@@ -3,7 +3,6 @@
* Copyright (C) 2011
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
*/
-#include <common.h>
#include <config.h>
#include <hang.h>
#include <init.h>
diff --git a/arch/arm/mach-davinci/timer.c b/arch/arm/mach-davinci/timer.c
index 83c190b620e7..f2990f718773 100644
--- a/arch/arm/mach-davinci/timer.c
+++ b/arch/arm/mach-davinci/timer.c
@@ -20,7 +20,7 @@
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 28/33] arm: bcm: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (25 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 27/33] arm: davinci: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 29/33] arm: at91: " Tom Rini
` (5 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot
Remove <common.h> from all mach-bcmbca, mach-bcm283x and bcm* CPU
directory files and when needed add missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c | 1 -
arch/arm/cpu/armv7/bcm235xx/clk-bsc.c | 1 -
arch/arm/cpu/armv7/bcm235xx/clk-core.c | 1 -
arch/arm/cpu/armv7/bcm235xx/clk-eth.c | 1 -
arch/arm/cpu/armv7/bcm235xx/clk-sdio.c | 1 -
arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c | 1 -
arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c | 1 -
arch/arm/cpu/armv7/bcm281xx/clk-bsc.c | 1 -
arch/arm/cpu/armv7/bcm281xx/clk-core.c | 1 -
arch/arm/cpu/armv7/bcm281xx/clk-eth.c | 1 -
arch/arm/cpu/armv7/bcm281xx/clk-sdio.c | 1 -
arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c | 1 -
arch/arm/cpu/armv7/bcm281xx/reset.c | 1 -
arch/arm/cpu/armv7/bcmcygnus/reset.c | 1 -
arch/arm/cpu/armv7/bcmnsp/reset.c | 1 -
arch/arm/mach-bcm283x/init.c | 1 -
arch/arm/mach-bcm283x/mbox.c | 2 +-
arch/arm/mach-bcm283x/msg.c | 1 -
arch/arm/mach-bcm283x/reset.c | 2 +-
arch/arm/mach-bcmbca/bcm4908/mmu_table.c | 1 -
arch/arm/mach-bcmbca/bcm4912/mmu_table.c | 1 -
arch/arm/mach-bcmbca/bcm63146/mmu_table.c | 1 -
arch/arm/mach-bcmbca/bcm63158/mmu_table.c | 1 -
arch/arm/mach-bcmbca/bcm6813/mmu_table.c | 1 -
arch/arm/mach-bcmbca/bcm6856/mmu_table.c | 1 -
arch/arm/mach-bcmbca/bcm6858/mmu_table.c | 1 -
26 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
index 39217c5b2bf1..7f73f893458b 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
@@ -9,7 +9,6 @@
*
*/
-#include <common.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
index 1b3f36aebe11..55dcc2fd78ca 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
@@ -3,7 +3,6 @@
* Copyright 2013 Broadcom Corporation.
*/
-#include <common.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
index d7edefee2318..b769c451105f 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
@@ -9,7 +9,6 @@
*
*/
-#include <common.h>
#include <log.h>
#include <asm/io.h>
#include <linux/delay.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c
index 209ceca9a06e..5f7cc4a102d0 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c
@@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/
-#include <common.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
index f2ba354c24f8..f3ff29bebe85 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
@@ -3,7 +3,6 @@
* Copyright 2013 Broadcom Corporation.
*/
-#include <common.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
index f604aec62fa6..87918059408c 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
@@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/
-#include <common.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
#include "clk-core.h"
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
index 8f6260e7857e..b258fea45c8e 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
@@ -9,7 +9,6 @@
*
*/
-#include <common.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
index 1b3f36aebe11..55dcc2fd78ca 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
@@ -3,7 +3,6 @@
* Copyright 2013 Broadcom Corporation.
*/
-#include <common.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
index 26b673a5405e..3f2e021a307c 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
@@ -9,7 +9,6 @@
*
*/
-#include <common.h>
#include <log.h>
#include <asm/io.h>
#include <linux/delay.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c
index 209ceca9a06e..5f7cc4a102d0 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c
@@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/
-#include <common.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
index f2ba354c24f8..f3ff29bebe85 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
@@ -3,7 +3,6 @@
* Copyright 2013 Broadcom Corporation.
*/
-#include <common.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
index f604aec62fa6..87918059408c 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
@@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/
-#include <common.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
#include "clk-core.h"
diff --git a/arch/arm/cpu/armv7/bcm281xx/reset.c b/arch/arm/cpu/armv7/bcm281xx/reset.c
index 1491e5c88b20..87e4337be4e0 100644
--- a/arch/arm/cpu/armv7/bcm281xx/reset.c
+++ b/arch/arm/cpu/armv7/bcm281xx/reset.c
@@ -3,7 +3,6 @@
* Copyright 2013 Broadcom Corporation.
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/io.h>
#include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcmcygnus/reset.c b/arch/arm/cpu/armv7/bcmcygnus/reset.c
index 63992fd87018..617c8d68a2a9 100644
--- a/arch/arm/cpu/armv7/bcmcygnus/reset.c
+++ b/arch/arm/cpu/armv7/bcmcygnus/reset.c
@@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/bcmnsp/reset.c b/arch/arm/cpu/armv7/bcmnsp/reset.c
index a3137752e886..c3be33124c6a 100644
--- a/arch/arm/cpu/armv7/bcmnsp/reset.c
+++ b/arch/arm/cpu/armv7/bcmnsp/reset.c
@@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index 016bc1eb4129..1b459707bc63 100644
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -6,7 +6,6 @@
* project.
*/
-#include <common.h>
#include <cpu_func.h>
#include <init.h>
#include <dm/device.h>
diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
index da9faafe1ddc..c7cbfa72ffcc 100644
--- a/arch/arm/mach-bcm283x/mbox.c
+++ b/arch/arm/mach-bcm283x/mbox.c
@@ -3,9 +3,9 @@
* (C) Copyright 2012 Stephen Warren
*/
-#include <common.h>
#include <cpu_func.h>
#include <log.h>
+#include <time.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <asm/arch/base.h>
diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c
index 2188b38d84b4..4993c0bdb819 100644
--- a/arch/arm/mach-bcm283x/msg.c
+++ b/arch/arm/mach-bcm283x/msg.c
@@ -3,7 +3,6 @@
* (C) Copyright 2012 Stephen Warren
*/
-#include <common.h>
#include <memalign.h>
#include <phys2bus.h>
#include <asm/arch/mbox.h>
diff --git a/arch/arm/mach-bcm283x/reset.c b/arch/arm/mach-bcm283x/reset.c
index f13ac0c63757..9199234917f7 100644
--- a/arch/arm/mach-bcm283x/reset.c
+++ b/arch/arm/mach-bcm283x/reset.c
@@ -6,7 +6,7 @@
* project.
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <asm/io.h>
#include <asm/arch/base.h>
diff --git a/arch/arm/mach-bcmbca/bcm4908/mmu_table.c b/arch/arm/mach-bcmbca/bcm4908/mmu_table.c
index 5ab04083cc6c..ca403bae9912 100644
--- a/arch/arm/mach-bcmbca/bcm4908/mmu_table.c
+++ b/arch/arm/mach-bcmbca/bcm4908/mmu_table.c
@@ -2,7 +2,6 @@
/*
* Copyright 2022 Broadcom Ltd.
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
#include <linux/sizes.h>
diff --git a/arch/arm/mach-bcmbca/bcm4912/mmu_table.c b/arch/arm/mach-bcmbca/bcm4912/mmu_table.c
index 52a53a2c76d0..b11effe06678 100644
--- a/arch/arm/mach-bcmbca/bcm4912/mmu_table.c
+++ b/arch/arm/mach-bcmbca/bcm4912/mmu_table.c
@@ -2,7 +2,6 @@
/*
* Copyright 2022 Broadcom Ltd.
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
#include <linux/sizes.h>
diff --git a/arch/arm/mach-bcmbca/bcm63146/mmu_table.c b/arch/arm/mach-bcmbca/bcm63146/mmu_table.c
index c6b7a54fbdfa..a883e74ac005 100644
--- a/arch/arm/mach-bcmbca/bcm63146/mmu_table.c
+++ b/arch/arm/mach-bcmbca/bcm63146/mmu_table.c
@@ -2,7 +2,6 @@
/*
* Copyright 2022 Broadcom Ltd.
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
#include <linux/sizes.h>
diff --git a/arch/arm/mach-bcmbca/bcm63158/mmu_table.c b/arch/arm/mach-bcmbca/bcm63158/mmu_table.c
index fe7efb30e22b..eb3cc3e5aec2 100644
--- a/arch/arm/mach-bcmbca/bcm63158/mmu_table.c
+++ b/arch/arm/mach-bcmbca/bcm63158/mmu_table.c
@@ -2,7 +2,6 @@
/*
* Copyright 2022 Broadcom Ltd.
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
#include <linux/sizes.h>
diff --git a/arch/arm/mach-bcmbca/bcm6813/mmu_table.c b/arch/arm/mach-bcmbca/bcm6813/mmu_table.c
index eb736bf7d508..458624e87aa9 100644
--- a/arch/arm/mach-bcmbca/bcm6813/mmu_table.c
+++ b/arch/arm/mach-bcmbca/bcm6813/mmu_table.c
@@ -2,7 +2,6 @@
/*
* Copyright 2022 Broadcom Ltd.
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
#include <linux/sizes.h>
diff --git a/arch/arm/mach-bcmbca/bcm6856/mmu_table.c b/arch/arm/mach-bcmbca/bcm6856/mmu_table.c
index 8e53b4929eb8..83c07727573a 100644
--- a/arch/arm/mach-bcmbca/bcm6856/mmu_table.c
+++ b/arch/arm/mach-bcmbca/bcm6856/mmu_table.c
@@ -2,7 +2,6 @@
/*
* Copyright 2022 Broadcom Ltd.
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
#include <linux/sizes.h>
diff --git a/arch/arm/mach-bcmbca/bcm6858/mmu_table.c b/arch/arm/mach-bcmbca/bcm6858/mmu_table.c
index 898291075f5e..82aba326dcb3 100644
--- a/arch/arm/mach-bcmbca/bcm6858/mmu_table.c
+++ b/arch/arm/mach-bcmbca/bcm6858/mmu_table.c
@@ -2,7 +2,6 @@
/*
* Copyright 2022 Broadcom Ltd.
*/
-#include <common.h>
#include <asm/armv8/mmu.h>
#include <linux/sizes.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 29/33] arm: at91: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (26 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 28/33] arm: bcm: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 30/33] arm: aspeed: " Tom Rini
` (4 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Eugen Hristev
Remove <common.h> from all mach-at91 files and when needed add missing
include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Eugen Hristev <eugen.hristev@collabora.com>
---
arch/arm/mach-at91/arm920t/at91rm9200_devices.c | 1 -
arch/arm/mach-at91/arm920t/clock.c | 2 +-
arch/arm/mach-at91/arm920t/cpu.c | 2 +-
arch/arm/mach-at91/arm920t/reset.c | 1 -
arch/arm/mach-at91/arm920t/timer.c | 2 +-
arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c | 1 -
arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c | 1 -
arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c | 1 -
arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c | 1 -
arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c | 1 -
arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c | 1 -
arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c | 1 -
arch/arm/mach-at91/arm926ejs/clock.c | 3 ++-
arch/arm/mach-at91/arm926ejs/cpu.c | 2 +-
arch/arm/mach-at91/arm926ejs/eflash.c | 1 -
arch/arm/mach-at91/arm926ejs/reset.c | 1 -
arch/arm/mach-at91/arm926ejs/sam9x60_devices.c | 1 -
arch/arm/mach-at91/arm926ejs/timer.c | 1 -
arch/arm/mach-at91/armv7/clock.c | 2 +-
arch/arm/mach-at91/armv7/cpu.c | 2 +-
arch/arm/mach-at91/armv7/sama5d2_devices.c | 1 -
arch/arm/mach-at91/armv7/sama5d3_devices.c | 1 -
arch/arm/mach-at91/armv7/sama5d4_devices.c | 1 -
arch/arm/mach-at91/armv7/timer.c | 1 -
arch/arm/mach-at91/atmel_sfr.c | 2 +-
arch/arm/mach-at91/clock.c | 2 +-
arch/arm/mach-at91/include/mach/at91_common.h | 2 ++
arch/arm/mach-at91/matrix.c | 1 -
arch/arm/mach-at91/mpddrc.c | 1 -
arch/arm/mach-at91/phy.c | 2 +-
arch/arm/mach-at91/sdram.c | 1 -
arch/arm/mach-at91/spl.c | 1 -
arch/arm/mach-at91/spl_at91.c | 2 +-
arch/arm/mach-at91/spl_atmel.c | 2 +-
34 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/arch/arm/mach-at91/arm920t/at91rm9200_devices.c b/arch/arm/mach-at91/arm920t/at91rm9200_devices.c
index c849885bc2bb..459edadb5876 100644
--- a/arch/arm/mach-at91/arm920t/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/arm920t/at91rm9200_devices.c
@@ -10,7 +10,6 @@
* Lead Tech Design <www.leadtechdesign.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/clk.h>
diff --git a/arch/arm/mach-at91/arm920t/clock.c b/arch/arm/mach-at91/arm920t/clock.c
index 09ac66d619d2..ac55a61be647 100644
--- a/arch/arm/mach-at91/arm920t/clock.c
+++ b/arch/arm/mach-at91/arm920t/clock.c
@@ -7,7 +7,7 @@
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
*/
-#include <common.h>
+#include <config.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/arm920t/cpu.c b/arch/arm/mach-at91/arm920t/cpu.c
index 9bf03fd68ecc..579e76b339d8 100644
--- a/arch/arm/mach-at91/arm920t/cpu.c
+++ b/arch/arm/mach-at91/arm920t/cpu.c
@@ -10,7 +10,7 @@
* Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/arm920t/reset.c b/arch/arm/mach-at91/arm920t/reset.c
index 91e375146ad7..7582cef417ff 100644
--- a/arch/arm/mach-at91/arm920t/reset.c
+++ b/arch/arm/mach-at91/arm920t/reset.c
@@ -13,7 +13,6 @@
* Alex Zuepke <azu@sysgo.de>
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/arm920t/timer.c b/arch/arm/mach-at91/arm920t/timer.c
index 8ef5764e3153..f7b4116344ca 100644
--- a/arch/arm/mach-at91/arm920t/timer.c
+++ b/arch/arm/mach-at91/arm920t/timer.c
@@ -13,7 +13,7 @@
* Alex Zuepke <azu@sysgo.de>
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c
index c10571fa28a0..201c99ade4ec 100644
--- a/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c
@@ -5,7 +5,6 @@
* Lead Tech Design <www.leadtechdesign.com>
*/
-#include <common.h>
#include <dm.h>
#include <asm/io.h>
#include <asm/arch/at91sam9260_matrix.h>
diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c
index 0c2b9f2ecc9b..b8d209cbec84 100644
--- a/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c
@@ -5,7 +5,6 @@
* Lead Tech Design <www.leadtechdesign.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/clk.h>
diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c
index 3b8a4623866c..1749662dae9c 100644
--- a/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c
@@ -9,7 +9,6 @@
* esd electronic system design gmbh <www.esd.eu>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/clk.h>
diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c
index d517810c991a..4c481484c3d2 100644
--- a/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c
+++ b/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c
@@ -5,7 +5,6 @@
* Lead Tech Design <www.leadtechdesign.com>
*/
-#include <common.h>
#include <dm.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/clk.h>
diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c
index 9f98ce7a45ca..4dc6e51aba83 100644
--- a/arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c
+++ b/arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c
@@ -4,7 +4,6 @@
* Josh Wu <josh.wu@atmel.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/at91_pio.h>
diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c
index b4002eb75046..4f5bafb8c2e8 100644
--- a/arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c
@@ -5,7 +5,6 @@
* Lead Tech Design <www.leadtechdesign.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/clk.h>
diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c
index f44760bed31b..40c8a58b5635 100644
--- a/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c
+++ b/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c
@@ -3,7 +3,6 @@
* Copyright (C) 2012 Atmel Corporation
*/
-#include <common.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/clk.h>
#include <asm/arch/gpio.h>
diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c
index 013daf43b742..241de6a53788 100644
--- a/arch/arm/mach-at91/arm926ejs/clock.c
+++ b/arch/arm/mach-at91/arm926ejs/clock.c
@@ -7,7 +7,8 @@
* Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
*/
-#include <common.h>
+#include <config.h>
+#include <time.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/arm926ejs/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c
index 5e84b0a40e13..e476cd5bcf3d 100644
--- a/arch/arm/mach-at91/arm926ejs/cpu.c
+++ b/arch/arm/mach-at91/arm926ejs/cpu.c
@@ -6,7 +6,7 @@
* Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <vsprintf.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c
index aade13cc014b..bb66700566e5 100644
--- a/arch/arm/mach-at91/arm926ejs/eflash.c
+++ b/arch/arm/mach-at91/arm926ejs/eflash.c
@@ -42,7 +42,6 @@
* someone puts a jffs2 into them)
* do a read-modify-write for partially programmed pages
*/
-#include <common.h>
#include <display_options.h>
#include <flash.h>
#include <log.h>
diff --git a/arch/arm/mach-at91/arm926ejs/reset.c b/arch/arm/mach-at91/arm926ejs/reset.c
index 6acbfa33011d..01b2663f96c9 100644
--- a/arch/arm/mach-at91/arm926ejs/reset.c
+++ b/arch/arm/mach-at91/arm926ejs/reset.c
@@ -5,7 +5,6 @@
* Lead Tech Design <www.leadtechdesign.com>
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/arm926ejs/sam9x60_devices.c b/arch/arm/mach-at91/arm926ejs/sam9x60_devices.c
index e3d3dd880cad..97c572deaaf0 100644
--- a/arch/arm/mach-at91/arm926ejs/sam9x60_devices.c
+++ b/arch/arm/mach-at91/arm926ejs/sam9x60_devices.c
@@ -3,7 +3,6 @@
* Copyright (C) 2018 Microchip Technology Inc. and its subsidiaries
*/
-#include <common.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/clk.h>
#include <asm/arch/gpio.h>
diff --git a/arch/arm/mach-at91/arm926ejs/timer.c b/arch/arm/mach-at91/arm926ejs/timer.c
index a8cf0e4bd799..137a5e5b8fd0 100644
--- a/arch/arm/mach-at91/arm926ejs/timer.c
+++ b/arch/arm/mach-at91/arm926ejs/timer.c
@@ -5,7 +5,6 @@
* Lead Tech Design <www.leadtechdesign.com>
*/
-#include <common.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
diff --git a/arch/arm/mach-at91/armv7/clock.c b/arch/arm/mach-at91/armv7/clock.c
index 6bfa02d1d0a3..5357b4cffc2c 100644
--- a/arch/arm/mach-at91/armv7/clock.c
+++ b/arch/arm/mach-at91/armv7/clock.c
@@ -9,7 +9,7 @@
* Copyright (C) 2015 Wenyou Yang <wenyou.yang@atmel.com>
*/
-#include <common.h>
+#include <config.h>
#include <asm/global_data.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
index 5ea7e2609f59..f4b2f4f351cb 100644
--- a/arch/arm/mach-at91/armv7/cpu.c
+++ b/arch/arm/mach-at91/armv7/cpu.c
@@ -8,7 +8,7 @@
* Bo Shen <voice.shen@atmel.com>
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <init.h>
#include <vsprintf.h>
diff --git a/arch/arm/mach-at91/armv7/sama5d2_devices.c b/arch/arm/mach-at91/armv7/sama5d2_devices.c
index edc20574c31b..469c22117665 100644
--- a/arch/arm/mach-at91/armv7/sama5d2_devices.c
+++ b/arch/arm/mach-at91/armv7/sama5d2_devices.c
@@ -4,7 +4,6 @@
* Wenyou Yang <wenyou.yang@atmel.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/clk.h>
#include <asm/arch/sama5d2.h>
diff --git a/arch/arm/mach-at91/armv7/sama5d3_devices.c b/arch/arm/mach-at91/armv7/sama5d3_devices.c
index 04b700a94d73..67b63208edaa 100644
--- a/arch/arm/mach-at91/armv7/sama5d3_devices.c
+++ b/arch/arm/mach-at91/armv7/sama5d3_devices.c
@@ -4,7 +4,6 @@
* Bo Shen <voice.shen@atmel.com>
*/
-#include <common.h>
#include <asm/arch/sama5d3.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/clk.h>
diff --git a/arch/arm/mach-at91/armv7/sama5d4_devices.c b/arch/arm/mach-at91/armv7/sama5d4_devices.c
index e68ae9940788..76fff9cd466c 100644
--- a/arch/arm/mach-at91/armv7/sama5d4_devices.c
+++ b/arch/arm/mach-at91/armv7/sama5d4_devices.c
@@ -4,7 +4,6 @@
* Bo Shen <voice.shen@atmel.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/clk.h>
diff --git a/arch/arm/mach-at91/armv7/timer.c b/arch/arm/mach-at91/armv7/timer.c
index 1f54c5dcad98..bfdb75ce39a9 100644
--- a/arch/arm/mach-at91/armv7/timer.c
+++ b/arch/arm/mach-at91/armv7/timer.c
@@ -8,7 +8,6 @@
* Bo Shen <voice.shen@atmel.com>
*/
-#include <common.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
diff --git a/arch/arm/mach-at91/atmel_sfr.c b/arch/arm/mach-at91/atmel_sfr.c
index 62108d2bd0a5..019ef930022f 100644
--- a/arch/arm/mach-at91/atmel_sfr.c
+++ b/arch/arm/mach-at91/atmel_sfr.c
@@ -4,7 +4,7 @@
* Wenyou Yang <wenyou.yang@atmel.com>
*/
-#include <common.h>
+#include <config.h>
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/arch/at91_sfr.h>
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index 8344daeb39a2..442b822fe77f 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -4,8 +4,8 @@
* Wenyou Yang <wenyou.yang@atmel.com>
*/
-#include <common.h>
#include <dm.h>
+#include <time.h>
#include <wdt.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h
index f7b411cf7dfa..683e539b1b3c 100644
--- a/arch/arm/mach-at91/include/mach/at91_common.h
+++ b/arch/arm/mach-at91/include/mach/at91_common.h
@@ -8,6 +8,8 @@
#ifndef AT91_COMMON_H
#define AT91_COMMON_H
+#include <linux/types.h>
+
void at91_can_hw_init(void);
void at91_gmac_hw_init(void);
void at91_macb_hw_init(void);
diff --git a/arch/arm/mach-at91/matrix.c b/arch/arm/mach-at91/matrix.c
index 2fa8493a0bd6..3bef5648d4a1 100644
--- a/arch/arm/mach-at91/matrix.c
+++ b/arch/arm/mach-at91/matrix.c
@@ -4,7 +4,6 @@
* Wenyou Yang <wenyou.yang@atmel.com>
*/
-#include <common.h>
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/arch/sama5_matrix.h>
diff --git a/arch/arm/mach-at91/mpddrc.c b/arch/arm/mach-at91/mpddrc.c
index 5422c05456e0..ac6a719d9c08 100644
--- a/arch/arm/mach-at91/mpddrc.c
+++ b/arch/arm/mach-at91/mpddrc.c
@@ -7,7 +7,6 @@
* Wenyou Yang <wenyou.yang@atmel.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/atmel_mpddrc.h>
#include <asm/arch/at91_common.h>
diff --git a/arch/arm/mach-at91/phy.c b/arch/arm/mach-at91/phy.c
index f4484a77c7de..ec38f5bc9315 100644
--- a/arch/arm/mach-at91/phy.c
+++ b/arch/arm/mach-at91/phy.c
@@ -11,7 +11,7 @@
* Copyright (C) 2013 DENX Software Engineering, hs@denx.de
*/
-#include <common.h>
+#include <time.h>
#include <asm/hardware.h>
#include <asm/io.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-at91/sdram.c b/arch/arm/mach-at91/sdram.c
index 6638aa82bb64..be3e91c7dbad 100644
--- a/arch/arm/mach-at91/sdram.c
+++ b/arch/arm/mach-at91/sdram.c
@@ -9,7 +9,6 @@
* Lead Tech Design <www.leadtechdesign.com>
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/at91_common.h>
#include <asm/arch/at91sam9_sdramc.h>
diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c
index 8d537998c984..5feb8f735511 100644
--- a/arch/arm/mach-at91/spl.c
+++ b/arch/arm/mach-at91/spl.c
@@ -4,7 +4,6 @@
* Bo Shen <voice.shen@atmel.com>
*/
-#include <common.h>
#include <hang.h>
#include <asm/io.h>
#include <asm/arch/at91_common.h>
diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c
index dfba9f730c12..cde1700a2839 100644
--- a/arch/arm/mach-at91/spl_at91.c
+++ b/arch/arm/mach-at91/spl_at91.c
@@ -8,7 +8,7 @@
* Bo Shen <voice.shen@atmel.com>
*/
-#include <common.h>
+#include <config.h>
#include <hang.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
index a30c4f6c075f..62a7df8a195f 100644
--- a/arch/arm/mach-at91/spl_atmel.c
+++ b/arch/arm/mach-at91/spl_atmel.c
@@ -4,7 +4,7 @@
* Bo Shen <voice.shen@atmel.com>
*/
-#include <common.h>
+#include <config.h>
#include <hang.h>
#include <init.h>
#include <log.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 30/33] arm: aspeed: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (27 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 29/33] arm: at91: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-05-01 9:38 ` ChiaWei Wang
2024-04-30 13:35 ` [PATCH 31/33] arm: apple: " Tom Rini
` (3 subsequent siblings)
32 siblings, 1 reply; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Ryan Chen, Chia-Wei Wang, Aspeed BMC SW team, Joel Stanley
Remove <common.h> from all mach-aspeed files and when needed add missing
include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Ryan Chen <ryan_chen@aspeedtech.com>
Cc: Chia-Wei Wang <chiawei_wang@aspeedtech.com>
Cc: Aspeed BMC SW team <BMC-SW@aspeedtech.com>
Cc: Joel Stanley <joel@jms.id.au>
---
arch/arm/mach-aspeed/ast2500/board_common.c | 2 +-
arch/arm/mach-aspeed/ast2500/clk_ast2500.c | 1 -
arch/arm/mach-aspeed/ast2600/board_common.c | 2 +-
arch/arm/mach-aspeed/ast2600/spl.c | 1 -
arch/arm/mach-aspeed/ast_wdt.c | 1 -
5 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-aspeed/ast2500/board_common.c b/arch/arm/mach-aspeed/ast2500/board_common.c
index bae10271844a..531c2ad1562c 100644
--- a/arch/arm/mach-aspeed/ast2500/board_common.c
+++ b/arch/arm/mach-aspeed/ast2500/board_common.c
@@ -2,7 +2,7 @@
/*
* Copyright (c) 2016 Google, Inc
*/
-#include <common.h>
+#include <config.h>
#include <dm.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/mach-aspeed/ast2500/clk_ast2500.c b/arch/arm/mach-aspeed/ast2500/clk_ast2500.c
index 02bd3f67c96a..50d7f99b2643 100644
--- a/arch/arm/mach-aspeed/ast2500/clk_ast2500.c
+++ b/arch/arm/mach-aspeed/ast2500/clk_ast2500.c
@@ -3,7 +3,6 @@
* Copyright (C) 2016 Google, Inc
*/
-#include <common.h>
#include <dm.h>
#include <asm/io.h>
#include <asm/arch/scu_ast2500.h>
diff --git a/arch/arm/mach-aspeed/ast2600/board_common.c b/arch/arm/mach-aspeed/ast2600/board_common.c
index dc6cdc35d15c..4c0b705ea88d 100644
--- a/arch/arm/mach-aspeed/ast2600/board_common.c
+++ b/arch/arm/mach-aspeed/ast2600/board_common.c
@@ -2,7 +2,7 @@
/*
* Copyright (c) Aspeed Technology Inc.
*/
-#include <common.h>
+#include <config.h>
#include <dm.h>
#include <ram.h>
#include <timer.h>
diff --git a/arch/arm/mach-aspeed/ast2600/spl.c b/arch/arm/mach-aspeed/ast2600/spl.c
index 0952e73a4572..05390c16f3af 100644
--- a/arch/arm/mach-aspeed/ast2600/spl.c
+++ b/arch/arm/mach-aspeed/ast2600/spl.c
@@ -2,7 +2,6 @@
/*
* Copyright (c) Aspeed Technology Inc.
*/
-#include <common.h>
#include <debug_uart.h>
#include <dm.h>
#include <spl.h>
diff --git a/arch/arm/mach-aspeed/ast_wdt.c b/arch/arm/mach-aspeed/ast_wdt.c
index 5bc442ef33ce..c420940d1cb9 100644
--- a/arch/arm/mach-aspeed/ast_wdt.c
+++ b/arch/arm/mach-aspeed/ast_wdt.c
@@ -3,7 +3,6 @@
* (C) Copyright 2016 Google, Inc
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/arch/wdt.h>
#include <linux/err.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 31/33] arm: apple: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (28 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 30/33] arm: aspeed: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 13:35 ` [PATCH 32/33] arm: fsl-layerscape: " Tom Rini
` (2 subsequent siblings)
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Mark Kettenis
Remove <common.h> from all mach-apple files and when needed add missing
include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Mark Kettenis <kettenis@openbsd.org>
---
arch/arm/mach-apple/board.c | 1 -
arch/arm/mach-apple/rtkit.c | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-apple/board.c b/arch/arm/mach-apple/board.c
index 7a6151a97223..8bace3005eb5 100644
--- a/arch/arm/mach-apple/board.c
+++ b/arch/arm/mach-apple/board.c
@@ -3,7 +3,6 @@
* (C) Copyright 2021 Mark Kettenis <kettenis@openbsd.org>
*/
-#include <common.h>
#include <dm.h>
#include <dm/uclass-internal.h>
#include <efi_loader.h>
diff --git a/arch/arm/mach-apple/rtkit.c b/arch/arm/mach-apple/rtkit.c
index a550b553b663..b8f4771e5e71 100644
--- a/arch/arm/mach-apple/rtkit.c
+++ b/arch/arm/mach-apple/rtkit.c
@@ -4,13 +4,14 @@
* (C) Copyright 2021 Copyright The Asahi Linux Contributors
*/
-#include <common.h>
#include <mailbox.h>
#include <malloc.h>
#include <asm/arch/rtkit.h>
#include <linux/apple-mailbox.h>
#include <linux/bitfield.h>
+#include <linux/errno.h>
+#include <linux/types.h>
#define APPLE_RTKIT_EP_MGMT 0
#define APPLE_RTKIT_EP_CRASHLOG 1
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 32/33] arm: fsl-layerscape: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (29 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 31/33] arm: apple: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-04-30 23:51 ` Peng Fan
2024-04-30 13:35 ` [PATCH 33/33] arm: " Tom Rini
2024-05-07 14:02 ` [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
32 siblings, 1 reply; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot; +Cc: Peng Fan
Remove <common.h> from all fsl-layerscape related files and when needed
add missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Peng Fan <peng.fan@nxp.com>
---
arch/arm/cpu/armv7/ls102xa/clock.c | 2 +-
arch/arm/cpu/armv7/ls102xa/cpu.c | 1 -
arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +-
arch/arm/cpu/armv7/ls102xa/fsl_epu.c | 1 -
arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c | 2 +-
arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c | 2 +-
arch/arm/cpu/armv7/ls102xa/soc.c | 2 +-
arch/arm/cpu/armv7/ls102xa/spl.c | 1 -
arch/arm/cpu/armv7/ls102xa/timer.c | 1 -
arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c | 3 ++-
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/icid.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c | 3 ++-
arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c | 3 ++-
arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c | 3 ++-
arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c | 3 ++-
arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c | 3 ++-
arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c | 3 ++-
arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/mp.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +-
arch/arm/cpu/armv8/fsl-layerscape/spl.c | 2 +-
arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h | 2 ++
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 1 +
arch/arm/include/asm/arch-ls102xa/fsl_serdes.h | 2 ++
35 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c
index 4e1fe281201f..e885a85ce65c 100644
--- a/arch/arm/cpu/armv7/ls102xa/clock.c
+++ b/arch/arm/cpu/armv7/ls102xa/clock.c
@@ -3,7 +3,7 @@
* Copyright 2014 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <asm/global_data.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index c455969609f6..74a2dcbc116a 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -4,7 +4,6 @@
* Copyright 2021 NXP
*/
-#include <common.h>
#include <cpu_func.h>
#include <init.h>
#include <net.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index 1c3d24bcad94..34eea22eb923 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -3,7 +3,7 @@
* Copyright 2014 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <net.h>
#include <asm/global_data.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
index e31a4fb6c31b..664eae532d5f 100644
--- a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
+++ b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
@@ -3,7 +3,6 @@
* Copyright 2014 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <asm/io.h>
#include "fsl_epu.h"
diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
index f74d819ea1ea..c1eadb34523f 100644
--- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
+++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
@@ -3,7 +3,7 @@
* Copyright 2014 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch/fsl_serdes.h>
#include <asm/arch/immap_ls102xa.h>
#include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
index 8c030be8b36f..3032e266c5d4 100644
--- a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
+++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
@@ -3,7 +3,7 @@
* Copyright 2014 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <linux/kernel.h>
#include <asm/arch/fsl_serdes.h>
#include <asm/arch/immap_ls102xa.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c
index 84d4ea3a8f4a..7ff59edd452e 100644
--- a/arch/arm/cpu/armv7/ls102xa/soc.c
+++ b/arch/arm/cpu/armv7/ls102xa/soc.c
@@ -3,7 +3,7 @@
* Copyright 2015 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <log.h>
#include <asm/arch/clock.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/spl.c b/arch/arm/cpu/armv7/ls102xa/spl.c
index a19496862359..374de92d026c 100644
--- a/arch/arm/cpu/armv7/ls102xa/spl.c
+++ b/arch/arm/cpu/armv7/ls102xa/spl.c
@@ -3,7 +3,6 @@
* Copyright 2014 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <spl.h>
u32 spl_boot_device(void)
diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c
index c6126b10c355..6f32ced5aec3 100644
--- a/arch/arm/cpu/armv7/ls102xa/timer.c
+++ b/arch/arm/cpu/armv7/ls102xa/timer.c
@@ -3,7 +3,6 @@
* Copyright 2014 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 12d31184ad91..d2dbfdd08a02 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -4,7 +4,7 @@
* Copyright 2014-2015 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <cpu_func.h>
#include <env.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index 22ce6992165b..ca6be3626fbe 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@ -4,7 +4,7 @@
* Copyright 2020-2021 NXP
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <efi_loader.h>
#include <log.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
index b1bb29bcaf55..78961d8089e4 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
@@ -3,11 +3,12 @@
* Copyright 2015 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <log.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/errno.h>
+#include <linux/string.h>
#include <asm/arch/fsl_serdes.h>
#include <asm/arch/soc.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
index 4455eb1726dc..9a24d4b30313 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
@@ -4,7 +4,7 @@
* Copyright 2019 NXP.
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <cpu_func.h>
#include <asm/global_data.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
index fbd5fd7d433b..b768790437fd 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
@@ -4,7 +4,7 @@
* Copyright 2014-2015 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <env.h>
#include <log.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
index 137778dc136b..452246e0e67f 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
@@ -6,7 +6,7 @@
* Derived from arch/power/cpu/mpc85xx/speed.c
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <cpu_func.h>
#include <asm/global_data.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
index c22e73253c3c..04ffefafbf73 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
@@ -3,7 +3,7 @@
* Copyright 2018 NXP
*/
-#include <common.h>
+#include <config.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
index 8d7beca7db38..c0e5455507a4 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
@@ -3,7 +3,7 @@
* Copyright 2016 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch/fsl_serdes.h>
#include <asm/arch/immap_lsch2.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
index 86a49b152e44..d48baa63816f 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
@@ -3,9 +3,9 @@
* Copyright 2019 NXP
*/
-#include <common.h>
#include <fdt_support.h>
#include <log.h>
+#include <asm/arch/stream_id_lsch3.h>
#include <asm/arch-fsl-layerscape/immap_lsch3.h>
#include <asm/arch-fsl-layerscape/fsl_icid.h>
#include <asm/arch-fsl-layerscape/fsl_portals.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
index 80d2910f679f..1b4eab3613e5 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
@@ -3,7 +3,8 @@
* Copyright 2019 NXP
*/
-#include <common.h>
+#include <config.h>
+#include <linux/kernel.h>
#include <asm/arch/fsl_serdes.h>
struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
index e3c3fc6bfb55..ec80e42055d9 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
@@ -3,11 +3,12 @@
* Copyright 2018 NXP
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch-fsl-layerscape/immap_lsch2.h>
#include <asm/arch-fsl-layerscape/fsl_icid.h>
#include <asm/arch-fsl-layerscape/fsl_portals.h>
#include <fsl_sec.h>
+#include <asm/arch/stream_id_lsch3.h>
#ifdef CONFIG_SYS_DPAA_QBMAN
struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
index 6c5e52ebaa69..1911ca1a175b 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
@@ -3,7 +3,7 @@
* Copyright 2015 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch/fsl_serdes.h>
#include <asm/arch/immap_lsch2.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
index 333d7e2fa21a..a73dd316f8d0 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
@@ -3,10 +3,11 @@
* Copyright 2018 NXP
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch-fsl-layerscape/immap_lsch2.h>
#include <asm/arch-fsl-layerscape/fsl_icid.h>
#include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <asm/arch/stream_id_lsch3.h>
#ifdef CONFIG_SYS_DPAA_QBMAN
struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
index 9347e516bf69..26ca4ca10f3d 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
@@ -4,7 +4,7 @@
* Copyright 2019 NXP
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch/fsl_serdes.h>
#include <asm/arch/immap_lsch2.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
index 23743ae10cff..3a076ca04f6e 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
@@ -3,10 +3,11 @@
* Copyright 2019 NXP
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch-fsl-layerscape/immap_lsch3.h>
#include <asm/arch-fsl-layerscape/fsl_icid.h>
#include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <asm/arch/stream_id_lsch3.h>
struct icid_id_table icid_tbl[] = {
SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
index fe667f06c395..154b727392e1 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
@@ -3,7 +3,7 @@
* Copyright 2017-2019 NXP
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch/fsl_serdes.h>
#include <asm/arch/soc.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
index 7997422840f2..5088c8ebb7ff 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
@@ -3,7 +3,7 @@
* Copyright 2014-2015 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch/fsl_serdes.h>
struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
index e6403b795263..c320e835c996 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
@@ -3,10 +3,11 @@
* Copyright 2019 NXP
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch-fsl-layerscape/immap_lsch3.h>
#include <asm/arch-fsl-layerscape/fsl_icid.h>
#include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <asm/arch/stream_id_lsch3.h>
struct icid_id_table icid_tbl[] = {
SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
index 3a0ed1fa550c..df9329df77e1 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
@@ -3,10 +3,11 @@
* Copyright 2019 NXP
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch-fsl-layerscape/immap_lsch3.h>
#include <asm/arch-fsl-layerscape/fsl_icid.h>
#include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <asm/arch/stream_id_lsch3.h>
struct icid_id_table icid_tbl[] = {
SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
index 5941d90e036f..43f0e8c87ba9 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
@@ -3,7 +3,7 @@
* Copyright 2018, 2020 NXP
*/
-#include <common.h>
+#include <config.h>
#include <asm/arch/fsl_serdes.h>
struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index ce0c46ad0d4e..db913208b9e9 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -3,7 +3,7 @@
* Copyright 2014-2015 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <cpu_func.h>
#include <image.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 4c61d28c20f0..d85a630f8a3c 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -4,7 +4,7 @@
* Copyright 2019-2021 NXP
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <cpu_func.h>
#include <env.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 232adfa843a2..a739ff2da581 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -3,7 +3,7 @@
* Copyright 2014-2015 Freescale Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <clock_legacy.h>
#include <cpu_func.h>
#include <debug_uart.h>
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
index 9e29350ca4ba..a02bec9371c0 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
@@ -7,6 +7,8 @@
#ifndef __FSL_SERDES_H__
#define __FSL_SERDES_H__
+#include <linux/types.h>
+
#ifdef CONFIG_FSL_LSCH3
enum srds_prtcl {
/*
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
index 9794db044996..147ca2f99de6 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
@@ -6,6 +6,7 @@
#ifndef __ARCH_FSL_LSCH2_IMMAP_H__
#define __ARCH_FSL_LSCH2_IMMAP_H__
+#include <config.h>
#include <fsl_immap.h>
#ifndef __ASSEMBLY__
#include <linux/bitops.h>
diff --git a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
index 9244e0a78fd3..35e3ec7a9878 100644
--- a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
+++ b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
@@ -6,6 +6,8 @@
#ifndef __FSL_SERDES_H
#define __FSL_SERDES_H
+#include <linux/types.h>
+
enum srds_prtcl {
/*
* Nobody will check whether the device 'NONE' has been configured,
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 33/33] arm: Remove <common.h> and add needed includes
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (30 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 32/33] arm: fsl-layerscape: " Tom Rini
@ 2024-04-30 13:35 ` Tom Rini
2024-05-07 14:02 ` [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-04-30 13:35 UTC (permalink / raw)
To: u-boot
Remove <common.h> from the remainder of the files under arch/arm and
when needed add missing include files directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/cpu/arm11/cpu.c | 1 -
arch/arm/cpu/arm720t/interrupts.c | 2 +-
arch/arm/cpu/arm920t/cpu.c | 1 -
arch/arm/cpu/arm920t/start.S | 1 -
arch/arm/cpu/arm926ejs/cache.c | 1 -
arch/arm/cpu/arm926ejs/cpu.c | 1 -
arch/arm/cpu/arm926ejs/start.S | 1 -
arch/arm/cpu/arm946es/cpu.c | 1 -
arch/arm/cpu/armv7/arch_timer.c | 2 +-
arch/arm/cpu/armv7/cache_v7.c | 1 -
arch/arm/cpu/armv7/cp15.c | 1 -
arch/arm/cpu/armv7/cpu.c | 1 -
arch/arm/cpu/armv7/exception_level.c | 1 -
arch/arm/cpu/armv7/iproc-common/armpll.c | 1 -
arch/arm/cpu/armv7/iproc-common/hwinit-common.c | 1 -
arch/arm/cpu/armv7/iproc-common/timer.c | 1 -
arch/arm/cpu/armv7/mpu_v7r.c | 1 -
arch/arm/cpu/armv7/s5p4418/cpu.c | 1 -
arch/arm/cpu/armv7/syslib.c | 1 -
arch/arm/cpu/armv7/vf610/generic.c | 1 -
arch/arm/cpu/armv7/vf610/timer.c | 1 -
arch/arm/cpu/armv7/virt-dt.c | 1 -
arch/arm/cpu/armv7/virt-v7.c | 1 -
arch/arm/cpu/armv7m/cache.c | 1 -
arch/arm/cpu/armv7m/cpu.c | 1 -
arch/arm/cpu/armv7m/systick-timer.c | 2 +-
arch/arm/cpu/armv8/cache_v8.c | 1 -
arch/arm/cpu/armv8/cpu-dt.c | 1 -
arch/arm/cpu/armv8/cpu.c | 1 -
arch/arm/cpu/armv8/exception_level.c | 1 -
arch/arm/cpu/armv8/generic_timer.c | 1 -
arch/arm/cpu/armv8/hisilicon/pinmux.c | 1 -
arch/arm/cpu/armv8/sec_firmware.c | 2 +-
arch/arm/cpu/armv8/sha1_ce_glue.c | 1 -
arch/arm/cpu/armv8/sha256_ce_glue.c | 1 -
arch/arm/cpu/armv8/spin_table.c | 1 -
arch/arm/cpu/armv8/spl_data.c | 1 -
arch/arm/include/asm/esr.h | 1 +
arch/arm/lib/asm-offsets.c | 1 -
arch/arm/lib/bdinfo.c | 3 ++-
arch/arm/lib/bootm-fdt.c | 1 -
arch/arm/lib/bootm.c | 1 -
arch/arm/lib/cache-cp15.c | 2 +-
arch/arm/lib/cache-pl310.c | 1 -
arch/arm/lib/cache.c | 2 +-
arch/arm/lib/cmd_boot.c | 1 -
arch/arm/lib/eabi_compat.c | 4 +++-
arch/arm/lib/gic-v3-its.c | 1 -
arch/arm/lib/image.c | 1 -
arch/arm/lib/interrupts.c | 1 -
arch/arm/lib/interrupts_64.c | 1 -
arch/arm/lib/interrupts_m.c | 3 ++-
arch/arm/lib/psci-dt.c | 1 -
arch/arm/lib/reset.c | 1 -
arch/arm/lib/save_prev_bl_data.c | 1 -
arch/arm/lib/spl.c | 1 -
arch/arm/lib/stack.c | 1 -
arch/arm/lib/zimage.c | 1 -
58 files changed, 14 insertions(+), 57 deletions(-)
diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c
index 1e16b89d0066..01d2e1a125d6 100644
--- a/arch/arm/cpu/arm11/cpu.c
+++ b/arch/arm/cpu/arm11/cpu.c
@@ -14,7 +14,6 @@
* CPU specific code
*/
-#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c
index f0fc58deadba..e3d0216158fe 100644
--- a/arch/arm/cpu/arm720t/interrupts.c
+++ b/arch/arm/cpu/arm720t/interrupts.c
@@ -9,7 +9,7 @@
* Alex Zuepke <azu@sysgo.de>
*/
-#include <common.h>
+#include <linux/types.h>
#if defined(CONFIG_ARCH_TEGRA)
static ulong timestamp;
diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c
index 305713e78615..61e182305738 100644
--- a/arch/arm/cpu/arm920t/cpu.c
+++ b/arch/arm/cpu/arm920t/cpu.c
@@ -12,7 +12,6 @@
* CPU specific code
*/
-#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S
index cba4a1f0358f..e792e8e795ef 100644
--- a/arch/arm/cpu/arm920t/start.S
+++ b/arch/arm/cpu/arm920t/start.S
@@ -8,7 +8,6 @@
*/
#include <asm-offsets.h>
-#include <common.h>
#include <config.h>
/*
diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c
index 95963d2665f4..5b87a3af91b2 100644
--- a/arch/arm/cpu/arm926ejs/cache.c
+++ b/arch/arm/cpu/arm926ejs/cache.c
@@ -6,7 +6,6 @@
#include <cpu_func.h>
#include <asm/cache.h>
#include <linux/types.h>
-#include <common.h>
#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
void invalidate_dcache_all(void)
diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c
index 2ce413a7f866..07ab04b7b08a 100644
--- a/arch/arm/cpu/arm926ejs/cpu.c
+++ b/arch/arm/cpu/arm926ejs/cpu.c
@@ -12,7 +12,6 @@
* CPU specific code
*/
-#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S
index c882bd39eab0..5d6c9f0861e1 100644
--- a/arch/arm/cpu/arm926ejs/start.S
+++ b/arch/arm/cpu/arm926ejs/start.S
@@ -16,7 +16,6 @@
#include <asm-offsets.h>
#include <config.h>
-#include <common.h>
#include <linux/linkage.h>
/*
diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c
index 334bb5427432..efd232d34237 100644
--- a/arch/arm/cpu/arm946es/cpu.c
+++ b/arch/arm/cpu/arm946es/cpu.c
@@ -12,7 +12,6 @@
* CPU specific code
*/
-#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c
index 17bd53dae847..f25a8674dea4 100644
--- a/arch/arm/cpu/armv7/arch_timer.c
+++ b/arch/arm/cpu/armv7/arch_timer.c
@@ -4,7 +4,7 @@
* Texas Instruments Incorporated, <www.ti.com>
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
diff --git a/arch/arm/cpu/armv7/cache_v7.c b/arch/arm/cpu/armv7/cache_v7.c
index 19ff4323528b..d11420d2fdd0 100644
--- a/arch/arm/cpu/armv7/cache_v7.c
+++ b/arch/arm/cpu/armv7/cache_v7.c
@@ -7,7 +7,6 @@
#include <cpu_func.h>
#include <asm/cache.h>
#include <linux/types.h>
-#include <common.h>
#include <asm/armv7.h>
#include <asm/utils.h>
diff --git a/arch/arm/cpu/armv7/cp15.c b/arch/arm/cpu/armv7/cp15.c
index 0ac4e7ba8c80..b2c52db68dc9 100644
--- a/arch/arm/cpu/armv7/cp15.c
+++ b/arch/arm/cpu/armv7/cp15.c
@@ -7,7 +7,6 @@
* CP15 specific code
*/
-#include <common.h>
#include <command.h>
#include <asm/system.h>
#include <asm/cache.h>
diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c
index 6259ffa51086..aa981faef001 100644
--- a/arch/arm/cpu/armv7/cpu.c
+++ b/arch/arm/cpu/armv7/cpu.c
@@ -14,7 +14,6 @@
* CPU specific code
*/
-#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
diff --git a/arch/arm/cpu/armv7/exception_level.c b/arch/arm/cpu/armv7/exception_level.c
index f6d25bb682c7..7baade61b073 100644
--- a/arch/arm/cpu/armv7/exception_level.c
+++ b/arch/arm/cpu/armv7/exception_level.c
@@ -8,7 +8,6 @@
* secure mode before booting an operating system.
*/
-#include <common.h>
#include <bootm.h>
#include <cpu_func.h>
#include <log.h>
diff --git a/arch/arm/cpu/armv7/iproc-common/armpll.c b/arch/arm/cpu/armv7/iproc-common/armpll.c
index 8c3a323f0654..b345671b0a64 100644
--- a/arch/arm/cpu/armv7/iproc-common/armpll.c
+++ b/arch/arm/cpu/armv7/iproc-common/armpll.c
@@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/
-#include <common.h>
#include <asm/io.h>
#include <asm/iproc-common/armpll.h>
#include <asm/iproc-common/sysmap.h>
diff --git a/arch/arm/cpu/armv7/iproc-common/hwinit-common.c b/arch/arm/cpu/armv7/iproc-common/hwinit-common.c
index 896d2f956942..eca7e8b512b4 100644
--- a/arch/arm/cpu/armv7/iproc-common/hwinit-common.c
+++ b/arch/arm/cpu/armv7/iproc-common/hwinit-common.c
@@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/cache.h>
diff --git a/arch/arm/cpu/armv7/iproc-common/timer.c b/arch/arm/cpu/armv7/iproc-common/timer.c
index a4255a44c001..b60d90f7e6a3 100644
--- a/arch/arm/cpu/armv7/iproc-common/timer.c
+++ b/arch/arm/cpu/armv7/iproc-common/timer.c
@@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/
-#include <common.h>
#include <div64.h>
#include <init.h>
#include <time.h>
diff --git a/arch/arm/cpu/armv7/mpu_v7r.c b/arch/arm/cpu/armv7/mpu_v7r.c
index 1d31c63e5fde..2d83e4c721d2 100644
--- a/arch/arm/cpu/armv7/mpu_v7r.c
+++ b/arch/arm/cpu/armv7/mpu_v7r.c
@@ -6,7 +6,6 @@
* Lokesh Vutla <lokeshvutla@ti.com>
*/
-#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <asm/armv7.h>
diff --git a/arch/arm/cpu/armv7/s5p4418/cpu.c b/arch/arm/cpu/armv7/s5p4418/cpu.c
index 8febfe527669..27ffb450378f 100644
--- a/arch/arm/cpu/armv7/s5p4418/cpu.c
+++ b/arch/arm/cpu/armv7/s5p4418/cpu.c
@@ -4,7 +4,6 @@
* Hyunseok, Jung <hsjung@nexell.co.kr>
*/
-#include <common.h>
#include <command.h>
#include <asm/system.h>
#include <asm/cache.h>
diff --git a/arch/arm/cpu/armv7/syslib.c b/arch/arm/cpu/armv7/syslib.c
index 7e29636972d9..f0eda1ca98d0 100644
--- a/arch/arm/cpu/armv7/syslib.c
+++ b/arch/arm/cpu/armv7/syslib.c
@@ -7,7 +7,6 @@
* Syed Mohammed Khasim <khasim@ti.com>
*/
-#include <common.h>
#include <asm/io.h>
/************************************************************
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index c23ddc12b456..e61ad7b96e90 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -3,7 +3,6 @@
* Copyright 2013 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <clock_legacy.h>
#include <command.h>
#include <cpu_func.h>
diff --git a/arch/arm/cpu/armv7/vf610/timer.c b/arch/arm/cpu/armv7/vf610/timer.c
index a9c1a8fcebc1..7bae0b5574af 100644
--- a/arch/arm/cpu/armv7/vf610/timer.c
+++ b/arch/arm/cpu/armv7/vf610/timer.c
@@ -3,7 +3,6 @@
* Copyright 2013 Freescale Semiconductor, Inc.
*/
-#include <common.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c
index c0422485ba4e..5dc7ed5e2707 100644
--- a/arch/arm/cpu/armv7/virt-dt.c
+++ b/arch/arm/cpu/armv7/virt-dt.c
@@ -15,7 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <common.h>
#include <errno.h>
#include <log.h>
#include <stdio_dev.h>
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index 5ffeca13d913..811499367d40 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -8,7 +8,6 @@
* needed to enable ARMv7 virtualization for current hypervisors
*/
-#include <common.h>
#include <cpu_func.h>
#include <asm/armv7.h>
#include <asm/cache.h>
diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c
index d1aecf6a85cf..b6d08b7aad73 100644
--- a/arch/arm/cpu/armv7m/cache.c
+++ b/arch/arm/cpu/armv7m/cache.c
@@ -4,7 +4,6 @@
* Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
*/
-#include <common.h>
#include <cpu_func.h>
#include <errno.h>
#include <log.h>
diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c
index 65427b5312be..b4440d3f3f84 100644
--- a/arch/arm/cpu/armv7m/cpu.c
+++ b/arch/arm/cpu/armv7m/cpu.c
@@ -7,7 +7,6 @@
* Kamil Lulko, <kamil.lulko@gmail.com>
*/
-#include <common.h>
#include <cpu_func.h>
#include <irq_func.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/armv7m/systick-timer.c b/arch/arm/cpu/armv7m/systick-timer.c
index c30af4ff7a28..d8fa4f0c707a 100644
--- a/arch/arm/cpu/armv7m/systick-timer.c
+++ b/arch/arm/cpu/armv7m/systick-timer.c
@@ -21,7 +21,7 @@
* using CFG_SYS_HZ_CLOCK.
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 57d06f0575dc..d4c64f2d60d9 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -7,7 +7,6 @@
* Alexander Graf <agraf@suse.de>
*/
-#include <common.h>
#include <cpu_func.h>
#include <hang.h>
#include <log.h>
diff --git a/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c
index 9bfe3815e51a..97667e607a83 100644
--- a/arch/arm/cpu/armv8/cpu-dt.c
+++ b/arch/arm/cpu/armv8/cpu-dt.c
@@ -3,7 +3,6 @@
* Copyright 2016 NXP Semiconductor, Inc.
*/
-#include <common.h>
#include <asm/cache.h>
#include <asm/psci.h>
#include <asm/system.h>
diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c
index 3c7f36ad8d89..d568efa427ab 100644
--- a/arch/arm/cpu/armv8/cpu.c
+++ b/arch/arm/cpu/armv8/cpu.c
@@ -10,7 +10,6 @@
* Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
*/
-#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
diff --git a/arch/arm/cpu/armv8/exception_level.c b/arch/arm/cpu/armv8/exception_level.c
index b11936548fb3..85c78f55789d 100644
--- a/arch/arm/cpu/armv8/exception_level.c
+++ b/arch/arm/cpu/armv8/exception_level.c
@@ -8,7 +8,6 @@
* level before booting an operating system.
*/
-#include <common.h>
#include <bootm.h>
#include <cpu_func.h>
#include <log.h>
diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c
index 8f83372cbca4..e4aa5a474553 100644
--- a/arch/arm/cpu/armv8/generic_timer.c
+++ b/arch/arm/cpu/armv8/generic_timer.c
@@ -4,7 +4,6 @@
* David Feng <fenghua@phytium.com.cn>
*/
-#include <common.h>
#include <bootstage.h>
#include <command.h>
#include <time.h>
diff --git a/arch/arm/cpu/armv8/hisilicon/pinmux.c b/arch/arm/cpu/armv8/hisilicon/pinmux.c
index e14057c0a47c..d7a5a7926102 100644
--- a/arch/arm/cpu/armv8/hisilicon/pinmux.c
+++ b/arch/arm/cpu/armv8/hisilicon/pinmux.c
@@ -4,7 +4,6 @@
* Peter Griffin <peter.griffin@linaro.org>
*/
-#include <common.h>
#include <fdtdec.h>
#include <log.h>
#include <asm/gpio.h>
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index c0e8726346f5..44372cbe4a1c 100644
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -3,7 +3,7 @@
* Copyright 2016 NXP Semiconductor, Inc.
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <errno.h>
#include <fdt_support.h>
diff --git a/arch/arm/cpu/armv8/sha1_ce_glue.c b/arch/arm/cpu/armv8/sha1_ce_glue.c
index 780b119a90bf..c88b4dc66e1f 100644
--- a/arch/arm/cpu/armv8/sha1_ce_glue.c
+++ b/arch/arm/cpu/armv8/sha1_ce_glue.c
@@ -5,7 +5,6 @@
* Copyright (C) 2022 Linaro Ltd <loic.poulain@linaro.org>
*/
-#include <common.h>
#include <u-boot/sha1.h>
extern void sha1_armv8_ce_process(uint32_t state[5], uint8_t const *src,
diff --git a/arch/arm/cpu/armv8/sha256_ce_glue.c b/arch/arm/cpu/armv8/sha256_ce_glue.c
index 67dd796c122d..d5d2b4f4ac7e 100644
--- a/arch/arm/cpu/armv8/sha256_ce_glue.c
+++ b/arch/arm/cpu/armv8/sha256_ce_glue.c
@@ -5,7 +5,6 @@
* Copyright (C) 2022 Linaro Ltd <loic.poulain@linaro.org>
*/
-#include <common.h>
#include <u-boot/sha256.h>
extern void sha256_armv8_ce_process(uint32_t state[8], uint8_t const *src,
diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c
index 42a0962fdcda..485294b88d0a 100644
--- a/arch/arm/cpu/armv8/spin_table.c
+++ b/arch/arm/cpu/armv8/spin_table.c
@@ -4,7 +4,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
-#include <common.h>
#include <linux/libfdt.h>
#include <asm/spin_table.h>
diff --git a/arch/arm/cpu/armv8/spl_data.c b/arch/arm/cpu/armv8/spl_data.c
index 8f1231c86ebb..259b49ff3640 100644
--- a/arch/arm/cpu/armv8/spl_data.c
+++ b/arch/arm/cpu/armv8/spl_data.c
@@ -3,7 +3,6 @@
* Copyright 2020 NXP
*/
-#include <common.h>
#include <spl.h>
char __data_save_start[0] __section(".__data_save_start");
diff --git a/arch/arm/include/asm/esr.h b/arch/arm/include/asm/esr.h
index f19e4e726a19..99488730998e 100644
--- a/arch/arm/include/asm/esr.h
+++ b/arch/arm/include/asm/esr.h
@@ -7,6 +7,7 @@
#ifndef __ASM_ESR_H
#define __ASM_ESR_H
+#include <stdbool.h>
#include <asm/memory.h>
#include <linux/const.h>
diff --git a/arch/arm/lib/asm-offsets.c b/arch/arm/lib/asm-offsets.c
index 181a8ac4c27f..9afd83759996 100644
--- a/arch/arm/lib/asm-offsets.c
+++ b/arch/arm/lib/asm-offsets.c
@@ -16,7 +16,6 @@
* Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
*/
-#include <common.h>
#include <linux/kbuild.h>
#include <linux/arm-smccc.h>
diff --git a/arch/arm/lib/bdinfo.c b/arch/arm/lib/bdinfo.c
index b88b01eefdcd..40255ace4051 100644
--- a/arch/arm/lib/bdinfo.c
+++ b/arch/arm/lib/bdinfo.c
@@ -6,9 +6,10 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
-#include <common.h>
+#include <config.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/mach-types.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 29020bd1c6bc..2671f9a0ebf5 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -14,7 +14,6 @@
* Copyright (C) 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl)
*/
-#include <common.h>
#include <fdt_support.h>
#ifdef CONFIG_ARMV7_NONSEC
#include <asm/armv7.h>
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index f30a483ed8b4..192c120a7d2e 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -11,7 +11,6 @@
* Copyright (C) 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl)
*/
-#include <common.h>
#include <bootm.h>
#include <bootstage.h>
#include <command.h>
diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index 0893915b3004..0b2a0c351547 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
@@ -4,10 +4,10 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
-#include <common.h>
#include <cpu_func.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/system.h>
#include <asm/cache.h>
#include <linux/compiler.h>
diff --git a/arch/arm/lib/cache-pl310.c b/arch/arm/lib/cache-pl310.c
index d05314ee57fc..0afd3880447f 100644
--- a/arch/arm/lib/cache-pl310.c
+++ b/arch/arm/lib/cache-pl310.c
@@ -9,7 +9,6 @@
#include <asm/armv7.h>
#include <asm/pl310.h>
#include <config.h>
-#include <common.h>
struct pl310_regs *const pl310 = (struct pl310_regs *)CFG_SYS_PL310_BASE;
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index 7a1601586711..b2ae74a59f10 100644
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -6,7 +6,7 @@
/* for now: just dummy functions to satisfy the linker */
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <log.h>
#include <malloc.h>
diff --git a/arch/arm/lib/cmd_boot.c b/arch/arm/lib/cmd_boot.c
index c905ecc4bd94..5df5bc305a2f 100644
--- a/arch/arm/lib/cmd_boot.c
+++ b/arch/arm/lib/cmd_boot.c
@@ -17,7 +17,6 @@
* Copyright 2015 Konsulko Group, Matt Porter <mporter@konsulko.com>
*/
-#include <common.h>
#include <command.h>
/*
diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c
index f7029918d4fb..0a96ba1355f8 100644
--- a/arch/arm/lib/eabi_compat.c
+++ b/arch/arm/lib/eabi_compat.c
@@ -5,7 +5,9 @@
* (C) Copyright 2009 Wolfgang Denk <wd@denx.de>
*/
-#include <common.h>
+#include <stdio.h>
+#include <linux/stddef.h>
+#include <linux/string.h>
int raise (int signum)
{
diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c
index f4bbd21da915..2cc0a32f9d47 100644
--- a/arch/arm/lib/gic-v3-its.c
+++ b/arch/arm/lib/gic-v3-its.c
@@ -2,7 +2,6 @@
/*
* Copyright 2019 Broadcom.
*/
-#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <asm/gic.h>
diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c
index e394c1ad9093..1f672eee2c86 100644
--- a/arch/arm/lib/image.c
+++ b/arch/arm/lib/image.c
@@ -4,7 +4,6 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
-#include <common.h>
#include <image.h>
#include <mapmem.h>
#include <asm/global_data.h>
diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index 9961472f69f7..333a5026a469 100644
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -18,7 +18,6 @@
* Philippe Robin, ARM Ltd. <philippe.robin@arm.com>
*/
-#include <common.h>
#include <cpu_func.h>
#include <efi_loader.h>
#include <irq_func.h>
diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c
index 125dc0bb390b..b3024ba514ec 100644
--- a/arch/arm/lib/interrupts_64.c
+++ b/arch/arm/lib/interrupts_64.c
@@ -4,7 +4,6 @@
* David Feng <fenghua@phytium.com.cn>
*/
-#include <common.h>
#include <asm/esr.h>
#include <asm/global_data.h>
#include <asm/ptrace.h>
diff --git a/arch/arm/lib/interrupts_m.c b/arch/arm/lib/interrupts_m.c
index 277854aa878c..b977961bde8a 100644
--- a/arch/arm/lib/interrupts_m.c
+++ b/arch/arm/lib/interrupts_m.c
@@ -4,9 +4,10 @@
* Kamil Lulko, <kamil.lulko@gmail.com>
*/
-#include <common.h>
+#include <stdio.h>
#include <cpu_func.h>
#include <irq_func.h>
+#include <vsprintf.h>
/*
* Upon exception entry ARMv7-M processors automatically save stack
diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c
index 903b3357048a..be800a3bc9eb 100644
--- a/arch/arm/lib/psci-dt.c
+++ b/arch/arm/lib/psci-dt.c
@@ -3,7 +3,6 @@
* Copyright 2016 NXP Semiconductor, Inc.
*/
-#include <common.h>
#include <asm/cache.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c
index 3e051e36f12d..c9796a4435c6 100644
--- a/arch/arm/lib/reset.c
+++ b/arch/arm/lib/reset.c
@@ -20,7 +20,6 @@
* (C) Copyright 2004 Texas Insturments
*/
-#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c
index b286bac9bf00..4357acaef6c4 100644
--- a/arch/arm/lib/save_prev_bl_data.c
+++ b/arch/arm/lib/save_prev_bl_data.c
@@ -10,7 +10,6 @@
#include <fdtdec.h>
#include <fdt_support.h>
#include <fdt.h>
-#include <common.h>
#include <linux/errno.h>
#include <asm/system.h>
#include <asm/armv8/mmu.h>
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index b13897495dae..c43a63f1819e 100644
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -7,7 +7,6 @@
* Tom Rini <trini@ti.com>
*/
-#include <common.h>
#include <config.h>
#include <init.h>
#include <log.h>
diff --git a/arch/arm/lib/stack.c b/arch/arm/lib/stack.c
index 656084c7e519..ea1b937add76 100644
--- a/arch/arm/lib/stack.c
+++ b/arch/arm/lib/stack.c
@@ -10,7 +10,6 @@
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Marius Groeger <mgroeger@sysgo.de>
*/
-#include <common.h>
#include <init.h>
#include <lmb.h>
#include <asm/global_data.h>
diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c
index 45e9c4506a97..51287251b3f6 100644
--- a/arch/arm/lib/zimage.c
+++ b/arch/arm/lib/zimage.c
@@ -6,7 +6,6 @@
* bootz code:
* Copyright (C) 2012 Marek Vasut <marek.vasut@gmail.com>
*/
-#include <common.h>
#include <image.h>
#define LINUX_ARM_ZIMAGE_MAGIC 0x016f2818
--
2.34.1
^ permalink raw reply related [flat|nested] 41+ messages in thread
* Re: [PATCH 04/33] arm: u8500: Remove <common.h> and add needed includes
2024-04-30 13:35 ` [PATCH 04/33] arm: u8500: " Tom Rini
@ 2024-04-30 14:18 ` Linus Walleij
0 siblings, 0 replies; 41+ messages in thread
From: Linus Walleij @ 2024-04-30 14:18 UTC (permalink / raw)
To: Tom Rini; +Cc: u-boot, Stephan Gerhold
On Tue, Apr 30, 2024 at 3:36 PM Tom Rini <trini@konsulko.com> wrote:
> Remove <common.h> from all mach-u8500 files and when needed add missing
> include files directly.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 07/33] arm: sunxi: Remove <common.h> and add needed includes
2024-04-30 13:35 ` [PATCH 07/33] arm: sunxi: " Tom Rini
@ 2024-04-30 14:23 ` Andre Przywara
0 siblings, 0 replies; 41+ messages in thread
From: Andre Przywara @ 2024-04-30 14:23 UTC (permalink / raw)
To: Tom Rini; +Cc: u-boot, Jagan Teki
On Tue, 30 Apr 2024 07:35:33 -0600
Tom Rini <trini@konsulko.com> wrote:
Hi,
> Remove <common.h> from all mach-sunxi and board/sunxi files and when
> needed add missing include files directly.
Oh wow, many thanks, that takes one point of my TODO list!
After cherry-picking the netdev.h and phy_interface.h changes from 01/33,
I compiled all 168 sunxi boards successfully.
> Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Cheers,
Andre
> ---
> Cc: Jagan Teki <jagan@amarulasolutions.com>
> Cc: Andre Przywara <andre.przywara@arm.com>
> ---
> arch/arm/cpu/armv7/sunxi/psci.c | 1 -
> arch/arm/cpu/armv7/sunxi/sram.c | 1 -
> arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c | 1 -
> arch/arm/mach-sunxi/dram_timings/ddr3_1333.c | 1 -
> arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c | 1 -
> arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c | 1 -
> arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c | 1 -
> arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c | 1 -
> arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c | 1 -
> arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c | 1 -
> board/sunxi/board.c | 1 -
> board/sunxi/chip.c | 1 -
> board/sunxi/dram_sun4i_auto.c | 1 -
> board/sunxi/dram_sun5i_auto.c | 1 -
> board/sunxi/gmac.c | 1 -
> 15 files changed, 15 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c
> index 5cb8cfa6cf3f..4c30f3294b7a 100644
> --- a/arch/arm/cpu/armv7/sunxi/psci.c
> +++ b/arch/arm/cpu/armv7/sunxi/psci.c
> @@ -7,7 +7,6 @@
> * which was based on code by Carl van Schaik <carl@ok-labs.com>.
> */
> #include <config.h>
> -#include <common.h>
> #include <asm/cache.h>
>
> #include <asm/arch/cpu.h>
> diff --git a/arch/arm/cpu/armv7/sunxi/sram.c b/arch/arm/cpu/armv7/sunxi/sram.c
> index 28ff6a1b7c23..bc25719c9c46 100644
> --- a/arch/arm/cpu/armv7/sunxi/sram.c
> +++ b/arch/arm/cpu/armv7/sunxi/sram.c
> @@ -9,7 +9,6 @@
> * SRAM init for older sunxi SoCs.
> */
>
> -#include <common.h>
> #include <init.h>
> #include <asm/io.h>
> #include <asm/arch/cpu.h>
> diff --git a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
> index 9077f86a8b4c..3666dddca15c 100644
> --- a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
> +++ b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
> @@ -1,4 +1,3 @@
> -#include <common.h>
> #include <asm/arch/dram.h>
> #include <asm/arch/cpu.h>
>
> diff --git a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
> index 0471e8a49e58..ceaafd6ec6fa 100644
> --- a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
> +++ b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
> @@ -1,4 +1,3 @@
> -#include <common.h>
> #include <asm/arch/dram.h>
> #include <asm/arch/cpu.h>
>
> diff --git a/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c
> index 232b4fe2df7f..3faf8d5bd974 100644
> --- a/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c
> +++ b/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c
> @@ -11,7 +11,6 @@
> * SPDX-License-Identifier: GPL-2.0+
> */
>
> -#include <common.h>
> #include <asm/arch/dram.h>
> #include <asm/arch/cpu.h>
>
> diff --git a/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c b/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c
> index b6d6a6874682..ce2ffa7a020e 100644
> --- a/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c
> +++ b/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c
> @@ -11,7 +11,6 @@
> * SPDX-License-Identifier: GPL-2.0+
> */
>
> -#include <common.h>
> #include <asm/arch/dram.h>
> #include <asm/arch/cpu.h>
>
> diff --git a/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c b/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c
> index c11cb8678f64..e6446b9180da 100644
> --- a/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c
> +++ b/arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c
> @@ -9,7 +9,6 @@
> * SPDX-License-Identifier: GPL-2.0+
> */
>
> -#include <common.h>
> #include <asm/arch/dram.h>
> #include <asm/arch/cpu.h>
>
> diff --git a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
> index 2136ca3a4cb0..afe8e25c7f58 100644
> --- a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
> +++ b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
> @@ -19,7 +19,6 @@
> * SPDX-License-Identifier: GPL-2.0+
> */
>
> -#include <common.h>
> #include <asm/arch/dram.h>
> #include <asm/arch/cpu.h>
>
> diff --git a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
> index 10008601134a..c243b574406d 100644
> --- a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
> +++ b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
> @@ -6,7 +6,6 @@
> * SPDX-License-Identifier: GPL-2.0+
> */
>
> -#include <common.h>
> #include <asm/arch/dram.h>
> #include <asm/arch/cpu.h>
>
> diff --git a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
> index bd57e2f6aac2..bc47a4638533 100644
> --- a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
> +++ b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
> @@ -1,4 +1,3 @@
> -#include <common.h>
> #include <asm/arch/dram.h>
> #include <asm/arch/cpu.h>
>
> diff --git a/board/sunxi/board.c b/board/sunxi/board.c
> index 1313b01dcea5..ed86f1df5dc4 100644
> --- a/board/sunxi/board.c
> +++ b/board/sunxi/board.c
> @@ -10,7 +10,6 @@
> * Some board init for the Allwinner A10-evb board.
> */
>
> -#include <common.h>
> #include <clock_legacy.h>
> #include <dm.h>
> #include <env.h>
> diff --git a/board/sunxi/chip.c b/board/sunxi/chip.c
> index eeee6319e799..270af2506d21 100644
> --- a/board/sunxi/chip.c
> +++ b/board/sunxi/chip.c
> @@ -5,7 +5,6 @@
> * Based on initial code from Maxime Ripard
> */
>
> -#include <common.h>
> #include <malloc.h>
> #include <dm.h>
> #include <w1.h>
> diff --git a/board/sunxi/dram_sun4i_auto.c b/board/sunxi/dram_sun4i_auto.c
> index 547d1c0cb4de..4b78919a5baa 100644
> --- a/board/sunxi/dram_sun4i_auto.c
> +++ b/board/sunxi/dram_sun4i_auto.c
> @@ -1,4 +1,3 @@
> -#include <common.h>
> #include <init.h>
> #include <asm/arch/dram.h>
>
> diff --git a/board/sunxi/dram_sun5i_auto.c b/board/sunxi/dram_sun5i_auto.c
> index 517506ccc4f0..8976e3b16d68 100644
> --- a/board/sunxi/dram_sun5i_auto.c
> +++ b/board/sunxi/dram_sun5i_auto.c
> @@ -1,6 +1,5 @@
> /* DRAM parameters for auto dram configuration on sun5i and sun7i */
>
> -#include <common.h>
> #include <init.h>
> #include <asm/arch/dram.h>
>
> diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
> index 2a885305ebe0..710e821e3fc8 100644
> --- a/board/sunxi/gmac.c
> +++ b/board/sunxi/gmac.c
> @@ -1,4 +1,3 @@
> -#include <common.h>
> #include <netdev.h>
> #include <miiphy.h>
> #include <asm/io.h>
^ permalink raw reply [flat|nested] 41+ messages in thread
* RE: [PATCH 32/33] arm: fsl-layerscape: Remove <common.h> and add needed includes
2024-04-30 13:35 ` [PATCH 32/33] arm: fsl-layerscape: " Tom Rini
@ 2024-04-30 23:51 ` Peng Fan
0 siblings, 0 replies; 41+ messages in thread
From: Peng Fan @ 2024-04-30 23:51 UTC (permalink / raw)
To: Tom Rini, u-boot
> Subject: [PATCH 32/33] arm: fsl-layerscape: Remove <common.h> and add
> needed includes
>
> Remove <common.h> from all fsl-layerscape related files and when needed
> add missing include files directly.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Peng Fan <peng.fan@nxp.com>
> ---
> Cc: Peng Fan <peng.fan@nxp.com>
> ---
> arch/arm/cpu/armv7/ls102xa/clock.c | 2 +-
> arch/arm/cpu/armv7/ls102xa/cpu.c | 1 -
> arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +-
> arch/arm/cpu/armv7/ls102xa/fsl_epu.c | 1 -
> arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c | 2 +-
> arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c | 2 +-
> arch/arm/cpu/armv7/ls102xa/soc.c | 2 +-
> arch/arm/cpu/armv7/ls102xa/spl.c | 1 -
> arch/arm/cpu/armv7/ls102xa/timer.c | 1 -
> arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c | 3 ++-
> arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/icid.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c | 3 ++-
> arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c | 3 ++-
> arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c | 3 ++-
> arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c | 3 ++-
> arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c | 3 ++-
> arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c | 3 ++-
> arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/mp.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +-
> arch/arm/cpu/armv8/fsl-layerscape/spl.c | 2 +-
> arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h | 2 ++
> arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 1 +
> arch/arm/include/asm/arch-ls102xa/fsl_serdes.h | 2 ++
> 35 files changed, 40 insertions(+), 32 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c
> b/arch/arm/cpu/armv7/ls102xa/clock.c
> index 4e1fe281201f..e885a85ce65c 100644
> --- a/arch/arm/cpu/armv7/ls102xa/clock.c
> +++ b/arch/arm/cpu/armv7/ls102xa/clock.c
> @@ -3,7 +3,7 @@
> * Copyright 2014 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <asm/global_data.h>
> #include <asm/io.h>
> diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c
> b/arch/arm/cpu/armv7/ls102xa/cpu.c
> index c455969609f6..74a2dcbc116a 100644
> --- a/arch/arm/cpu/armv7/ls102xa/cpu.c
> +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
> @@ -4,7 +4,6 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> #include <cpu_func.h>
> #include <init.h>
> #include <net.h>
> diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c
> b/arch/arm/cpu/armv7/ls102xa/fdt.c
> index 1c3d24bcad94..34eea22eb923 100644
> --- a/arch/arm/cpu/armv7/ls102xa/fdt.c
> +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
> @@ -3,7 +3,7 @@
> * Copyright 2014 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <net.h>
> #include <asm/global_data.h>
> diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
> b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
> index e31a4fb6c31b..664eae532d5f 100644
> --- a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
> +++ b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
> @@ -3,7 +3,6 @@
> * Copyright 2014 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <asm/io.h>
>
> #include "fsl_epu.h"
> diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
> b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
> index f74d819ea1ea..c1eadb34523f 100644
> --- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
> +++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
> @@ -3,7 +3,7 @@
> * Copyright 2014 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/arch/fsl_serdes.h>
> #include <asm/arch/immap_ls102xa.h>
> #include <linux/errno.h>
> diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
> b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
> index 8c030be8b36f..3032e266c5d4 100644
> --- a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
> +++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
> @@ -3,7 +3,7 @@
> * Copyright 2014 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <linux/kernel.h>
> #include <asm/arch/fsl_serdes.h>
> #include <asm/arch/immap_ls102xa.h>
>
> diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c
> b/arch/arm/cpu/armv7/ls102xa/soc.c
> index 84d4ea3a8f4a..7ff59edd452e 100644
> --- a/arch/arm/cpu/armv7/ls102xa/soc.c
> +++ b/arch/arm/cpu/armv7/ls102xa/soc.c
> @@ -3,7 +3,7 @@
> * Copyright 2015 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <log.h>
> #include <asm/arch/clock.h>
> #include <asm/io.h>
> diff --git a/arch/arm/cpu/armv7/ls102xa/spl.c
> b/arch/arm/cpu/armv7/ls102xa/spl.c
> index a19496862359..374de92d026c 100644
> --- a/arch/arm/cpu/armv7/ls102xa/spl.c
> +++ b/arch/arm/cpu/armv7/ls102xa/spl.c
> @@ -3,7 +3,6 @@
> * Copyright 2014 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <spl.h>
>
> u32 spl_boot_device(void)
> diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c
> b/arch/arm/cpu/armv7/ls102xa/timer.c
> index c6126b10c355..6f32ced5aec3 100644
> --- a/arch/arm/cpu/armv7/ls102xa/timer.c
> +++ b/arch/arm/cpu/armv7/ls102xa/timer.c
> @@ -3,7 +3,6 @@
> * Copyright 2014 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <init.h>
> #include <time.h>
> #include <asm/global_data.h>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
> b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
> index 12d31184ad91..d2dbfdd08a02 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
> @@ -4,7 +4,7 @@
> * Copyright 2014-2015 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <cpu_func.h>
> #include <env.h>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
> b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
> index 22ce6992165b..ca6be3626fbe 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
> @@ -4,7 +4,7 @@
> * Copyright 2020-2021 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <efi_loader.h>
> #include <log.h>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
> b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
> index b1bb29bcaf55..78961d8089e4 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
> @@ -3,11 +3,12 @@
> * Copyright 2015 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <log.h>
> #include <asm/io.h>
> #include <linux/delay.h>
> #include <linux/errno.h>
> +#include <linux/string.h>
> #include <asm/arch/fsl_serdes.h>
> #include <asm/arch/soc.h>
>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
> b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
> index 4455eb1726dc..9a24d4b30313 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
> @@ -4,7 +4,7 @@
> * Copyright 2019 NXP.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <cpu_func.h>
> #include <asm/global_data.h>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
> b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
> index fbd5fd7d433b..b768790437fd 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
> @@ -4,7 +4,7 @@
> * Copyright 2014-2015 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <env.h>
> #include <log.h>
> #include <asm/io.h>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
> b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
> index 137778dc136b..452246e0e67f 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
> @@ -6,7 +6,7 @@
> * Derived from arch/power/cpu/mpc85xx/speed.c
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <cpu_func.h>
> #include <asm/global_data.h>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c
> b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
> index c22e73253c3c..04ffefafbf73 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
> @@ -3,7 +3,7 @@
> * Copyright 2018 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <linux/libfdt.h>
> #include <fdt_support.h>
>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
> b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
> index 8d7beca7db38..c0e5455507a4 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
> @@ -3,7 +3,7 @@
> * Copyright 2016 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/arch/fsl_serdes.h>
> #include <asm/arch/immap_lsch2.h>
>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
> b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
> index 86a49b152e44..d48baa63816f 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
> @@ -3,9 +3,9 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> #include <fdt_support.h>
> #include <log.h>
> +#include <asm/arch/stream_id_lsch3.h>
> #include <asm/arch-fsl-layerscape/immap_lsch3.h>
> #include <asm/arch-fsl-layerscape/fsl_icid.h>
> #include <asm/arch-fsl-layerscape/fsl_portals.h>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
> b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
> index 80d2910f679f..1b4eab3613e5 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
> @@ -3,7 +3,8 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> +#include <linux/kernel.h>
> #include <asm/arch/fsl_serdes.h>
>
> struct serdes_config {
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
> b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
> index e3c3fc6bfb55..ec80e42055d9 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
> @@ -3,11 +3,12 @@
> * Copyright 2018 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/arch-fsl-layerscape/immap_lsch2.h>
> #include <asm/arch-fsl-layerscape/fsl_icid.h>
> #include <asm/arch-fsl-layerscape/fsl_portals.h>
> #include <fsl_sec.h>
> +#include <asm/arch/stream_id_lsch3.h>
>
> #ifdef CONFIG_SYS_DPAA_QBMAN
> struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = { diff --git
> a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
> b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
> index 6c5e52ebaa69..1911ca1a175b 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
> @@ -3,7 +3,7 @@
> * Copyright 2015 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/arch/fsl_serdes.h>
> #include <asm/arch/immap_lsch2.h>
>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
> b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
> index 333d7e2fa21a..a73dd316f8d0 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
> @@ -3,10 +3,11 @@
> * Copyright 2018 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/arch-fsl-layerscape/immap_lsch2.h>
> #include <asm/arch-fsl-layerscape/fsl_icid.h>
> #include <asm/arch-fsl-layerscape/fsl_portals.h>
> +#include <asm/arch/stream_id_lsch3.h>
>
> #ifdef CONFIG_SYS_DPAA_QBMAN
> struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = { diff --git
> a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
> b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
> index 9347e516bf69..26ca4ca10f3d 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
> @@ -4,7 +4,7 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/arch/fsl_serdes.h>
> #include <asm/arch/immap_lsch2.h>
>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
> b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
> index 23743ae10cff..3a076ca04f6e 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
> @@ -3,10 +3,11 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/arch-fsl-layerscape/immap_lsch3.h>
> #include <asm/arch-fsl-layerscape/fsl_icid.h>
> #include <asm/arch-fsl-layerscape/fsl_portals.h>
> +#include <asm/arch/stream_id_lsch3.h>
>
> struct icid_id_table icid_tbl[] = {
> SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID), diff --git
> a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
> b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
> index fe667f06c395..154b727392e1 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
> @@ -3,7 +3,7 @@
> * Copyright 2017-2019 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/arch/fsl_serdes.h>
> #include <asm/arch/soc.h>
> #include <asm/io.h>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
> b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
> index 7997422840f2..5088c8ebb7ff 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
> @@ -3,7 +3,7 @@
> * Copyright 2014-2015 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/arch/fsl_serdes.h>
>
> struct serdes_config {
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
> b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
> index e6403b795263..c320e835c996 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
> @@ -3,10 +3,11 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/arch-fsl-layerscape/immap_lsch3.h>
> #include <asm/arch-fsl-layerscape/fsl_icid.h>
> #include <asm/arch-fsl-layerscape/fsl_portals.h>
> +#include <asm/arch/stream_id_lsch3.h>
>
> struct icid_id_table icid_tbl[] = {
> SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID), diff --git
> a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
> b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
> index 3a0ed1fa550c..df9329df77e1 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
> @@ -3,10 +3,11 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/arch-fsl-layerscape/immap_lsch3.h>
> #include <asm/arch-fsl-layerscape/fsl_icid.h>
> #include <asm/arch-fsl-layerscape/fsl_portals.h>
> +#include <asm/arch/stream_id_lsch3.h>
>
> struct icid_id_table icid_tbl[] = {
> SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID), diff --git
> a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
> b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
> index 5941d90e036f..43f0e8c87ba9 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
> @@ -3,7 +3,7 @@
> * Copyright 2018, 2020 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/arch/fsl_serdes.h>
>
> struct serdes_config {
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
> b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
> index ce0c46ad0d4e..db913208b9e9 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
> @@ -3,7 +3,7 @@
> * Copyright 2014-2015 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <cpu_func.h>
> #include <image.h>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
> b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
> index 4c61d28c20f0..d85a630f8a3c 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
> @@ -4,7 +4,7 @@
> * Copyright 2019-2021 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <cpu_func.h>
> #include <env.h>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
> b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
> index 232adfa843a2..a739ff2da581 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
> @@ -3,7 +3,7 @@
> * Copyright 2014-2015 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <cpu_func.h>
> #include <debug_uart.h>
> diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
> b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
> index 9e29350ca4ba..a02bec9371c0 100644
> --- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
> +++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
> @@ -7,6 +7,8 @@
> #ifndef __FSL_SERDES_H__
> #define __FSL_SERDES_H__
>
> +#include <linux/types.h>
> +
> #ifdef CONFIG_FSL_LSCH3
> enum srds_prtcl {
> /*
> diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
> b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
> index 9794db044996..147ca2f99de6 100644
> --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
> +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
> @@ -6,6 +6,7 @@
> #ifndef __ARCH_FSL_LSCH2_IMMAP_H__
> #define __ARCH_FSL_LSCH2_IMMAP_H__
>
> +#include <config.h>
> #include <fsl_immap.h>
> #ifndef __ASSEMBLY__
> #include <linux/bitops.h>
> diff --git a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
> b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
> index 9244e0a78fd3..35e3ec7a9878 100644
> --- a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
> +++ b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
> @@ -6,6 +6,8 @@
> #ifndef __FSL_SERDES_H
> #define __FSL_SERDES_H
>
> +#include <linux/types.h>
> +
> enum srds_prtcl {
> /*
> * Nobody will check whether the device 'NONE' has been configured,
> --
> 2.34.1
^ permalink raw reply [flat|nested] 41+ messages in thread
* RE: [PATCH 23/33] arm: imx: Remove <common.h> and add needed includes
2024-04-30 13:35 ` [PATCH 23/33] arm: imx: " Tom Rini
@ 2024-04-30 23:51 ` Peng Fan
0 siblings, 0 replies; 41+ messages in thread
From: Peng Fan @ 2024-04-30 23:51 UTC (permalink / raw)
To: Tom Rini, u-boot; +Cc: Stefano Babic, Fabio Estevam, dl-uboot-imx
> Subject: [PATCH 23/33] arm: imx: Remove <common.h> and add needed
> includes
>
> Remove <common.h> from all mach-imx, CPU specific sub-directories and
> include/asm/arch-mx* files and when needed add missing include files
> directly.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Peng Fan <peng.fan@nxp.com>
> ---
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: "NXP i.MX U-Boot Team" <uboot-imx@nxp.com>
> ---
> arch/arm/cpu/arm1136/mx31/devices.c | 1 -
> arch/arm/cpu/arm1136/mx31/generic.c | 1 -
> arch/arm/cpu/arm1136/mx31/timer.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/clock.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/iomux.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/mxs.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/start.S | 1 -
> arch/arm/cpu/arm926ejs/mxs/timer.c | 1 -
> arch/arm/include/asm/arch-mx5/clock.h | 2 ++
> arch/arm/include/asm/arch-mx7/sys_proto.h | 2 ++
> arch/arm/mach-imx/cache.c | 2 +-
> arch/arm/mach-imx/cmd_bmode.c | 1 -
> arch/arm/mach-imx/cmd_dek.c | 3 ++-
> arch/arm/mach-imx/cmd_hdmidet.c | 1 -
> arch/arm/mach-imx/cmd_mfgprot.c | 2 +-
> arch/arm/mach-imx/cmd_nandbcb.c | 1 -
> arch/arm/mach-imx/cpu.c | 1 -
> arch/arm/mach-imx/ddrmc-vf610-calibration.c | 1 -
> arch/arm/mach-imx/ddrmc-vf610.c | 1 -
> arch/arm/mach-imx/ele_ahab.c | 2 +-
> arch/arm/mach-imx/hab.c | 1 -
> arch/arm/mach-imx/i2c-mxv7.c | 2 +-
> arch/arm/mach-imx/image-container.c | 2 +-
> arch/arm/mach-imx/imx8/ahab.c | 1 -
> arch/arm/mach-imx/imx8/clock.c | 1 -
> arch/arm/mach-imx/imx8/cpu.c | 1 -
> arch/arm/mach-imx/imx8/fdt.c | 1 -
> arch/arm/mach-imx/imx8/iomux.c | 1 -
> arch/arm/mach-imx/imx8/misc.c | 1 -
> arch/arm/mach-imx/imx8/snvs_security_sc.c | 1 -
> arch/arm/mach-imx/imx8m/clock_imx8mm.c | 1 -
> arch/arm/mach-imx/imx8m/clock_imx8mq.c | 1 -
> arch/arm/mach-imx/imx8m/clock_slice.c | 1 -
> arch/arm/mach-imx/imx8m/psci.c | 1 -
> arch/arm/mach-imx/imx8m/soc.c | 2 +-
> arch/arm/mach-imx/imx8ulp/cgc.c | 1 -
> arch/arm/mach-imx/imx8ulp/clock.c | 1 -
> arch/arm/mach-imx/imx8ulp/iomux.c | 1 -
> arch/arm/mach-imx/imx8ulp/pcc.c | 1 -
> arch/arm/mach-imx/imx8ulp/rdc.c | 3 ++-
> arch/arm/mach-imx/imx9/clock.c | 1 -
> arch/arm/mach-imx/imx9/clock_root.c | 2 +-
> arch/arm/mach-imx/imx9/imx_bootaux.c | 3 ++-
> arch/arm/mach-imx/imx9/soc.c | 2 +-
> arch/arm/mach-imx/imx9/trdc.c | 2 +-
> arch/arm/mach-imx/imx_bootaux.c | 5 ++++-
> arch/arm/mach-imx/imxrt/soc.c | 1 -
> arch/arm/mach-imx/iomux-v3.c | 1 -
> arch/arm/mach-imx/mac.c | 1 -
> arch/arm/mach-imx/misc.c | 1 -
> arch/arm/mach-imx/mmc_env.c | 1 -
> arch/arm/mach-imx/mmdc_size.c | 2 +-
> arch/arm/mach-imx/mx5/clock.c | 1 -
> arch/arm/mach-imx/mx5/mx53_dram.c | 2 +-
> arch/arm/mach-imx/mx5/soc.c | 1 -
> arch/arm/mach-imx/mx6/clock.c | 2 +-
> arch/arm/mach-imx/mx6/ddr.c | 1 -
> arch/arm/mach-imx/mx6/litesom.c | 2 +-
> arch/arm/mach-imx/mx6/module_fuse.c | 1 -
> arch/arm/mach-imx/mx6/mp.c | 1 -
> arch/arm/mach-imx/mx6/opos6ul.c | 2 +-
> arch/arm/mach-imx/mx6/soc.c | 1 -
> arch/arm/mach-imx/mx7/clock.c | 3 ++-
> arch/arm/mach-imx/mx7/clock_slice.c | 1 -
> arch/arm/mach-imx/mx7/ddr.c | 1 -
> arch/arm/mach-imx/mx7/psci-mx7.c | 1 -
> arch/arm/mach-imx/mx7/soc.c | 1 -
> arch/arm/mach-imx/mx7ulp/clock.c | 2 +-
> arch/arm/mach-imx/mx7ulp/iomux.c | 1 -
> arch/arm/mach-imx/mx7ulp/pcc.c | 1 -
> arch/arm/mach-imx/mx7ulp/scg.c | 2 +-
> arch/arm/mach-imx/mx7ulp/soc.c | 2 +-
> arch/arm/mach-imx/priblob.c | 1 -
> arch/arm/mach-imx/rdc-sema.c | 1 -
> arch/arm/mach-imx/speed.c | 2 +-
> arch/arm/mach-imx/spl.c | 2 +-
> arch/arm/mach-imx/spl_imx_romapi.c | 1 -
> arch/arm/mach-imx/syscounter.c | 2 +-
> arch/arm/mach-imx/timer.c | 1 -
> arch/arm/mach-imx/video.c | 3 ++-
> 84 files changed, 38 insertions(+), 82 deletions(-)
>
> diff --git a/arch/arm/cpu/arm1136/mx31/devices.c
> b/arch/arm/cpu/arm1136/mx31/devices.c
> index 9997e8fc3396..87ca303e31ba 100644
> --- a/arch/arm/cpu/arm1136/mx31/devices.c
> +++ b/arch/arm/cpu/arm1136/mx31/devices.c
> @@ -6,7 +6,6 @@
> * (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
> */
>
> -#include <common.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/clock.h>
>
> diff --git a/arch/arm/cpu/arm1136/mx31/generic.c
> b/arch/arm/cpu/arm1136/mx31/generic.c
> index a3d4f1479623..fc56baccfcd6 100644
> --- a/arch/arm/cpu/arm1136/mx31/generic.c
> +++ b/arch/arm/cpu/arm1136/mx31/generic.c
> @@ -4,7 +4,6 @@
> * Sascha Hauer, Pengutronix
> */
>
> -#include <common.h>
> #include <div64.h>
> #include <init.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/cpu/arm1136/mx31/timer.c
> b/arch/arm/cpu/arm1136/mx31/timer.c
> index a913860491cb..b41ca68ae552 100644
> --- a/arch/arm/cpu/arm1136/mx31/timer.c
> +++ b/arch/arm/cpu/arm1136/mx31/timer.c
> @@ -4,7 +4,6 @@
> * Sascha Hauer, Pengutronix
> */
>
> -#include <common.h>
> #include <init.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/io.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/clock.c
> b/arch/arm/cpu/arm926ejs/mxs/clock.c
> index 4e1cf3a1e32b..58f6cf80cae0 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/clock.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/clock.c
> @@ -9,7 +9,6 @@
> * Copyright (C) 2010 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <log.h>
> #include <linux/errno.h>
> #include <asm/io.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/iomux.c
> b/arch/arm/cpu/arm926ejs/mxs/iomux.c
> index 381264b8a18d..851b4deb080b 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/iomux.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/iomux.c
> @@ -6,7 +6,6 @@
> * <armlinux@phytec.de>
> */
>
> -#include <common.h>
> #include <linux/errno.h>
> #include <asm/io.h>
> #include <asm/arch/clock.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c
> b/arch/arm/cpu/arm926ejs/mxs/mxs.c
> index 4f3cb63c56df..7b2bb09551b5 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
> @@ -9,7 +9,6 @@
> * Copyright (C) 2010 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <command.h>
> #include <cpu_func.h>
> #include <hang.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> index 249f8de8fbe1..76a69d7f9586 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> @@ -6,7 +6,6 @@
> * on behalf of DENX Software Engineering GmbH
> */
>
> -#include <common.h>
> #include <config.h>
> #include <init.h>
> #include <log.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
> b/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
> index 2cfbd780953d..b2d3b2b13efd 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
> @@ -6,7 +6,6 @@
> * on behalf of DENX Software Engineering GmbH
> */
>
> -#include <common.h>
> #include <config.h>
> #include <log.h>
> #include <asm/io.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
> b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
> index a94803ee93d9..c3136dd8976a 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
> @@ -6,7 +6,6 @@
> * on behalf of DENX Software Engineering GmbH
> */
>
> -#include <common.h>
> #include <config.h>
> #include <init.h>
> #include <log.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
> b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
> index 77bca7e331a0..8b65c094a8ad 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
> @@ -6,7 +6,6 @@
> * on behalf of DENX Software Engineering GmbH
> */
>
> -#include <common.h>
> #include <config.h>
> #include <hang.h>
> #include <log.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/start.S
> b/arch/arm/cpu/arm926ejs/mxs/start.S
> index 61982e38a1d4..a6eb053cadb0 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/start.S
> +++ b/arch/arm/cpu/arm926ejs/mxs/start.S
> @@ -20,7 +20,6 @@
>
> #include <asm-offsets.h>
> #include <config.h>
> -#include <common.h>
> #include <system-constants.h>
>
> /*
> diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c
> b/arch/arm/cpu/arm926ejs/mxs/timer.c
> index 3dff3d768d1c..cbd3b5d9958a 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/timer.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
> @@ -9,7 +9,6 @@
> * (C) Copyright 2009-2010 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <init.h>
> #include <time.h>
> #include <asm/global_data.h>
> diff --git a/arch/arm/include/asm/arch-mx5/clock.h
> b/arch/arm/include/asm/arch-mx5/clock.h
> index d585b5cf4b22..58013a85951a 100644
> --- a/arch/arm/include/asm/arch-mx5/clock.h
> +++ b/arch/arm/include/asm/arch-mx5/clock.h
> @@ -7,6 +7,8 @@
> #ifndef __ASM_ARCH_CLOCK_H
> #define __ASM_ARCH_CLOCK_H
>
> +#include <stdbool.h>
> +
> #ifdef CONFIG_SYS_MX5_HCLK
> #define MXC_HCLK CONFIG_SYS_MX5_HCLK
> #else
> diff --git a/arch/arm/include/asm/arch-mx7/sys_proto.h
> b/arch/arm/include/asm/arch-mx7/sys_proto.h
> index 634736cc09cd..5da0037b2c6b 100644
> --- a/arch/arm/include/asm/arch-mx7/sys_proto.h
> +++ b/arch/arm/include/asm/arch-mx7/sys_proto.h
> @@ -7,6 +7,8 @@
>
> #include <asm/mach-imx/sys_proto.h>
>
> +struct wdog_regs;
> +
> void set_wdog_reset(struct wdog_regs *wdog);
>
> #endif /* __SYS_PROTO_IMX7_ */
> diff --git a/arch/arm/mach-imx/cache.c b/arch/arm/mach-imx/cache.c index
> ab9b621a2a62..b368db49fce5 100644
> --- a/arch/arm/mach-imx/cache.c
> +++ b/arch/arm/mach-imx/cache.c
> @@ -3,7 +3,7 @@
> * Copyright 2015 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <cpu_func.h>
> #include <asm/armv7.h>
> #include <asm/cache.h>
> diff --git a/arch/arm/mach-imx/cmd_bmode.c b/arch/arm/mach-
> imx/cmd_bmode.c index 5b2f4686230c..c20e80725f8b 100644
> --- a/arch/arm/mach-imx/cmd_bmode.c
> +++ b/arch/arm/mach-imx/cmd_bmode.c
> @@ -2,7 +2,6 @@
> /*
> * Copyright (C) 2012 Boundary Devices Inc.
> */
> -#include <common.h>
> #include <linux/errno.h>
> #include <asm/io.h>
> #include <asm/mach-imx/boot_mode.h>
> diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
> index 2f389dbe8df0..c7962ead2d54 100644
> --- a/arch/arm/mach-imx/cmd_dek.c
> +++ b/arch/arm/mach-imx/cmd_dek.c
> @@ -6,7 +6,7 @@
> * Command for encapsulating DEK blob
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <command.h>
> #include <log.h>
> #include <malloc.h>
> @@ -17,6 +17,7 @@
> #include <asm/arch/clock.h>
> #include <mapmem.h>
> #include <tee.h>
> +#include <vsprintf.h>
> #ifdef CONFIG_IMX_SECO_DEK_ENCAP
> #include <imx_container.h>
> #include <firmware/imx/sci/sci.h>
> diff --git a/arch/arm/mach-imx/cmd_hdmidet.c b/arch/arm/mach-
> imx/cmd_hdmidet.c index e2571adfb006..8104ab26b08f 100644
> --- a/arch/arm/mach-imx/cmd_hdmidet.c
> +++ b/arch/arm/mach-imx/cmd_hdmidet.c
> @@ -2,7 +2,6 @@
> /*
> * Copyright (C) 2012 Boundary Devices Inc.
> */
> -#include <common.h>
> #include <command.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/mxc_hdmi.h>
> diff --git a/arch/arm/mach-imx/cmd_mfgprot.c b/arch/arm/mach-
> imx/cmd_mfgprot.c index 9576b48dde30..9925c9922687 100644
> --- a/arch/arm/mach-imx/cmd_mfgprot.c
> +++ b/arch/arm/mach-imx/cmd_mfgprot.c
> @@ -11,7 +11,7 @@
> #include <asm/arch/clock.h>
> #include <linux/compiler.h>
> #include <command.h>
> -#include <common.h>
> +#include <config.h>
> #include <env.h>
> #include <fsl_sec.h>
> #include <mapmem.h>
> diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-
> imx/cmd_nandbcb.c index 70a213a49dd0..c2e452b69270 100644
> --- a/arch/arm/mach-imx/cmd_nandbcb.c
> +++ b/arch/arm/mach-imx/cmd_nandbcb.c
> @@ -11,7 +11,6 @@
> * SPDX-License-Identifier: GPL-2.0+
> */
>
> -#include <common.h>
> #include <command.h>
> #include <log.h>
> #include <malloc.h>
> diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index
> 488638c90585..ceee31eecd79 100644
> --- a/arch/arm/mach-imx/cpu.c
> +++ b/arch/arm/mach-imx/cpu.c
> @@ -7,7 +7,6 @@
> */
>
> #include <bootm.h>
> -#include <common.h>
> #include <dm.h>
> #include <init.h>
> #include <log.h>
> diff --git a/arch/arm/mach-imx/ddrmc-vf610-calibration.c b/arch/arm/mach-
> imx/ddrmc-vf610-calibration.c
> index 7d787d045980..2cf684322ea3 100644
> --- a/arch/arm/mach-imx/ddrmc-vf610-calibration.c
> +++ b/arch/arm/mach-imx/ddrmc-vf610-calibration.c
> @@ -7,7 +7,6 @@
> *
> */
> /* #define DEBUG */
> -#include <common.h>
> #include <log.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/ddrmc-vf610.c b/arch/arm/mach-imx/ddrmc-
> vf610.c index 7895ee66f8a8..e449fa6f552d 100644
> --- a/arch/arm/mach-imx/ddrmc-vf610.c
> +++ b/arch/arm/mach-imx/ddrmc-vf610.c
> @@ -6,7 +6,6 @@
> * Copyright 2013 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/iomux-vf610.h>
> diff --git a/arch/arm/mach-imx/ele_ahab.c b/arch/arm/mach-imx/ele_ahab.c
> index d02316ed6cb1..eaeecf600423 100644
> --- a/arch/arm/mach-imx/ele_ahab.c
> +++ b/arch/arm/mach-imx/ele_ahab.c
> @@ -3,7 +3,6 @@
> * Copyright 2022 NXP
> */
>
> -#include <common.h>
> #include <command.h>
> #include <errno.h>
> #include <imx_container.h>
> @@ -15,6 +14,7 @@
> #include <console.h>
> #include <cpu_func.h>
> #include <asm/global_data.h>
> +#include <asm/u-boot.h>
>
> DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index
> 27e053ef701c..85d90686f680 100644
> --- a/arch/arm/mach-imx/hab.c
> +++ b/arch/arm/mach-imx/hab.c
> @@ -3,7 +3,6 @@
> * Copyright (C) 2010-2015 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <command.h>
> #include <config.h>
> #include <display_options.h>
> diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c
> index a5866cf9f703..256db150818a 100644
> --- a/arch/arm/mach-imx/i2c-mxv7.c
> +++ b/arch/arm/mach-imx/i2c-mxv7.c
> @@ -2,8 +2,8 @@
> /*
> * Copyright (C) 2012 Boundary Devices Inc.
> */
> -#include <common.h>
> #include <malloc.h>
> +#include <time.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/imx-regs.h>
> #include <linux/delay.h>
> diff --git a/arch/arm/mach-imx/image-container.c b/arch/arm/mach-
> imx/image-container.c
> index 35da0ae04258..e2388e3fef86 100644
> --- a/arch/arm/mach-imx/image-container.c
> +++ b/arch/arm/mach-imx/image-container.c
> @@ -3,7 +3,7 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <errno.h>
> #include <imx_container.h>
> #include <log.h>
> diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-
> imx/imx8/ahab.c index 1c072f6af11d..ed44df394b15 100644
> --- a/arch/arm/mach-imx/imx8/ahab.c
> +++ b/arch/arm/mach-imx/imx8/ahab.c
> @@ -3,7 +3,6 @@
> * Copyright 2018-2019, 2022 NXP
> */
>
> -#include <common.h>
> #include <command.h>
> #include <errno.h>
> #include <imx_container.h>
> diff --git a/arch/arm/mach-imx/imx8/clock.c b/arch/arm/mach-
> imx/imx8/clock.c index 9941b57b4be5..4e49b5bf3755 100644
> --- a/arch/arm/mach-imx/imx8/clock.c
> +++ b/arch/arm/mach-imx/imx8/clock.c
> @@ -3,7 +3,6 @@
> * Copyright 2018 NXP
> */
>
> -#include <common.h>
> #include <asm/global_data.h>
> #include <linux/errno.h>
> #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
> index 6e643188f402..627baa1d83fd 100644
> --- a/arch/arm/mach-imx/imx8/cpu.c
> +++ b/arch/arm/mach-imx/imx8/cpu.c
> @@ -3,7 +3,6 @@
> * Copyright 2018, 2021 NXP
> */
>
> -#include <common.h>
> #include <clk.h>
> #include <cpu.h>
> #include <cpu_func.h>
> diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
> index c2bed3e0c1fb..6d0585f5cc67 100644
> --- a/arch/arm/mach-imx/imx8/fdt.c
> +++ b/arch/arm/mach-imx/imx8/fdt.c
> @@ -3,7 +3,6 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> #include <log.h>
> #include <firmware/imx/sci/sci.h>
> #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/imx8/iomux.c b/arch/arm/mach-
> imx/imx8/iomux.c index e4f7651bd1d4..3e27d75827a5 100644
> --- a/arch/arm/mach-imx/imx8/iomux.c
> +++ b/arch/arm/mach-imx/imx8/iomux.c
> @@ -3,7 +3,6 @@
> * Copyright 2018 NXP
> */
>
> -#include <common.h>
> #include <log.h>
> #include <asm/global_data.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/imx8/misc.c b/arch/arm/mach-
> imx/imx8/misc.c index 0ce3036818b6..c77104d0338f 100644
> --- a/arch/arm/mach-imx/imx8/misc.c
> +++ b/arch/arm/mach-imx/imx8/misc.c
> @@ -1,5 +1,4 @@
> // SPDX-License-Identifier: GPL-2.0+
> -#include <common.h>
> #include <log.h>
> #include <firmware/imx/sci/sci.h>
> #include <asm/mach-imx/sys_proto.h>
> diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-
> imx/imx8/snvs_security_sc.c
> index 1eaa68f8d5ff..f13dfc155165 100644
> --- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
> +++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
> @@ -14,7 +14,6 @@
> #include <command.h>
> #include <log.h>
> #include <stddef.h>
> -#include <common.h>
> #include <firmware/imx/sci/sci.h>
> #include <asm/arch-imx8/imx8-pins.h>
> #include <asm/arch-imx8/snvs_security_sc.h>
> diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-
> imx/imx8m/clock_imx8mm.c
> index 47219957b58c..de630e940c90 100644
> --- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
> +++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
> @@ -5,7 +5,6 @@
> * Peng Fan <peng.fan@nxp.com>
> */
>
> -#include <common.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-
> imx/imx8m/clock_imx8mq.c
> index 9db62b944e4c..7e6c37487163 100644
> --- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c
> +++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
> @@ -5,7 +5,6 @@
> * Peng Fan <peng.fan@nxp.com>
> */
>
> -#include <common.h>
> #include <command.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/imx8m/clock_slice.c b/arch/arm/mach-
> imx/imx8m/clock_slice.c
> index b5ed27a923e0..7cfdc46d349e 100644
> --- a/arch/arm/mach-imx/imx8m/clock_slice.c
> +++ b/arch/arm/mach-imx/imx8m/clock_slice.c
> @@ -5,7 +5,6 @@
> * Peng Fan <peng.fan@nxp.com>
> */
>
> -#include <common.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/imx8m/psci.c b/arch/arm/mach-
> imx/imx8m/psci.c index 62f0b768cfa4..f5644c642bd6 100644
> --- a/arch/arm/mach-imx/imx8m/psci.c
> +++ b/arch/arm/mach-imx/imx8m/psci.c
> @@ -10,7 +10,6 @@
> #include <asm/io.h>
> #include <asm/psci.h>
> #include <asm/secure.h>
> -#include <common.h>
> #include <cpu_func.h>
> #include <debug_uart.h>
> #include <fsl_wdog.h>
> diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-
> imx/imx8m/soc.c index 0c49fb9cd488..be38ca528850 100644
> --- a/arch/arm/mach-imx/imx8m/soc.c
> +++ b/arch/arm/mach-imx/imx8m/soc.c
> @@ -5,7 +5,7 @@
> * Peng Fan <peng.fan@nxp.com>
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <cpu_func.h>
> #include <event.h>
> #include <init.h>
> diff --git a/arch/arm/mach-imx/imx8ulp/cgc.c b/arch/arm/mach-
> imx/imx8ulp/cgc.c index d2fadb4877c9..f9d8ed5b048b 100644
> --- a/arch/arm/mach-imx/imx8ulp/cgc.c
> +++ b/arch/arm/mach-imx/imx8ulp/cgc.c
> @@ -3,7 +3,6 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> #include <div64.h>
> #include <asm/io.h>
> #include <errno.h>
> diff --git a/arch/arm/mach-imx/imx8ulp/clock.c b/arch/arm/mach-
> imx/imx8ulp/clock.c
> index 36d12943a059..fadf165ece27 100644
> --- a/arch/arm/mach-imx/imx8ulp/clock.c
> +++ b/arch/arm/mach-imx/imx8ulp/clock.c
> @@ -3,7 +3,6 @@
> * Copyright 2020 NXP
> */
>
> -#include <common.h>
> #include <command.h>
> #include <div64.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/imx8ulp/iomux.c b/arch/arm/mach-
> imx/imx8ulp/iomux.c
> index c6d20f546809..43f856bf7324 100644
> --- a/arch/arm/mach-imx/imx8ulp/iomux.c
> +++ b/arch/arm/mach-imx/imx8ulp/iomux.c
> @@ -3,7 +3,6 @@
> * Copyright 2020-2021 NXP
> */
>
> -#include <common.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/iomux.h>
> diff --git a/arch/arm/mach-imx/imx8ulp/pcc.c b/arch/arm/mach-
> imx/imx8ulp/pcc.c index e3c6d6760be2..449e496521f1 100644
> --- a/arch/arm/mach-imx/imx8ulp/pcc.c
> +++ b/arch/arm/mach-imx/imx8ulp/pcc.c
> @@ -3,7 +3,6 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> #include <div64.h>
> #include <asm/io.h>
> #include <errno.h>
> diff --git a/arch/arm/mach-imx/imx8ulp/rdc.c b/arch/arm/mach-
> imx/imx8ulp/rdc.c index cfc09e79cbd5..ca657748ed9a 100644
> --- a/arch/arm/mach-imx/imx8ulp/rdc.c
> +++ b/arch/arm/mach-imx/imx8ulp/rdc.c
> @@ -3,7 +3,8 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> +#include <linux/errno.h>
> #include <asm/io.h>
> #include <asm/types.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/imx9/clock.c b/arch/arm/mach-
> imx/imx9/clock.c index 75d92af036a1..0abf4579a1e0 100644
> --- a/arch/arm/mach-imx/imx9/clock.c
> +++ b/arch/arm/mach-imx/imx9/clock.c
> @@ -5,7 +5,6 @@
> * Peng Fan <peng.fan@nxp.com>
> */
>
> -#include <common.h>
> #include <command.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/imx9/clock_root.c b/arch/arm/mach-
> imx/imx9/clock_root.c
> index 7d7ae865946f..47106fffefba 100644
> --- a/arch/arm/mach-imx/imx9/clock_root.c
> +++ b/arch/arm/mach-imx/imx9/clock_root.c
> @@ -5,7 +5,7 @@
> * Peng Fan <peng.fan@nxp.com>
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <command.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/imx9/imx_bootaux.c b/arch/arm/mach-
> imx/imx9/imx_bootaux.c
> index 6afb59e05159..73f2e72263d6 100644
> --- a/arch/arm/mach-imx/imx9/imx_bootaux.c
> +++ b/arch/arm/mach-imx/imx9/imx_bootaux.c
> @@ -3,11 +3,12 @@
> * Copyright 2022 NXP
> */
>
> -#include <common.h>
> #include <command.h>
> #include <log.h>
> #include <imx_sip.h>
> +#include <vsprintf.h>
> #include <linux/arm-smccc.h>
> +#include <linux/errno.h>
>
> int arch_auxiliary_core_check_up(u32 core_id) { diff --git a/arch/arm/mach-
> imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c index
> 2117489f2320..32208220b207 100644
> --- a/arch/arm/mach-imx/imx9/soc.c
> +++ b/arch/arm/mach-imx/imx9/soc.c
> @@ -5,7 +5,7 @@
> * Peng Fan <peng.fan@nxp.com>
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <cpu_func.h>
> #include <init.h>
> #include <log.h>
> diff --git a/arch/arm/mach-imx/imx9/trdc.c b/arch/arm/mach-
> imx/imx9/trdc.c index d0f855bb1bc1..8cdb28459a36 100644
> --- a/arch/arm/mach-imx/imx9/trdc.c
> +++ b/arch/arm/mach-imx/imx9/trdc.c
> @@ -3,8 +3,8 @@
> * Copyright 2022 NXP
> */
>
> -#include <common.h>
> #include <log.h>
> +#include <linux/errno.h>
> #include <asm/io.h>
> #include <asm/types.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-
> imx/imx_bootaux.c index f7b14ca38d94..26374fdc33ec 100644
> --- a/arch/arm/mach-imx/imx_bootaux.c
> +++ b/arch/arm/mach-imx/imx_bootaux.c
> @@ -3,15 +3,18 @@
> * Copyright (C) 2016 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <log.h>
> +#include <asm/arch/imx-regs.h>
> #include <asm/io.h>
> #include <asm/mach-imx/sys_proto.h>
> #include <command.h>
> #include <elf.h>
> #include <imx_sip.h>
> +#include <vsprintf.h>
> #include <linux/arm-smccc.h>
> #include <linux/compiler.h>
> +#include <linux/errno.h>
> +#include <linux/string.h>
> #include <cpu_func.h>
>
> #ifndef CONFIG_IMX8
> diff --git a/arch/arm/mach-imx/imxrt/soc.c b/arch/arm/mach-imx/imxrt/soc.c
> index 34162a3976fb..3028957953bd 100644
> --- a/arch/arm/mach-imx/imxrt/soc.c
> +++ b/arch/arm/mach-imx/imxrt/soc.c
> @@ -4,7 +4,6 @@
> * Author(s): Giulio Benetti <giulio.benetti@benettiengineering.com>
> */
>
> -#include <common.h>
> #include <init.h>
> #include <asm/io.h>
> #include <asm/armv7_mpu.h>
> diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c
> index 18131a20f438..c134e95ed780 100644
> --- a/arch/arm/mach-imx/iomux-v3.c
> +++ b/arch/arm/mach-imx/iomux-v3.c
> @@ -7,7 +7,6 @@
> *
> * Copyright (C) 2004-2011 Freescale Semiconductor, Inc.
> */
> -#include <common.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/mach-imx/iomux-v3.h>
> diff --git a/arch/arm/mach-imx/mac.c b/arch/arm/mach-imx/mac.c index
> 9bb63d25b488..e739fd14c898 100644
> --- a/arch/arm/mach-imx/mac.c
> +++ b/arch/arm/mach-imx/mac.c
> @@ -5,7 +5,6 @@
> * Peng Fan <peng.fan@nxp.com>
> */
>
> -#include <common.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/io.h>
> #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/misc.c b/arch/arm/mach-imx/misc.c index
> 09a758ff6e89..7452b82f1105 100644
> --- a/arch/arm/mach-imx/misc.c
> +++ b/arch/arm/mach-imx/misc.c
> @@ -3,7 +3,6 @@
> * Copyright 2013 Stefan Roese <sr@denx.de>
> */
>
> -#include <common.h>
> #include <lmb.h>
> #include <log.h>
> #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/mmc_env.c b/arch/arm/mach-
> imx/mmc_env.c index 9c822f721c60..34a7d1706f3d 100644
> --- a/arch/arm/mach-imx/mmc_env.c
> +++ b/arch/arm/mach-imx/mmc_env.c
> @@ -3,7 +3,6 @@
> * Copyright (C) 2017 NXP
> */
>
> -#include <common.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/sys_proto.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/mmdc_size.c b/arch/arm/mach-
> imx/mmdc_size.c index 41a5af6bd307..2b1d203f8635 100644
> --- a/arch/arm/mach-imx/mmdc_size.c
> +++ b/arch/arm/mach-imx/mmdc_size.c
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0+
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/io.h>
>
> #if defined(CONFIG_MX53)
> diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-
> imx/mx5/clock.c index bbaddd5a33fa..0b8a10fd7294 100644
> --- a/arch/arm/mach-imx/mx5/clock.c
> +++ b/arch/arm/mach-imx/mx5/clock.c
> @@ -6,7 +6,6 @@
> * (C) Copyright 2009 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <command.h>
> #include <log.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/mx5/mx53_dram.c b/arch/arm/mach-
> imx/mx5/mx53_dram.c
> index f74414419470..6459b4a82d25 100644
> --- a/arch/arm/mach-imx/mx5/mx53_dram.c
> +++ b/arch/arm/mach-imx/mx5/mx53_dram.c
> @@ -4,9 +4,9 @@
> * Patrick Bruenn <p.bruenn@beckhoff.com>
> */
>
> -#include <common.h>
> #include <init.h>
> #include <asm/global_data.h>
> +#include <asm/u-boot.h>
>
> DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/arch/arm/mach-imx/mx5/soc.c b/arch/arm/mach-imx/mx5/soc.c
> index 47f531dc856c..4df5f9c16416 100644
> --- a/arch/arm/mach-imx/mx5/soc.c
> +++ b/arch/arm/mach-imx/mx5/soc.c
> @@ -6,7 +6,6 @@
> * (C) Copyright 2009 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <cpu_func.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-
> imx/mx6/clock.c index e0da9c239584..fb9f56d2e63c 100644
> --- a/arch/arm/mach-imx/mx6/clock.c
> +++ b/arch/arm/mach-imx/mx6/clock.c
> @@ -3,10 +3,10 @@
> * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <command.h>
> #include <div64.h>
> #include <log.h>
> +#include <time.h>
> #include <asm/io.h>
> #include <linux/errno.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c
> index 3c87c577737b..5a1258e002d2 100644
> --- a/arch/arm/mach-imx/mx6/ddr.c
> +++ b/arch/arm/mach-imx/mx6/ddr.c
> @@ -4,7 +4,6 @@
> * Author: Tim Harvey <tharvey@gateworks.com>
> */
>
> -#include <common.h>
> #include <hang.h>
> #include <log.h>
> #include <linux/delay.h>
> diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-
> imx/mx6/litesom.c index 2ba3245e226c..ab5de2665778 100644
> --- a/arch/arm/mach-imx/mx6/litesom.c
> +++ b/arch/arm/mach-imx/mx6/litesom.c
> @@ -17,7 +17,7 @@
> #include <asm/mach-imx/iomux-v3.h>
> #include <asm/mach-imx/boot_mode.h>
> #include <asm/io.h>
> -#include <common.h>
> +#include <config.h>
> #include <fsl_esdhc_imx.h>
> #include <linux/delay.h>
> #include <linux/sizes.h>
> diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-
> imx/mx6/module_fuse.c
> index b58f11c1e562..8b23d48a854c 100644
> --- a/arch/arm/mach-imx/mx6/module_fuse.c
> +++ b/arch/arm/mach-imx/mx6/module_fuse.c
> @@ -3,7 +3,6 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> #include <fdt_support.h>
> #include <asm/io.h>
> #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c
> index de9ace083ce8..091a37238316 100644
> --- a/arch/arm/mach-imx/mx6/mp.c
> +++ b/arch/arm/mach-imx/mx6/mp.c
> @@ -6,7 +6,6 @@
> * (C) Copyright 2009 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <cpu_func.h>
> #include <asm/io.h>
> #include <linux/errno.h>
> diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-
> imx/mx6/opos6ul.c index 38ead8ace20c..340e6147b638 100644
> --- a/arch/arm/mach-imx/mx6/opos6ul.c
> +++ b/arch/arm/mach-imx/mx6/opos6ul.c
> @@ -10,7 +10,7 @@
> #include <asm/arch/sys_proto.h>
> #include <asm/global_data.h>
> #include <asm/io.h>
> -#include <common.h>
> +#include <config.h>
> #include <env.h>
>
> DECLARE_GLOBAL_DATA_PTR;
> diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
> index c2875e727c94..3a3e01f3d0aa 100644
> --- a/arch/arm/mach-imx/mx6/soc.c
> +++ b/arch/arm/mach-imx/mx6/soc.c
> @@ -7,7 +7,6 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> #include <env.h>
> #include <init.h>
> #include <linux/delay.h>
> diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-
> imx/mx7/clock.c index 4e232385afc3..a8606fa9b24b 100644
> --- a/arch/arm/mach-imx/mx7/clock.c
> +++ b/arch/arm/mach-imx/mx7/clock.c
> @@ -6,11 +6,12 @@
> * Peng Fan <Peng.Fan@freescale.com>
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <command.h>
> #include <div64.h>
> #include <log.h>
> +#include <time.h>
> #include <asm/global_data.h>
> #include <asm/io.h>
> #include <linux/errno.h>
> diff --git a/arch/arm/mach-imx/mx7/clock_slice.c b/arch/arm/mach-
> imx/mx7/clock_slice.c
> index dd731d949621..2a1304fc1128 100644
> --- a/arch/arm/mach-imx/mx7/clock_slice.c
> +++ b/arch/arm/mach-imx/mx7/clock_slice.c
> @@ -6,7 +6,6 @@
> * Peng Fan <Peng.Fan@freescale.com>
> */
>
> -#include <common.h>
> #include <div64.h>
> #include <asm/io.h>
> #include <linux/errno.h>
> diff --git a/arch/arm/mach-imx/mx7/ddr.c b/arch/arm/mach-imx/mx7/ddr.c
> index cf25569765ea..c4a90be3945b 100644
> --- a/arch/arm/mach-imx/mx7/ddr.c
> +++ b/arch/arm/mach-imx/mx7/ddr.c
> @@ -12,7 +12,6 @@
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/crm_regs.h>
> #include <asm/arch/mx7-ddr.h>
> -#include <common.h>
> #include <linux/delay.h>
>
> /*
> diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-
> imx/mx7/psci-mx7.c
> index 0b71fa403446..12d6a63b9255 100644
> --- a/arch/arm/mach-imx/mx7/psci-mx7.c
> +++ b/arch/arm/mach-imx/mx7/psci-mx7.c
> @@ -13,7 +13,6 @@
> #include <asm/armv7.h>
> #include <asm/gic.h>
> #include <linux/bitops.h>
> -#include <common.h>
> #include <fsl_wdog.h>
>
> #define GPC_LPCR_A7_BSC 0x0
> diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
> index 689dbefe8ee0..16c77cbf7bee 100644
> --- a/arch/arm/mach-imx/mx7/soc.c
> +++ b/arch/arm/mach-imx/mx7/soc.c
> @@ -4,7 +4,6 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> #include <init.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-
> imx/mx7ulp/clock.c
> index 37d8565c20fc..fb19c62a5200 100644
> --- a/arch/arm/mach-imx/mx7ulp/clock.c
> +++ b/arch/arm/mach-imx/mx7ulp/clock.c
> @@ -3,7 +3,7 @@
> * Copyright (C) 2016 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <command.h>
> #include <div64.h>
> diff --git a/arch/arm/mach-imx/mx7ulp/iomux.c b/arch/arm/mach-
> imx/mx7ulp/iomux.c
> index 05ddeed2a64b..2c87a8c18b96 100644
> --- a/arch/arm/mach-imx/mx7ulp/iomux.c
> +++ b/arch/arm/mach-imx/mx7ulp/iomux.c
> @@ -2,7 +2,6 @@
> /*
> * Copyright (C) 2016 Freescale Semiconductor, Inc.
> */
> -#include <common.h>
> #include <log.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-
> imx/mx7ulp/pcc.c index aa7ea86a443e..0bfd8f71815a 100644
> --- a/arch/arm/mach-imx/mx7ulp/pcc.c
> +++ b/arch/arm/mach-imx/mx7ulp/pcc.c
> @@ -3,7 +3,6 @@
> * Copyright (C) 2016 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <div64.h>
> #include <log.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-
> imx/mx7ulp/scg.c index 4c066557c1ca..d4fb5389cacb 100644
> --- a/arch/arm/mach-imx/mx7ulp/scg.c
> +++ b/arch/arm/mach-imx/mx7ulp/scg.c
> @@ -3,7 +3,7 @@
> * Copyright (C) 2016 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <div64.h>
> #include <log.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-
> imx/mx7ulp/soc.c index 217b7c45867d..198ae2d919c9 100644
> --- a/arch/arm/mach-imx/mx7ulp/soc.c
> +++ b/arch/arm/mach-imx/mx7ulp/soc.c
> @@ -4,7 +4,7 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <cpu_func.h>
> #include <init.h>
> #include <log.h>
> diff --git a/arch/arm/mach-imx/priblob.c b/arch/arm/mach-imx/priblob.c
> index 5b022d5c8201..65924483bc89 100644
> --- a/arch/arm/mach-imx/priblob.c
> +++ b/arch/arm/mach-imx/priblob.c
> @@ -11,7 +11,6 @@
> */
>
> #include <asm/io.h>
> -#include <common.h>
> #include <command.h>
> #include <fsl_sec.h>
>
> diff --git a/arch/arm/mach-imx/rdc-sema.c b/arch/arm/mach-imx/rdc-sema.c
> index e683673753e1..56725cc109f0 100644
> --- a/arch/arm/mach-imx/rdc-sema.c
> +++ b/arch/arm/mach-imx/rdc-sema.c
> @@ -2,7 +2,6 @@
> /*
> * Copyright (C) 2016 Freescale Semiconductor, Inc.
> */
> -#include <common.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/mach-imx/rdc-sema.h>
> diff --git a/arch/arm/mach-imx/speed.c b/arch/arm/mach-imx/speed.c index
> 0e81cc880a1a..98a42b22f9cc 100644
> --- a/arch/arm/mach-imx/speed.c
> +++ b/arch/arm/mach-imx/speed.c
> @@ -7,7 +7,7 @@
> * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index
> b30cd9625538..bc291dcd1296 100644
> --- a/arch/arm/mach-imx/spl.c
> +++ b/arch/arm/mach-imx/spl.c
> @@ -6,7 +6,7 @@
> * Author: Tim Harvey <tharvey@gateworks.com>
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <hang.h>
> #include <init.h>
> #include <log.h>
> diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-
> imx/spl_imx_romapi.c
> index b9ff9bb83b3c..9a86f5c133f7 100644
> --- a/arch/arm/mach-imx/spl_imx_romapi.c
> +++ b/arch/arm/mach-imx/spl_imx_romapi.c
> @@ -3,7 +3,6 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> #include <errno.h>
> #include <image.h>
> #include <imx_container.h>
> diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-
> imx/syscounter.c index 16df1186759e..922f851c56b7 100644
> --- a/arch/arm/mach-imx/syscounter.c
> +++ b/arch/arm/mach-imx/syscounter.c
> @@ -5,7 +5,7 @@
> * The file use ls102xa/timer.c as a reference.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <init.h>
> #include <time.h>
> #include <asm/global_data.h>
> diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c index
> fcd45f09f181..5ac8f28e670d 100644
> --- a/arch/arm/mach-imx/timer.c
> +++ b/arch/arm/mach-imx/timer.c
> @@ -6,7 +6,6 @@
> * (C) Copyright 2009 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <init.h>
> #include <time.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/video.c b/arch/arm/mach-imx/video.c index
> 1bc9b7cc7e15..6cbb49da53cc 100644
> --- a/arch/arm/mach-imx/video.c
> +++ b/arch/arm/mach-imx/video.c
> @@ -1,8 +1,9 @@
> // SPDX-License-Identifier: GPL-2.0+
>
> -#include <common.h>
> +#include <stdio.h>
> #include <env.h>
> #include <linux/errno.h>
> +#include <asm/arch/imx-regs.h>
> #include <asm/mach-imx/video.h>
>
> #ifdef CONFIG_IMX_HDMI
> --
> 2.34.1
^ permalink raw reply [flat|nested] 41+ messages in thread
* RE: [PATCH 30/33] arm: aspeed: Remove <common.h> and add needed includes
2024-04-30 13:35 ` [PATCH 30/33] arm: aspeed: " Tom Rini
@ 2024-05-01 9:38 ` ChiaWei Wang
0 siblings, 0 replies; 41+ messages in thread
From: ChiaWei Wang @ 2024-05-01 9:38 UTC (permalink / raw)
To: Tom Rini, u-boot; +Cc: Ryan Chen, BMC-SW, Joel Stanley
> From: Tom Rini <trini@konsulko.com>
> Sent: Tuesday, April 30, 2024 9:36 PM
>
> Remove <common.h> from all mach-aspeed files and when needed add
> missing include files directly.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Chia-Wei Wang <chiawei_wang@aspeedtech.com>
Thanks,
Chiawei
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 19/33] arm: meson: Remove <common.h> and add needed includes
2024-04-30 13:35 ` [PATCH 19/33] arm: meson: " Tom Rini
@ 2024-05-02 7:39 ` Neil Armstrong
0 siblings, 0 replies; 41+ messages in thread
From: Neil Armstrong @ 2024-05-02 7:39 UTC (permalink / raw)
To: Tom Rini, u-boot; +Cc: u-boot-amlogic
On 30/04/2024 15:35, Tom Rini wrote:
> Remove <common.h> from all mach-meson files and when needed add missing
> include files directly.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> Cc: Neil Armstrong <neil.armstrong@linaro.org>
> Cc: u-boot-amlogic@groups.io
> ---
> arch/arm/mach-meson/board-a1.c | 2 +-
> arch/arm/mach-meson/board-axg.c | 1 -
> arch/arm/mach-meson/board-common.c | 1 -
> arch/arm/mach-meson/board-g12a.c | 1 -
> arch/arm/mach-meson/board-gx.c | 1 -
> arch/arm/mach-meson/board-info.c | 1 -
> arch/arm/mach-meson/sm.c | 1 -
> 7 files changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-meson/board-a1.c b/arch/arm/mach-meson/board-a1.c
> index 967bb671822e..f848c0f068ed 100644
> --- a/arch/arm/mach-meson/board-a1.c
> +++ b/arch/arm/mach-meson/board-a1.c
> @@ -3,12 +3,12 @@
> * (C) Copyright 2023 SberDevices, Inc.
> */
>
> -#include <common.h>
> #include <asm/arch/a1.h>
> #include <asm/arch/boot.h>
> #include <asm/armv8/mmu.h>
> #include <asm/io.h>
> #include <linux/compiler.h>
> +#include <linux/errno.h>
> #include <linux/sizes.h>
>
> phys_size_t get_effective_memsize(void)
> diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c
> index fdf18752cdd0..6535539184cc 100644
> --- a/arch/arm/mach-meson/board-axg.c
> +++ b/arch/arm/mach-meson/board-axg.c
> @@ -4,7 +4,6 @@
> * (C) Copyright 2018 Neil Armstrong <narmstrong@baylibre.com>
> */
>
> -#include <common.h>
> #include <init.h>
> #include <net.h>
> #include <asm/arch/boot.h>
> diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
> index 7ceba7cede85..39774c43049a 100644
> --- a/arch/arm/mach-meson/board-common.c
> +++ b/arch/arm/mach-meson/board-common.c
> @@ -3,7 +3,6 @@
> * (C) Copyright 2016 Beniamino Galvani <b.galvani@gmail.com>
> */
>
> -#include <common.h>
> #include <cpu_func.h>
> #include <fastboot.h>
> #include <init.h>
> diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
> index d5a830fb1db8..dc4abe1e1074 100644
> --- a/arch/arm/mach-meson/board-g12a.c
> +++ b/arch/arm/mach-meson/board-g12a.c
> @@ -4,7 +4,6 @@
> * (C) Copyright 2018 Neil Armstrong <narmstrong@baylibre.com>
> */
>
> -#include <common.h>
> #include <init.h>
> #include <log.h>
> #include <net.h>
> diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
> index c3fbdfffeae8..0370ed57e205 100644
> --- a/arch/arm/mach-meson/board-gx.c
> +++ b/arch/arm/mach-meson/board-gx.c
> @@ -4,7 +4,6 @@
> * (C) Copyright 2018 Neil Armstrong <narmstrong@baylibre.com>
> */
>
> -#include <common.h>
> #include <init.h>
> #include <net.h>
> #include <asm/arch/boot.h>
> diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
> index d51d9b8f0645..b4058f593234 100644
> --- a/arch/arm/mach-meson/board-info.c
> +++ b/arch/arm/mach-meson/board-info.c
> @@ -4,7 +4,6 @@
> * (C) Copyright 2019 Neil Armstrong <narmstrong@baylibre.com>
> */
>
> -#include <common.h>
> #include <init.h>
> #include <asm/global_data.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
> index 914fd11c9894..4d9f83d3b38d 100644
> --- a/arch/arm/mach-meson/sm.c
> +++ b/arch/arm/mach-meson/sm.c
> @@ -5,7 +5,6 @@
> * Secure monitor calls.
> */
>
> -#include <common.h>
> #include <dm.h>
> #include <log.h>
> #include <regmap.h>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 01/33] arm: mach-versatile: Remove dead code
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
` (31 preceding siblings ...)
2024-04-30 13:35 ` [PATCH 33/33] arm: " Tom Rini
@ 2024-05-07 14:02 ` Tom Rini
32 siblings, 0 replies; 41+ messages in thread
From: Tom Rini @ 2024-05-07 14:02 UTC (permalink / raw)
To: u-boot, Tom Rini
On Tue, 30 Apr 2024 07:35:27 -0600, Tom Rini wrote:
> This platform is no longer supported in tree, remove.
>
>
Applied to u-boot/next, thanks!
--
Tom
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 17/33] arm: nexell: Remove <common.h> and add needed includes
2024-04-30 13:35 ` [PATCH 17/33] arm: nexell: " Tom Rini
@ 2024-05-08 17:37 ` Stefan Bosch
0 siblings, 0 replies; 41+ messages in thread
From: Stefan Bosch @ 2024-05-08 17:37 UTC (permalink / raw)
To: Tom Rini, u-boot
On 30.04.24 15:35, Tom Rini wrote:
> Remove <common.h> from all mach-nexell files and when needed add missing
> include files directly.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Stefan Bosch <stefan_b@posteo.net>
Tested-by: Stefan Bosch <stefan_b@posteo.net>
Looks good, tested on FriendlyElec-Board NanoPC-T2.
Thanks a lot!
> ---
> Cc: Stefan Bosch <stefan_b@posteo.net>
> ---
> arch/arm/mach-nexell/clock.c | 2 +-
> arch/arm/mach-nexell/include/mach/reset.h | 2 ++
> arch/arm/mach-nexell/reset.c | 1 -
> arch/arm/mach-nexell/tieoff.c | 1 -
> arch/arm/mach-nexell/timer.c | 1 -
> 5 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-nexell/clock.c b/arch/arm/mach-nexell/clock.c
> index 59ffa26255f5..3082f6077b73 100644
> --- a/arch/arm/mach-nexell/clock.c
> +++ b/arch/arm/mach-nexell/clock.c
> @@ -4,8 +4,8 @@
> * Hyunseok, Jung <hsjung@nexell.co.kr>
> */
>
> -#include <common.h>
> #include <command.h>
> +#include <vsprintf.h>
> #include <linux/err.h>
> #include <asm/io.h>
> #include <asm/arch/nexell.h>
> diff --git a/arch/arm/mach-nexell/include/mach/reset.h b/arch/arm/mach-nexell/include/mach/reset.h
> index e1301d4e53d3..0c6a13043f91 100644
> --- a/arch/arm/mach-nexell/include/mach/reset.h
> +++ b/arch/arm/mach-nexell/include/mach/reset.h
> @@ -7,6 +7,8 @@
> #ifndef __NEXELL_RESET__
> #define __NEXELL_RESET__
>
> +#include <linux/types.h>
> +
> #define NUMBER_OF_RESET_MODULE_PIN 69
>
> enum rstcon {
> diff --git a/arch/arm/mach-nexell/reset.c b/arch/arm/mach-nexell/reset.c
> index 1f732a3d3732..627f568270b6 100644
> --- a/arch/arm/mach-nexell/reset.c
> +++ b/arch/arm/mach-nexell/reset.c
> @@ -8,7 +8,6 @@
> *FIXME : Not support device tree & reset control driver.
> * will remove after support device tree & reset control driver.
> */
> -#include <common.h>
> #include <asm/io.h>
> #include <asm/arch/nexell.h>
> #include <asm/arch/reset.h>
> diff --git a/arch/arm/mach-nexell/tieoff.c b/arch/arm/mach-nexell/tieoff.c
> index 5a4744c296a2..51cca6744d6f 100644
> --- a/arch/arm/mach-nexell/tieoff.c
> +++ b/arch/arm/mach-nexell/tieoff.c
> @@ -4,7 +4,6 @@
> * Youngbok, Park <park@nexell.co.kr>
> */
>
> -#include <common.h>
> #include <asm/arch/nexell.h>
> #include <asm/arch/clk.h>
> #include <asm/arch/reset.h>
> diff --git a/arch/arm/mach-nexell/timer.c b/arch/arm/mach-nexell/timer.c
> index 3b311fd22a56..b35c7b1bb33a 100644
> --- a/arch/arm/mach-nexell/timer.c
> +++ b/arch/arm/mach-nexell/timer.c
> @@ -4,7 +4,6 @@
> * Hyunseok, Jung <hsjung@nexell.co.kr>
> */
>
> -#include <common.h>
> #include <log.h>
>
> #include <asm/io.h>
^ permalink raw reply [flat|nested] 41+ messages in thread
end of thread, other threads:[~2024-05-08 17:38 UTC | newest]
Thread overview: 41+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-30 13:35 [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
2024-04-30 13:35 ` [PATCH 02/33] include: Add missing headers in a few instances Tom Rini
2024-04-30 13:35 ` [PATCH 03/33] arm: xilinx: Remove <common.h> and add needed includes Tom Rini
2024-04-30 13:35 ` [PATCH 04/33] arm: u8500: " Tom Rini
2024-04-30 14:18 ` Linus Walleij
2024-04-30 13:35 ` [PATCH 05/33] arm: tegra: " Tom Rini
2024-04-30 13:35 ` [PATCH 06/33] arm: stm32/stm32mp: " Tom Rini
2024-04-30 13:35 ` [PATCH 07/33] arm: sunxi: " Tom Rini
2024-04-30 14:23 ` Andre Przywara
2024-04-30 13:35 ` [PATCH 08/33] arm: socfpga: " Tom Rini
2024-04-30 13:35 ` [PATCH 09/33] arm: s5pc1xx: " Tom Rini
2024-04-30 13:35 ` [PATCH 10/33] arm: rockchip: " Tom Rini
2024-04-30 13:35 ` [PATCH 11/33] arm: owl: " Tom Rini
2024-04-30 13:35 ` [PATCH 12/33] arm: orion5x: " Tom Rini
2024-04-30 13:35 ` [PATCH 13/33] arm: omap2: " Tom Rini
2024-04-30 13:35 ` [PATCH 14/33] arm: octeontx2: " Tom Rini
2024-04-30 13:35 ` [PATCH 15/33] arm: octeontx: " Tom Rini
2024-04-30 13:35 ` [PATCH 16/33] arm: npcm: " Tom Rini
2024-04-30 13:35 ` [PATCH 17/33] arm: nexell: " Tom Rini
2024-05-08 17:37 ` Stefan Bosch
2024-04-30 13:35 ` [PATCH 18/33] arm: mvebu: " Tom Rini
2024-04-30 13:35 ` [PATCH 19/33] arm: meson: " Tom Rini
2024-05-02 7:39 ` Neil Armstrong
2024-04-30 13:35 ` [PATCH 20/33] arm: mediatek: " Tom Rini
2024-04-30 13:35 ` [PATCH 21/33] arm: lpc32xx: " Tom Rini
2024-04-30 13:35 ` [PATCH 22/33] arm: kirkwood: " Tom Rini
2024-04-30 13:35 ` [PATCH 23/33] arm: imx: " Tom Rini
2024-04-30 23:51 ` Peng Fan
2024-04-30 13:35 ` [PATCH 24/33] arm: histb: " Tom Rini
2024-04-30 13:35 ` [PATCH 25/33] arm: highbank: " Tom Rini
2024-04-30 13:35 ` [PATCH 26/33] arm: exynos: " Tom Rini
2024-04-30 13:35 ` [PATCH 27/33] arm: davinci: " Tom Rini
2024-04-30 13:35 ` [PATCH 28/33] arm: bcm: " Tom Rini
2024-04-30 13:35 ` [PATCH 29/33] arm: at91: " Tom Rini
2024-04-30 13:35 ` [PATCH 30/33] arm: aspeed: " Tom Rini
2024-05-01 9:38 ` ChiaWei Wang
2024-04-30 13:35 ` [PATCH 31/33] arm: apple: " Tom Rini
2024-04-30 13:35 ` [PATCH 32/33] arm: fsl-layerscape: " Tom Rini
2024-04-30 23:51 ` Peng Fan
2024-04-30 13:35 ` [PATCH 33/33] arm: " Tom Rini
2024-05-07 14:02 ` [PATCH 01/33] arm: mach-versatile: Remove dead code Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.