summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorLei Wen <[leiwen@marvell.com]>2011-10-18 19:21:33 +0530
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-10-27 21:56:33 +0200
commit0c0d9b708be45184f74b8b497d15b60c538caccf (patch)
treeac985b3f8664b3d338f851c8b2310309c5e04fda /arch/arm/include
parentb5de038f159541404d89c358a4d77211b715f0f3 (diff)
downloadu-boot-imx-0c0d9b708be45184f74b8b497d15b60c538caccf.zip
u-boot-imx-0c0d9b708be45184f74b8b497d15b60c538caccf.tar.gz
u-boot-imx-0c0d9b708be45184f74b8b497d15b60c538caccf.tar.bz2
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 <leiwen@marvell.com>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/arch-pantheon/config.h2
-rw-r--r--arch/arm/include/asm/arch-pantheon/pantheon.h7
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/include/asm/arch-pantheon/config.h b/arch/arm/include/asm/arch-pantheon/config.h
index 5658592..fd23c97 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 e4ed087..c7fe646 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 */