summaryrefslogtreecommitdiff
path: root/board/imx31_phycore
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2011-03-14 14:43:56 (GMT)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-04-27 17:38:05 (GMT)
commit862711154339be2af723adcbde217743de781e81 (patch)
treec777613bd01078e4463b421929467a92b6daf73c /board/imx31_phycore
parentdcd441c32560a823019c720fb034ff425efbc376 (diff)
downloadu-boot-862711154339be2af723adcbde217743de781e81.tar.xz
IMX: MX31: Cleanup include files and drop nasty #ifdef in drivers
As exception among the i.MX processors, the i.MX31 has headers without general names (mx31-regs.h, mx31.h instead of imx-regs.h and clock.h). This requires several nasty #ifdef in the drivers to include the correct header. The patch cleans up the driver and renames the header files as for the other i.MX processors. Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'board/imx31_phycore')
-rw-r--r--board/imx31_phycore/imx31_phycore.c4
-rw-r--r--board/imx31_phycore/lowlevel_init.S2
2 files changed, 3 insertions, 3 deletions
diff --git a/board/imx31_phycore/imx31_phycore.c b/board/imx31_phycore/imx31_phycore.c
index 3d7b7f7..82daaa3 100644
--- a/board/imx31_phycore/imx31_phycore.c
+++ b/board/imx31_phycore/imx31_phycore.c
@@ -25,8 +25,8 @@
#include <common.h>
#include <s6e63d6.h>
#include <netdev.h>
-#include <asm/arch/mx31.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/imx31_phycore/lowlevel_init.S b/board/imx31_phycore/lowlevel_init.S
index c5d6eb0..c47137d 100644
--- a/board/imx31_phycore/lowlevel_init.S
+++ b/board/imx31_phycore/lowlevel_init.S
@@ -21,7 +21,7 @@
* MA 02111-1307 USA
*/
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>
.macro REG reg, val
ldr r2, =\reg