From 07011890a60fe45074defbe39f4dca90f82c4955 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 12 Oct 2023 19:03:56 -0400 Subject: [PATCH] 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 Acked-by: Angelo Dureghello --- arch/m68k/cpu/mcf523x/cpu.c | 1 - arch/m68k/cpu/mcf523x/cpu_init.c | 1 - arch/m68k/cpu/mcf523x/interrupts.c | 1 - arch/m68k/cpu/mcf523x/speed.c | 1 - arch/m68k/cpu/mcf52x2/cpu.c | 1 - arch/m68k/cpu/mcf52x2/cpu_init.c | 3 +-- arch/m68k/cpu/mcf52x2/interrupts.c | 1 - arch/m68k/cpu/mcf52x2/speed.c | 1 - arch/m68k/cpu/mcf530x/cpu.c | 1 - arch/m68k/cpu/mcf530x/cpu_init.c | 1 - arch/m68k/cpu/mcf530x/interrupts.c | 1 - arch/m68k/cpu/mcf530x/speed.c | 1 - arch/m68k/cpu/mcf532x/cpu.c | 1 - arch/m68k/cpu/mcf532x/cpu_init.c | 1 - arch/m68k/cpu/mcf532x/interrupts.c | 1 - arch/m68k/cpu/mcf532x/speed.c | 1 - arch/m68k/cpu/mcf5445x/cpu.c | 1 - arch/m68k/cpu/mcf5445x/cpu_init.c | 1 - arch/m68k/cpu/mcf5445x/dspi.c | 1 - arch/m68k/cpu/mcf5445x/interrupts.c | 1 - arch/m68k/cpu/mcf5445x/speed.c | 1 - arch/m68k/cpu/mcf5445x/start.S | 1 - arch/m68k/include/asm/immap.h | 1 + arch/m68k/include/asm/immap_520x.h | 1 + arch/m68k/include/asm/immap_5235.h | 1 + arch/m68k/include/asm/immap_5272.h | 1 + arch/m68k/include/asm/immap_5275.h | 1 + arch/m68k/include/asm/immap_5282.h | 1 + arch/m68k/include/asm/immap_5301x.h | 1 + arch/m68k/include/asm/immap_5307.h | 2 ++ arch/m68k/include/asm/immap_5329.h | 1 + arch/m68k/include/asm/immap_5441x.h | 1 + arch/m68k/lib/bdinfo.c | 3 ++- arch/m68k/lib/bootm.c | 1 - arch/m68k/lib/cache.c | 2 +- arch/m68k/lib/fec.c | 2 +- arch/m68k/lib/interrupts.c | 2 +- arch/m68k/lib/time.c | 1 - arch/m68k/lib/traps.c | 1 - 39 files changed, 17 insertions(+), 30 deletions(-) diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c index bef67767b4..c843a381ea 100644 --- 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 #include #include #include diff --git a/arch/m68k/cpu/mcf523x/cpu_init.c b/arch/m68k/cpu/mcf523x/cpu_init.c index 10be73822f..a05cbdcb38 100644 --- 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 #include #include #include diff --git a/arch/m68k/cpu/mcf523x/interrupts.c b/arch/m68k/cpu/mcf523x/interrupts.c index 09c7f9e67c..46c9207a93 100644 --- a/arch/m68k/cpu/mcf523x/interrupts.c +++ b/arch/m68k/cpu/mcf523x/interrupts.c @@ -6,7 +6,6 @@ */ /* CPU specific interrupt routine */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf523x/speed.c b/arch/m68k/cpu/mcf523x/speed.c index 6b08a12af0..2eb43cc7eb 100644 --- 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 #include #include #include diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c index 5042a38b3e..6bfde5e9bd 100644 --- 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 #include #include #include diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c index 99eb61f167..4506eb39ed 100644 --- 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 +#include #include #include #include @@ -25,7 +25,6 @@ #include #if defined(CONFIG_CMD_NET) -#include #include #include #endif diff --git a/arch/m68k/cpu/mcf52x2/interrupts.c b/arch/m68k/cpu/mcf52x2/interrupts.c index c5ed060073..264bdc7d6c 100644 --- 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 #include #include #include diff --git a/arch/m68k/cpu/mcf52x2/speed.c b/arch/m68k/cpu/mcf52x2/speed.c index 6c7628252b..538e4c623d 100644 --- 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 #include #include #include diff --git a/arch/m68k/cpu/mcf530x/cpu.c b/arch/m68k/cpu/mcf530x/cpu.c index 53a25d8362..92a0ef7689 100644 --- a/arch/m68k/cpu/mcf530x/cpu.c +++ b/arch/m68k/cpu/mcf530x/cpu.c @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf530x/cpu_init.c b/arch/m68k/cpu/mcf530x/cpu_init.c index dad47d87ab..8f6e668d10 100644 --- a/arch/m68k/cpu/mcf530x/cpu_init.c +++ b/arch/m68k/cpu/mcf530x/cpu_init.c @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf530x/interrupts.c b/arch/m68k/cpu/mcf530x/interrupts.c index 11686202dc..99cf863850 100644 --- a/arch/m68k/cpu/mcf530x/interrupts.c +++ b/arch/m68k/cpu/mcf530x/interrupts.c @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf530x/speed.c b/arch/m68k/cpu/mcf530x/speed.c index c8d079016f..6542fc43ab 100644 --- a/arch/m68k/cpu/mcf530x/speed.c +++ b/arch/m68k/cpu/mcf530x/speed.c @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c index 18d20a8926..6973af9d04 100644 --- 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 #include #include #include diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c index 844d2cd760..62a45f9631 100644 --- 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 #include #include #include diff --git a/arch/m68k/cpu/mcf532x/interrupts.c b/arch/m68k/cpu/mcf532x/interrupts.c index 4f72fa88e5..e37893c3e5 100644 --- a/arch/m68k/cpu/mcf532x/interrupts.c +++ b/arch/m68k/cpu/mcf532x/interrupts.c @@ -6,7 +6,6 @@ */ /* CPU specific interrupt routine */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c index 32ffac0813..166916526e 100644 --- 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 #include #include #include diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c index d9a71c6b92..b811ac355e 100644 --- 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 #include #include #include diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c index bc3a2f3aed..3277617120 100644 --- 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 #include #include #include diff --git a/arch/m68k/cpu/mcf5445x/dspi.c b/arch/m68k/cpu/mcf5445x/dspi.c index 456af171a4..13eb6ecee1 100644 --- a/arch/m68k/cpu/mcf5445x/dspi.c +++ b/arch/m68k/cpu/mcf5445x/dspi.c @@ -6,7 +6,6 @@ * CPU specific dspi routines */ -#include #include #include diff --git a/arch/m68k/cpu/mcf5445x/interrupts.c b/arch/m68k/cpu/mcf5445x/interrupts.c index 400f3dee87..913290086d 100644 --- a/arch/m68k/cpu/mcf5445x/interrupts.c +++ b/arch/m68k/cpu/mcf5445x/interrupts.c @@ -9,7 +9,6 @@ */ /* CPU specific interrupt routine */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf5445x/speed.c b/arch/m68k/cpu/mcf5445x/speed.c index 5c78eb9834..41cb9e999a 100644 --- 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 #include #include #include diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S index 5c3bfff791..f0264671d3 100644 --- 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 #include #include #include diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h index aafa4f40cb..411b00899c 100644 --- 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 #if defined(CONFIG_MCF520x) #include #include diff --git a/arch/m68k/include/asm/immap_520x.h b/arch/m68k/include/asm/immap_520x.h index 7c7443b968..d3c2f4a409 100644 --- 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 #include #include #include diff --git a/arch/m68k/include/asm/immap_5235.h b/arch/m68k/include/asm/immap_5235.h index a1825c2a94..d9b0be1d7d 100644 --- 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 #include #include #include diff --git a/arch/m68k/include/asm/immap_5272.h b/arch/m68k/include/asm/immap_5272.h index c5c3cc7512..5378ed1aac 100644 --- 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 #include /* System configuration registers */ diff --git a/arch/m68k/include/asm/immap_5275.h b/arch/m68k/include/asm/immap_5275.h index 9b8d71d30d..c4cce3f94f 100644 --- 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 #include #include #include diff --git a/arch/m68k/include/asm/immap_5282.h b/arch/m68k/include/asm/immap_5282.h index f810a4dd5c..e5f400e6ae 100644 --- 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 #include #include #include diff --git a/arch/m68k/include/asm/immap_5301x.h b/arch/m68k/include/asm/immap_5301x.h index e1f7858b10..3ade4f0475 100644 --- 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 #include #include #include diff --git a/arch/m68k/include/asm/immap_5307.h b/arch/m68k/include/asm/immap_5307.h index d6442d95b4..d96dd146ef 100644 --- 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 + typedef struct sim { u8 rsr; u8 sypcr; diff --git a/arch/m68k/include/asm/immap_5329.h b/arch/m68k/include/asm/immap_5329.h index dbf3a2260e..6f1795a207 100644 --- 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 #include #include #include diff --git a/arch/m68k/include/asm/immap_5441x.h b/arch/m68k/include/asm/immap_5441x.h index 708d0db755..c8f3effe24 100644 --- 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 #include #include #include diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c index 0b4629f1c8..3719f11c03 100644 --- 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 +#include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index f18bed235d..79d8b34c0d 100644 --- 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 #include #include #include diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c index 57e5632fdb..de04124404 100644 --- 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 +#include #include #include #include diff --git a/arch/m68k/lib/fec.c b/arch/m68k/lib/fec.c index eecea7a023..d6f238e4b3 100644 --- a/arch/m68k/lib/fec.c +++ b/arch/m68k/lib/fec.c @@ -3,8 +3,8 @@ * (C) 2019 Angelo Dureghello */ -#include #include +#include #include #include diff --git a/arch/m68k/lib/interrupts.c b/arch/m68k/lib/interrupts.c index 799daab561..175ec68953 100644 --- a/arch/m68k/lib/interrupts.c +++ b/arch/m68k/lib/interrupts.c @@ -7,7 +7,7 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include +#include #include #include #include diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index 61db1e6c50..4249488c01 100644 --- 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 #include #include #include diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c index 28fe803928..c283351181 100644 --- 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 #include #include #include -- 2.39.5