| Message ID | 20200510113946.v3.16.I7842aa4633dc057654989f645f709d7240ab2cce@changeid |
|---|---|
| State | Accepted |
| Commit | 8ad92118dc6377d4cd4c3b784182be008c63cf16 |
| Headers | show |
| Series | common: Further reduce the size of common.h | expand |
On Sun, May 10, 2020 at 11:40:07AM -0600, Simon Glass wrote: > Move this uncommon header out of the common header. > > Signed-off-by: Simon Glass <sjg at chromium.org> Applied to u-boot/master, thanks!
diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c index af8facad53..4defe98477 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <asm-offsets.h> #include <mpc83xx.h> #include <ioports.h> #include <asm/io.h> diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c index 34c8187259..2c61f2b81d 100644 --- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c +++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <asm-offsets.h> #include <clock_legacy.h> #include <mpc83xx.h> #include <time.h> diff --git a/arch/powerpc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c index 37e706238b..95215a0b82 100644 --- a/arch/powerpc/cpu/mpc85xx/commproc.c +++ b/arch/powerpc/cpu/mpc85xx/commproc.c @@ -22,6 +22,7 @@ * currently no deallocator for this memory. */ #include <common.h> +#include <asm-offsets.h> #include <asm/cpm_85xx.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c index 40cb24dd54..c519e8bd4b 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <asm-offsets.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/fsl_law.h> diff --git a/arch/powerpc/cpu/mpc86xx/cpu_init.c b/arch/powerpc/cpu/mpc86xx/cpu_init.c index 34752a34af..a17091d2ff 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c @@ -9,6 +9,7 @@ * cpu_init.c - low level cpu init */ +#include <asm-offsets.h> #include <config.h> #include <common.h> #include <init.h> diff --git a/include/common.h b/include/common.h index 395d1d3901..976046e620 100644 --- a/include/common.h +++ b/include/common.h @@ -16,7 +16,6 @@ #include <config.h> #include <errno.h> #include <time.h> -#include <asm-offsets.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/delay.h> diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c index 26175132f3..b17651ed63 100644 --- a/lib/asm-offsets.c +++ b/lib/asm-offsets.c @@ -12,6 +12,7 @@ */ #include <common.h> +#include <asm-offsets.h> #include <linux/kbuild.h>
Move this uncommon header out of the common header. Signed-off-by: Simon Glass <sjg at chromium.org> --- Changes in v3: None Changes in v2: None arch/powerpc/cpu/mpc83xx/cpu_init.c | 1 + arch/powerpc/cpu/mpc83xx/spl_minimal.c | 1 + arch/powerpc/cpu/mpc85xx/commproc.c | 1 + arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 1 + arch/powerpc/cpu/mpc86xx/cpu_init.c | 1 + include/common.h | 1 - lib/asm-offsets.c | 1 + 7 files changed, 6 insertions(+), 1 deletion(-)