diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-02 22:05:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-02 22:05:35 -0500 |
| commit | a4ef0657e3075d0f951d78cc1398cb7e05af648a (patch) | |
| tree | 9a4387de5845e6fd1331f0af32bfd82fac9eb039 /arch/arm/cpu | |
| parent | 357040645f9f56b33909520483df9f840be7e181 (diff) | |
| parent | cb3ef6810a27c8ddf5db8694bcef9337f27d12ce (diff) | |
| download | u-boot-a4ef0657e3075d0f951d78cc1398cb7e05af648a.tar.gz | |
Merge branch '2019-12-02-master-imports'
- A large series of clean-ups to reduce common.h contents
Diffstat (limited to 'arch/arm/cpu')
54 files changed, 75 insertions, 13 deletions
diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c index 8aee1539a9..177d1f40b9 100644 --- a/arch/arm/cpu/arm11/cpu.c +++ b/arch/arm/cpu/arm11/cpu.c @@ -16,6 +16,8 @@ #include <common.h> #include <command.h> +#include <cpu_func.h> +#include <irq_func.h> #include <asm/system.h> static void cache_flush(void); @@ -29,7 +31,7 @@ int cleanup_before_linux (void) * we turn off caches etc ... */ - disable_interrupts (); + disable_interrupts(); /* turn off I/D-cache */ icache_disable(); diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c index 2ef133f133..305713e786 100644 --- a/arch/arm/cpu/arm920t/cpu.c +++ b/arch/arm/cpu/arm920t/cpu.c @@ -14,6 +14,8 @@ #include <common.h> #include <command.h> +#include <cpu_func.h> +#include <irq_func.h> #include <asm/system.h> static void cache_flush(void); @@ -27,7 +29,7 @@ int cleanup_before_linux (void) * we turn off caches etc ... */ - disable_interrupts (); + disable_interrupts(); /* turn off I/D-cache */ icache_disable(); diff --git a/arch/arm/cpu/arm920t/ep93xx/timer.c b/arch/arm/cpu/arm920t/ep93xx/timer.c index 49bf49bbd3..4829c996be 100644 --- a/arch/arm/cpu/arm920t/ep93xx/timer.c +++ b/arch/arm/cpu/arm920t/ep93xx/timer.c @@ -12,6 +12,7 @@ */ #include <common.h> +#include <time.h> #include <linux/types.h> #include <asm/arch/ep93xx.h> #include <asm/io.h> diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c index 96fff3f683..17081ddb6d 100644 --- a/arch/arm/cpu/arm920t/imx/timer.c +++ b/arch/arm/cpu/arm920t/imx/timer.c @@ -13,6 +13,7 @@ */ #include <common.h> +#include <time.h> #if defined (CONFIG_IMX) #include <asm/arch/imx-regs.h> diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c index 4cd8511414..0c81de7e36 100644 --- a/arch/arm/cpu/arm926ejs/armada100/cpu.c +++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <asm/arch/cpu.h> #include <asm/arch/armada100.h> diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c index d2ecbd07e2..6c6948a8ef 100644 --- a/arch/arm/cpu/arm926ejs/armada100/timer.c +++ b/arch/arm/cpu/arm926ejs/armada100/timer.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <time.h> #include <asm/arch/cpu.h> #include <asm/arch/armada100.h> diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c index 16eea693d1..7b7eaaf31d 100644 --- a/arch/arm/cpu/arm926ejs/cache.c +++ b/arch/arm/cpu/arm926ejs/cache.c @@ -3,6 +3,7 @@ * (C) Copyright 2011 * Ilya Yanok, EmCraft Systems */ +#include <cpu_func.h> #include <linux/types.h> #include <common.h> diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c index d7cffe8b69..6ab320da7d 100644 --- a/arch/arm/cpu/arm926ejs/cpu.c +++ b/arch/arm/cpu/arm926ejs/cpu.c @@ -14,6 +14,8 @@ #include <common.h> #include <command.h> +#include <cpu_func.h> +#include <irq_func.h> #include <asm/system.h> static void cache_flush(void); @@ -27,7 +29,7 @@ int cleanup_before_linux (void) * we turn off caches etc ... */ - disable_interrupts (); + disable_interrupts(); /* turn off I/D-cache */ diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c index 5117177474..4c59a44f7e 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c +++ b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <netdev.h> #include <asm/arch/cpu.h> #include <asm/arch/clk.h> diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c b/arch/arm/cpu/arm926ejs/lpc32xx/timer.c index b3ca686040..3a896d10ca 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c +++ b/arch/arm/cpu/arm926ejs/lpc32xx/timer.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <time.h> #include <asm/arch/cpu.h> #include <asm/arch/clk.h> #include <asm/arch/timer.h> diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c index 5fcf06ae1a..eeb61d0d10 100644 --- a/arch/arm/cpu/arm926ejs/mx25/generic.c +++ b/arch/arm/cpu/arm926ejs/mx25/generic.c @@ -11,6 +11,7 @@ #include <common.h> #include <div64.h> #include <netdev.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/arch-imx/cpu.h> #include <asm/arch/imx-regs.h> diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c index 08b1b4de71..9bed0e91be 100644 --- a/arch/arm/cpu/arm926ejs/mx27/generic.c +++ b/arch/arm/cpu/arm926ejs/mx27/generic.c @@ -7,6 +7,7 @@ #include <common.h> #include <div64.h> #include <netdev.h> +#include <vsprintf.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c index 94b5d454e9..f51f0df8ec 100644 --- a/arch/arm/cpu/arm926ejs/mx27/timer.c +++ b/arch/arm/cpu/arm926ejs/mx27/timer.c @@ -17,6 +17,7 @@ #include <common.h> #include <div64.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c index cb361ac65c..5b3b51ce15 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c @@ -8,6 +8,7 @@ #include <common.h> #include <config.h> +#include <serial.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h> diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c index 7492ba46dc..226401dd6e 100644 --- a/arch/arm/cpu/arm926ejs/mxs/timer.c +++ b/arch/arm/cpu/arm926ejs/mxs/timer.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h> diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c index d36484c9d6..ccf944f814 100644 --- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c +++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> +#include <cpu_func.h> #include <env.h> #include <i2c.h> #include <net.h> diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c index e7b5bda1bc..28c09e9fd6 100644 --- a/arch/arm/cpu/arm926ejs/spear/timer.c +++ b/arch/arm/cpu/arm926ejs/spear/timer.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/spr_gpt.h> diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c index 3b4f5de8f6..fb0ea5e817 100644 --- a/arch/arm/cpu/arm946es/cpu.c +++ b/arch/arm/cpu/arm946es/cpu.c @@ -14,6 +14,8 @@ #include <common.h> #include <command.h> +#include <cpu_func.h> +#include <irq_func.h> #include <asm/system.h> #include <asm/io.h> @@ -28,7 +30,7 @@ int cleanup_before_linux (void) * we turn off caches etc ... */ - disable_interrupts (); + disable_interrupts(); /* ARM926E-S needs the protection unit enabled for the icache to have * been enabled - left for possible later use diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c index 5de63053d5..2eb571050a 100644 --- a/arch/arm/cpu/armv7/arch_timer.c +++ b/arch/arm/cpu/armv7/arch_timer.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <time.h> #include <asm/io.h> #include <div64.h> #include <bootstage.h> diff --git a/arch/arm/cpu/armv7/cache_v7.c b/arch/arm/cpu/armv7/cache_v7.c index 0dc4ebf694..99eb7db342 100644 --- a/arch/arm/cpu/armv7/cache_v7.c +++ b/arch/arm/cpu/armv7/cache_v7.c @@ -4,6 +4,7 @@ * Texas Instruments, <www.ti.com> * Aneesh V <aneesh@ti.com> */ +#include <cpu_func.h> #include <linux/types.h> #include <common.h> #include <asm/armv7.h> diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c index 44f2757267..68807d2099 100644 --- a/arch/arm/cpu/armv7/cpu.c +++ b/arch/arm/cpu/armv7/cpu.c @@ -16,6 +16,8 @@ #include <common.h> #include <command.h> +#include <cpu_func.h> +#include <irq_func.h> #include <asm/system.h> #include <asm/cache.h> #include <asm/armv7.h> diff --git a/arch/arm/cpu/armv7/exception_level.c b/arch/arm/cpu/armv7/exception_level.c index 274f03d8bb..6648aed291 100644 --- a/arch/arm/cpu/armv7/exception_level.c +++ b/arch/arm/cpu/armv7/exception_level.c @@ -10,6 +10,7 @@ #include <common.h> #include <bootm.h> +#include <cpu_func.h> #include <asm/armv7.h> #include <asm/secure.h> #include <asm/setjmp.h> diff --git a/arch/arm/cpu/armv7/iproc-common/hwinit-common.c b/arch/arm/cpu/armv7/iproc-common/hwinit-common.c index 70431ecf6b..a5445338cb 100644 --- a/arch/arm/cpu/armv7/iproc-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/iproc-common/hwinit-common.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) void enable_caches(void) diff --git a/arch/arm/cpu/armv7/iproc-common/timer.c b/arch/arm/cpu/armv7/iproc-common/timer.c index aaa767db13..668b5e11a6 100644 --- a/arch/arm/cpu/armv7/iproc-common/timer.c +++ b/arch/arm/cpu/armv7/iproc-common/timer.c @@ -5,6 +5,7 @@ #include <common.h> #include <div64.h> +#include <time.h> #include <asm/io.h> #include <asm/iproc-common/timer.h> #include <asm/iproc-common/sysmap.h> diff --git a/arch/arm/cpu/armv7/kona-common/hwinit-common.c b/arch/arm/cpu/armv7/kona-common/hwinit-common.c index 10e7488879..6bf89e07d8 100644 --- a/arch/arm/cpu/armv7/kona-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/kona-common/hwinit-common.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <linux/sizes.h> #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index 9ccfe1042c..664c9c1f4d 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -4,6 +4,8 @@ */ #include <common.h> +#include <cpu_func.h> +#include <vsprintf.h> #include <asm/arch/clock.h> #include <asm/io.h> #include <asm/arch/immap_ls102xa.h> diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c index df64f5415a..4a4b3c6f23 100644 --- a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c +++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c @@ -6,6 +6,7 @@ */ #include <config.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/psci.h> #include <asm/arch/immap_ls102xa.h> diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c index e79360ada8..a5f4e31ac7 100644 --- a/arch/arm/cpu/armv7/ls102xa/timer.c +++ b/arch/arm/cpu/armv7/ls102xa/timer.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <time.h> #include <asm/io.h> #include <div64.h> #include <asm/arch/immap_ls102xa.h> diff --git a/arch/arm/cpu/armv7/mpu_v7r.c b/arch/arm/cpu/armv7/mpu_v7r.c index 7adecffff8..6deecfdc23 100644 --- a/arch/arm/cpu/armv7/mpu_v7r.c +++ b/arch/arm/cpu/armv7/mpu_v7r.c @@ -8,6 +8,7 @@ #include <common.h> #include <command.h> +#include <cpu_func.h> #include <asm/armv7.h> #include <asm/system.h> #include <asm/barriers.h> diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c index 0048cd8067..e54cfb06dc 100644 --- a/arch/arm/cpu/armv7/s5p-common/timer.c +++ b/arch/arm/cpu/armv7/s5p-common/timer.c @@ -8,6 +8,7 @@ #include <common.h> #include <div64.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/pwm.h> #include <asm/arch/clk.h> diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c index d1b763df8e..695bdd7a5c 100644 --- a/arch/arm/cpu/armv7/stv0991/timer.c +++ b/arch/arm/cpu/armv7/stv0991/timer.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch-stv0991/hardware.h> #include <asm/arch-stv0991/stv0991_cgu.h> diff --git a/arch/arm/cpu/armv7/sunxi/timer.c b/arch/arm/cpu/armv7/sunxi/timer.c index 304c1ac5f9..6bda5fbbb6 100644 --- a/arch/arm/cpu/armv7/sunxi/timer.c +++ b/arch/arm/cpu/armv7/sunxi/timer.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <time.h> #include <asm/io.h> #include <asm/arch/timer.h> diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c index 7e4641fd32..806c6adf38 100644 --- a/arch/arm/cpu/armv7/vf610/generic.c +++ b/arch/arm/cpu/armv7/vf610/generic.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> diff --git a/arch/arm/cpu/armv7/vf610/timer.c b/arch/arm/cpu/armv7/vf610/timer.c index 821a279b63..f858de953d 100644 --- a/arch/arm/cpu/armv7/vf610/timer.c +++ b/arch/arm/cpu/armv7/vf610/timer.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <time.h> #include <asm/io.h> #include <div64.h> #include <asm/arch/imx-regs.h> diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c index be14eb9376..26c93393cd 100644 --- a/arch/arm/cpu/armv7/virt-v7.c +++ b/arch/arm/cpu/armv7/virt-v7.c @@ -9,6 +9,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <asm/armv7.h> #include <asm/gic.h> #include <asm/io.h> diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c index 1106bead41..6dc2ca8e73 100644 --- a/arch/arm/cpu/armv7m/cache.c +++ b/arch/arm/cpu/armv7m/cache.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <errno.h> #include <asm/armv7m.h> #include <asm/io.h> diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c index 55ea0787a7..7f827da033 100644 --- a/arch/arm/cpu/armv7m/cpu.c +++ b/arch/arm/cpu/armv7m/cpu.c @@ -8,6 +8,8 @@ */ #include <common.h> +#include <cpu_func.h> +#include <irq_func.h> #include <asm/io.h> #include <asm/armv7m.h> diff --git a/arch/arm/cpu/armv7m/systick-timer.c b/arch/arm/cpu/armv7m/systick-timer.c index d04f67ae16..5c310d306d 100644 --- a/arch/arm/cpu/armv7m/systick-timer.c +++ b/arch/arm/cpu/armv7m/systick-timer.c @@ -22,6 +22,7 @@ */ #include <common.h> +#include <time.h> #include <asm/io.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index e500e722e5..c1a08fb4ac 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -8,6 +8,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <asm/system.h> #include <asm/armv8/mmu.h> diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c index b312b3be35..2467e0b87b 100644 --- a/arch/arm/cpu/armv8/cpu.c +++ b/arch/arm/cpu/armv8/cpu.c @@ -12,6 +12,8 @@ #include <common.h> #include <command.h> +#include <cpu_func.h> +#include <irq_func.h> #include <asm/system.h> #include <asm/secure.h> #include <linux/compiler.h> diff --git a/arch/arm/cpu/armv8/exception_level.c b/arch/arm/cpu/armv8/exception_level.c index 57824eb2ac..9c1f4a8ca8 100644 --- a/arch/arm/cpu/armv8/exception_level.c +++ b/arch/arm/cpu/armv8/exception_level.c @@ -10,6 +10,7 @@ #include <common.h> #include <bootm.h> +#include <cpu_func.h> #include <asm/setjmp.h> /** diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 83a3319321..6c87c1b11a 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -5,8 +5,10 @@ */ #include <common.h> +#include <cpu_func.h> #include <env.h> #include <fsl_ddr_sdram.h> +#include <vsprintf.h> #include <asm/io.h> #include <linux/errno.h> #include <asm/system.h> @@ -38,6 +40,7 @@ #include <fsl_validate.h> #endif #endif +#include <linux/mii.h> DECLARE_GLOBAL_DATA_PTR; 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 6d82cfeb58..25e9a495f7 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <linux/compiler.h> #include <asm/io.h> #include <asm/processor.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 ede96742aa..4b047a39c0 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <linux/compiler.h> #include <fsl_ifc.h> #include <asm/processor.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c index 7627fd13e7..ca07c68863 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/system.h> #include <asm/arch/mp.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index adfa51b6be..70933a2e03 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -8,6 +8,7 @@ #include <env.h> #include <fsl_immap.h> #include <fsl_ifc.h> +#include <init.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/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index 3f6a5f6a42..58a39e1123 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <env.h> #include <spl.h> #include <asm/io.h> diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c index c1706dcec1..46e63294fe 100644 --- a/arch/arm/cpu/armv8/generic_timer.c +++ b/arch/arm/cpu/armv8/generic_timer.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> +#include <time.h> #include <asm/system.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c index b4cb67a66a..b5a9513ead 100644 --- a/arch/arm/cpu/armv8/s32v234/cpu.c +++ b/arch/arm/cpu/armv8/s32v234/cpu.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <asm/io.h> #include <asm/system.h> #include <asm/armv8/mmu.h> diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 8dc0ac9266..11f9b4df38 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <errno.h> #include <linux/kernel.h> #include <asm/io.h> diff --git a/arch/arm/cpu/pxa/cache.c b/arch/arm/cpu/pxa/cache.c index 5cd4a9524b..d4dfe7f6d8 100644 --- a/arch/arm/cpu/pxa/cache.c +++ b/arch/arm/cpu/pxa/cache.c @@ -3,6 +3,7 @@ * (C) Copyright 2016 Vasily Khoruzhick <anarsoul@gmail.com> */ +#include <cpu_func.h> #include <linux/types.h> #include <common.h> diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c index 0b28f0a3ef..002ff7988b 100644 --- a/arch/arm/cpu/pxa/pxa2xx.c +++ b/arch/arm/cpu/pxa/pxa2xx.c @@ -10,6 +10,8 @@ */ #include <common.h> +#include <cpu_func.h> +#include <irq_func.h> #include <asm/arch/pxa-regs.h> #include <asm/io.h> #include <asm/system.h> @@ -39,13 +41,6 @@ int cleanup_before_linux(void) return 0; } -void pxa_wait_ticks(int ticks) -{ - writel(0, OSCR); - while (readl(OSCR) < ticks) - asm volatile("" : : : "memory"); -} - inline void writelrb(uint32_t val, uint32_t addr) { writel(val, addr); @@ -136,8 +131,11 @@ void pxa2xx_dram_init(void) writelrb(CONFIG_SYS_MDCNFG_VAL & ~(MDCNFG_DE0 | MDCNFG_DE1 | MDCNFG_DE2 | MDCNFG_DE3), MDCNFG); + /* Wait for the clock to the SDRAMs to stabilize, 100..200 usec. */ - pxa_wait_ticks(0x300); + writel(0, OSCR); + while (readl(OSCR) < 0x300) + asm volatile("" : : : "memory"); /* * 8) Trigger a number (usually 8) refresh cycles by attempting diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c index f81ebc9ba2..91e100af1b 100644 --- a/arch/arm/cpu/sa1100/cpu.c +++ b/arch/arm/cpu/sa1100/cpu.c @@ -15,6 +15,8 @@ #include <common.h> #include <command.h> +#include <cpu_func.h> +#include <irq_func.h> #include <asm/system.h> #include <asm/io.h> @@ -29,7 +31,7 @@ int cleanup_before_linux (void) * just disable everything that can disturb booting linux */ - disable_interrupts (); + disable_interrupts(); /* turn off I-cache */ icache_disable(); diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c index 0fac5c1707..c6b1b2c177 100644 --- a/arch/arm/cpu/sa1100/timer.c +++ b/arch/arm/cpu/sa1100/timer.c @@ -11,6 +11,7 @@ #include <common.h> #include <SA-1100.h> +#include <time.h> static ulong get_timer_masked (void) { |