diff options
| author | Lei Wen <[[email protected]]> | 2011-10-18 19:21:33 +0530 |
|---|---|---|
| committer | Albert ARIBAUD <[email protected]> | 2011-10-27 21:56:33 +0200 |
| commit | 0c0d9b708be45184f74b8b497d15b60c538caccf (patch) | |
| tree | ac985b3f8664b3d338f851c8b2310309c5e04fda | |
| parent | b5de038f159541404d89c358a4d77211b715f0f3 (diff) | |
ARM: pantheon: 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 <[email protected]>
| -rw-r--r-- | arch/arm/cpu/arm926ejs/pantheon/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/pantheon/dram.c | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/pantheon/timer.c | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-pantheon/config.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-pantheon/pantheon.h | 7 |
5 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/cpu/arm926ejs/pantheon/cpu.c b/arch/arm/cpu/arm926ejs/pantheon/cpu.c index 8b2eafa40b4..efc9395b960 100644 --- a/arch/arm/cpu/arm926ejs/pantheon/cpu.c +++ b/arch/arm/cpu/arm926ejs/pantheon/cpu.c @@ -23,8 +23,8 @@ */ #include <common.h> +#include <asm/arch/cpu.h> #include <asm/arch/pantheon.h> -#include <asm/io.h> #define UARTCLK14745KHZ (APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1)) #define SET_MRVL_ID (1<<8) diff --git a/arch/arm/cpu/arm926ejs/pantheon/dram.c b/arch/arm/cpu/arm926ejs/pantheon/dram.c index bbca7eef16d..a3d719e5cfe 100644 --- a/arch/arm/cpu/arm926ejs/pantheon/dram.c +++ b/arch/arm/cpu/arm926ejs/pantheon/dram.c @@ -23,6 +23,7 @@ */ #include <common.h> +#include <asm/io.h> #include <asm/arch/pantheon.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/arm926ejs/pantheon/timer.c b/arch/arm/cpu/arm926ejs/pantheon/timer.c index c71162a8be6..17045b1c2f6 100644 --- a/arch/arm/cpu/arm926ejs/pantheon/timer.c +++ b/arch/arm/cpu/arm926ejs/pantheon/timer.c @@ -23,6 +23,7 @@ */ #include <common.h> +#include <asm/arch/cpu.h> #include <asm/arch/pantheon.h> /* diff --git a/arch/arm/include/asm/arch-pantheon/config.h b/arch/arm/include/asm/arch-pantheon/config.h index 5658592f838..fd23c97b371 100644 --- a/arch/arm/include/asm/arch-pantheon/config.h +++ b/arch/arm/include/asm/arch-pantheon/config.h @@ -25,6 +25,8 @@ #ifndef _PANTHEON_CONFIG_H #define _PANTHEON_CONFIG_H +#include <asm/arch/pantheon.h> + #define CONFIG_ARM926EJS 1 /* Basic Architecture */ #define CONFIG_SYS_TCLK (14745600) /* NS16550 clk config */ diff --git a/arch/arm/include/asm/arch-pantheon/pantheon.h b/arch/arm/include/asm/arch-pantheon/pantheon.h index e4ed087b0cf..c7fe646128e 100644 --- a/arch/arm/include/asm/arch-pantheon/pantheon.h +++ b/arch/arm/include/asm/arch-pantheon/pantheon.h @@ -25,13 +25,6 @@ #ifndef _PANTHEON_H #define _PANTHEON_H -#ifndef __ASSEMBLY__ -#include <asm/types.h> -#include <asm/io.h> -#endif /* __ASSEMBLY__ */ - -#include <asm/arch/cpu.h> - /* Common APB clock register bit definitions */ #define APBC_APBCLK (1<<0) /* APB Bus Clock Enable */ #define APBC_FNCLK (1<<1) /* Functional Clock Enable */ |