m68k: Remove common.h usage

We can remove common.h from most cases of the code here, and only a few places need an additional header instead. Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Angelo Dureghello <angelo@kernel-space.org>
2025-04-16 18:04:48 +00:00 · 2023-10-12 19:03:56 -04:00 · 2023-10-12 19:03:56 -04:00 · 07011890a6
commit 07011890a6
parent 60c08dd771
39 changed files with 17 additions and 30 deletions
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@ -8,7 +8,6 @@
 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
 */

-#include <common.h>
 #include <init.h>
 #include <net.h>
 #include <vsprintf.h>
--- a/arch/m68k/cpu/mcf523x/cpu_init.c
+++ b/arch/m68k/cpu/mcf523x/cpu_init.c
@ -8,7 +8,6 @@
 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
 */

-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <watchdog.h>
--- a/arch/m68k/cpu/mcf523x/interrupts.c
+++ b/arch/m68k/cpu/mcf523x/interrupts.c
@ -6,7 +6,6 @@
 */

 /* CPU specific interrupt routine */
-#include <common.h>
 #include <irq_func.h>
 #include <asm/immap.h>
 #include <asm/io.h>
--- a/arch/m68k/cpu/mcf523x/speed.c
+++ b/arch/m68k/cpu/mcf523x/speed.c
@ -8,7 +8,6 @@
 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
 */

-#include <common.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@ -13,7 +13,6 @@
 * Copyright (C) 2012 Freescale Semiconductor, Inc. All Rights Reserved.
 */

-#include <common.h>
 #include <init.h>
 #include <net.h>
 #include <vsprintf.h>
--- a/arch/m68k/cpu/mcf52x2/cpu_init.c
+++ b/arch/m68k/cpu/mcf52x2/cpu_init.c
@ -17,7 +17,7 @@
 * Copyright (C) 2008 Arthur Shipkowski (art@videon-central.com)
 */

-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <watchdog.h>
@ -25,7 +25,6 @@
 #include <asm/io.h>

 #if defined(CONFIG_CMD_NET)
-#include <config.h>
 #include <net.h>
 #include <asm/fec.h>
 #endif
--- a/arch/m68k/cpu/mcf52x2/interrupts.c
+++ b/arch/m68k/cpu/mcf52x2/interrupts.c
@ -7,7 +7,6 @@
 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
 */

-#include <common.h>
 #include <irq_func.h>
 #include <watchdog.h>
 #include <asm/processor.h>
--- a/arch/m68k/cpu/mcf52x2/speed.c
+++ b/arch/m68k/cpu/mcf52x2/speed.c
@ -7,7 +7,6 @@
 * Hayden Fraser (Hayden.Fraser@freescale.com)
 */

-#include <common.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
--- a/arch/m68k/cpu/mcf530x/cpu.c
+++ b/arch/m68k/cpu/mcf530x/cpu.c
@ -4,7 +4,6 @@
 *
 */

-#include <common.h>
 #include <command.h>
 #include <init.h>
 #include <vsprintf.h>
--- a/arch/m68k/cpu/mcf530x/cpu_init.c
+++ b/arch/m68k/cpu/mcf530x/cpu_init.c
@ -4,7 +4,6 @@
 *
 */

-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <watchdog.h>
--- a/arch/m68k/cpu/mcf530x/interrupts.c
+++ b/arch/m68k/cpu/mcf530x/interrupts.c
@ -4,7 +4,6 @@
 *
 */

-#include <common.h>
 #include <irq_func.h>
 #include <asm/immap.h>
 #include <asm/io.h>
--- a/arch/m68k/cpu/mcf530x/speed.c
+++ b/arch/m68k/cpu/mcf530x/speed.c
@ -4,7 +4,6 @@
 *
 */

-#include <common.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@ -8,7 +8,6 @@
 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
 */

-#include <common.h>
 #include <init.h>
 #include <net.h>
 #include <vsprintf.h>
--- a/arch/m68k/cpu/mcf532x/cpu_init.c
+++ b/arch/m68k/cpu/mcf532x/cpu_init.c
@ -8,7 +8,6 @@
 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
 */

-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <watchdog.h>
--- a/arch/m68k/cpu/mcf532x/interrupts.c
+++ b/arch/m68k/cpu/mcf532x/interrupts.c
@ -6,7 +6,6 @@
 */

 /* CPU specific interrupt routine */
-#include <common.h>
 #include <irq_func.h>
 #include <asm/immap.h>
 #include <asm/io.h>
--- a/arch/m68k/cpu/mcf532x/speed.c
+++ b/arch/m68k/cpu/mcf532x/speed.c
@ -8,7 +8,6 @@
 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
 */

-#include <common.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@ -8,7 +8,6 @@
 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
 */

-#include <common.h>
 #include <init.h>
 #include <net.h>
 #include <vsprintf.h>
--- a/arch/m68k/cpu/mcf5445x/cpu_init.c
+++ b/arch/m68k/cpu/mcf5445x/cpu_init.c
@ -8,7 +8,6 @@
 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
 */

-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <watchdog.h>
--- a/arch/m68k/cpu/mcf5445x/dspi.c
+++ b/arch/m68k/cpu/mcf5445x/dspi.c
@ -6,7 +6,6 @@
 * CPU specific dspi routines
 */

-#include <common.h>
 #include <asm/immap.h>
 #include <asm/io.h>

--- a/arch/m68k/cpu/mcf5445x/interrupts.c
+++ b/arch/m68k/cpu/mcf5445x/interrupts.c
@ -9,7 +9,6 @@
 */

 /* CPU specific interrupt routine */
-#include <common.h>
 #include <irq_func.h>
 #include <asm/immap.h>
 #include <asm/io.h>
--- a/arch/m68k/cpu/mcf5445x/speed.c
+++ b/arch/m68k/cpu/mcf5445x/speed.c
@ -5,7 +5,6 @@
 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
 */

-#include <common.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
--- a/arch/m68k/cpu/mcf5445x/start.S
+++ b/arch/m68k/cpu/mcf5445x/start.S
@ -7,7 +7,6 @@
 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
 */

-#include <common.h>
 #include <asm-offsets.h>
 #include <config.h>
 #include <asm/cache.h>
--- a/arch/m68k/include/asm/immap.h
+++ b/arch/m68k/include/asm/immap.h
@ -9,6 +9,7 @@
 #ifndef __IMMAP_H
 #define __IMMAP_H

+#include <config.h>
 #if defined(CONFIG_MCF520x)
 #include <asm/immap_520x.h>
 #include <asm/m520x.h>
--- a/arch/m68k/include/asm/immap_520x.h
+++ b/arch/m68k/include/asm/immap_520x.h
@ -36,6 +36,7 @@
 #define MMAP_GPIO	(CFG_SYS_MBAR + 0x000A4000)
 #define MMAP_SDRAM	(CFG_SYS_MBAR + 0x000A8000)

+#include <linux/types.h>
 #include <asm/coldfire/crossbar.h>
 #include <asm/coldfire/edma.h>
 #include <asm/coldfire/eport.h>
--- a/arch/m68k/include/asm/immap_5235.h
+++ b/arch/m68k/include/asm/immap_5235.h
@ -46,6 +46,7 @@
 #define MMAP_ETPU	(CFG_SYS_MBAR + 0x001D0000)
 #define MMAP_CAN2	(CFG_SYS_MBAR + 0x001F0000)

+#include <linux/types.h>
 #include <asm/coldfire/eport.h>
 #include <asm/coldfire/flexbus.h>
 #include <asm/coldfire/flexcan.h>
--- a/arch/m68k/include/asm/immap_5272.h
+++ b/arch/m68k/include/asm/immap_5272.h
@ -27,6 +27,7 @@
 #define MMAP_FEC	(CFG_SYS_MBAR + 0x00000840)
 #define MMAP_USB	(CFG_SYS_MBAR + 0x00001000)

+#include <linux/types.h>
 #include <asm/coldfire/pwm.h>

 /* System configuration registers */
--- a/arch/m68k/include/asm/immap_5275.h
+++ b/arch/m68k/include/asm/immap_5275.h
@ -49,6 +49,7 @@
 #define MMAP_USB	(CFG_SYS_MBAR + 0x001C0000)
 #define MMAP_PWM0	(CFG_SYS_MBAR + 0x001D0000)

+#include <linux/types.h>
 #include <asm/coldfire/eport.h>
 #include <asm/coldfire/flexbus.h>
 #include <asm/coldfire/intctrl.h>
--- a/arch/m68k/include/asm/immap_5282.h
+++ b/arch/m68k/include/asm/immap_5282.h
@ -45,6 +45,7 @@
 #define MMAP_CFMC	(CFG_SYS_MBAR + 0x001D0000)
 #define MMAP_CFMMEM	(CFG_SYS_MBAR + 0x04000000)

+#include <linux/types.h>
 #include <asm/coldfire/eport.h>
 #include <asm/coldfire/flexbus.h>
 #include <asm/coldfire/flexcan.h>
--- a/arch/m68k/include/asm/immap_5301x.h
+++ b/arch/m68k/include/asm/immap_5301x.h
@ -50,6 +50,7 @@
 #define MMAP_IIM	(CFG_SYS_MBAR + 0x000C8000)
 #define MMAP_ESDHC	(CFG_SYS_MBAR + 0x000CC000)

+#include <linux/types.h>
 #include <asm/coldfire/crossbar.h>
 #include <asm/coldfire/dspi.h>
 #include <asm/coldfire/edma.h>
--- a/arch/m68k/include/asm/immap_5307.h
+++ b/arch/m68k/include/asm/immap_5307.h
@ -17,6 +17,8 @@
 #define MMAP_UART1	(CFG_SYS_MBAR + 0x00000200)
 #define MMAP_GPIO	(CFG_SYS_MBAR + 0x00000244)

+#include <linux/types.h>
+
 typedef struct sim {
 	u8  rsr;
 	u8  sypcr;
--- a/arch/m68k/include/asm/immap_5329.h
+++ b/arch/m68k/include/asm/immap_5329.h
@ -51,6 +51,7 @@
 #define MMAP_SSI	0xFC0BC000
 #define MMAP_PLL	0xFC0C0000

+#include <linux/types.h>
 #include <asm/coldfire/crossbar.h>
 #include <asm/coldfire/edma.h>
 #include <asm/coldfire/eport.h>
--- a/arch/m68k/include/asm/immap_5441x.h
+++ b/arch/m68k/include/asm/immap_5441x.h
@ -76,6 +76,7 @@
 #define MMAP_CCM	0xEC090000
 #define MMAP_GPIO	0xEC094000

+#include <linux/types.h>
 #include <asm/coldfire/crossbar.h>
 #include <asm/coldfire/dspi.h>
 #include <asm/coldfire/edma.h>
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@ -6,8 +6,9 @@
 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 */

-#include <common.h>
+#include <config.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <asm/global_data.h>

 DECLARE_GLOBAL_DATA_PTR;
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@ -4,7 +4,6 @@
 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 */

-#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <env.h>
--- a/arch/m68k/lib/cache.c
+++ b/arch/m68k/lib/cache.c
@ -4,7 +4,7 @@
 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 */

-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <asm/immap.h>
 #include <asm/cache.h>
--- a/arch/m68k/lib/fec.c
+++ b/arch/m68k/lib/fec.c
@ -3,8 +3,8 @@
 * (C) 2019 Angelo Dureghello <angelo.dureghello@timesys.com>
 */

-#include <common.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>

--- a/arch/m68k/lib/interrupts.c
+++ b/arch/m68k/lib/interrupts.c
@ -7,7 +7,7 @@
 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
 */

-#include <common.h>
+#include <stdio.h>
 #include <irq_func.h>
 #include <watchdog.h>
 #include <asm/processor.h>
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@ -6,7 +6,6 @@
 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 */

-#include <common.h>
 #include <init.h>
 #include <irq_func.h>
 #include <time.h>
--- a/arch/m68k/lib/traps.c
+++ b/arch/m68k/lib/traps.c
@ -7,7 +7,6 @@
 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 */

-#include <common.h>
 #include <init.h>
 #include <watchdog.h>
 #include <command.h>