diff options
| author | Lei Wen <[leiwen@marvell.com]> | 2011-10-18 20:11:42 +0530 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-10-27 21:56:33 +0200 |
| commit | a7efd719f415833a833d6a8e46bcd470a0847ecc (patch) | |
| tree | ffc36b4bedcb43a492ed43a0b8cccbfafcadaa6c /arch | |
| parent | ab1b95521174e6705abec72c5f1756e8cdb22016 (diff) | |
| download | u-boot-imx-a7efd719f415833a833d6a8e46bcd470a0847ecc.zip u-boot-imx-a7efd719f415833a833d6a8e46bcd470a0847ecc.tar.gz u-boot-imx-a7efd719f415833a833d6a8e46bcd470a0847ecc.tar.bz2 | |
ARM: kirkwood: reduce dependence of including platform file
For files like the drivers/serial/serial.c, it must include the
platform file, as the CONFIG_SYS_NS16550_COM1 must reference to the
definition in the platform definition files.
Include the platform definition file in the config file, so that it
would decouple the dependence for the driver files.
Signed-off-by: Lei Wen <leiwen@marvell.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/dram.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/timer.c | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-kirkwood/config.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-kirkwood/kirkwood.h | 6 |
6 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c index b4a4c04..8f04ddb 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c @@ -26,6 +26,8 @@ #include <netdev.h> #include <asm/cache.h> #include <u-boot/md5.h> +#include <asm/io.h> +#include <asm/arch/cpu.h> #include <asm/arch/kirkwood.h> #include <hush.h> diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c index 2441554..181b3e7 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c @@ -24,6 +24,8 @@ #include <config.h> #include <common.h> +#include <asm/io.h> +#include <asm/arch/cpu.h> #include <asm/arch/kirkwood.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c index b2f0ad5..3da6c98 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c @@ -10,6 +10,8 @@ */ #include <common.h> +#include <asm/io.h> +#include <asm/arch/cpu.h> #include <asm/arch/kirkwood.h> #include <asm/arch/mpp.h> diff --git a/arch/arm/cpu/arm926ejs/kirkwood/timer.c b/arch/arm/cpu/arm926ejs/kirkwood/timer.c index b4f6cf8..a98f54c 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/timer.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/timer.c @@ -22,6 +22,7 @@ */ #include <common.h> +#include <asm/io.h> #include <asm/arch/kirkwood.h> #define UBOOT_CNTR 0 /* counter to use for uboot timer */ diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h index b393b1a..f17f82d 100644 --- a/arch/arm/include/asm/arch-kirkwood/config.h +++ b/arch/arm/include/asm/arch-kirkwood/config.h @@ -39,6 +39,7 @@ #error "SOC Name not defined" #endif /* CONFIG_KW88F6281 */ +#include <asm/arch/kirkwood.h> #define CONFIG_ARM926EJS 1 /* Basic Architecture */ #define CONFIG_MD5 /* get_random_hex on krikwood needs MD5 support */ diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h index 3c843a0..0035ed5 100644 --- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h +++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h @@ -27,13 +27,7 @@ #ifndef _ASM_ARCH_KIRKWOOD_H #define _ASM_ARCH_KIRKWOOD_H -#ifndef __ASSEMBLY__ -#include <asm/types.h> -#include <asm/io.h> -#endif /* __ASSEMBLY__ */ - #if defined (CONFIG_FEROCEON_88FR131) || defined (CONFIG_SHEEVA_88SV131) -#include <asm/arch/cpu.h> /* SOC specific definations */ #define INTREG_BASE 0xd0000000 |