summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2007-01-04 02:05:51 +0100
committerWolfgang Denk <wd@denx.de>2007-01-04 02:05:51 +0100
commit574ca77c41823b94c99827416b1fdb6049935332 (patch)
treed2fb1ab258d412fe7b926cd771b39ba7844e3685 /board
parent92eb729bad876725aeea908d2addba0800620840 (diff)
parentcce4acbb68398634b8d011ed7bb0d12269c84230 (diff)
downloadu-boot-imx-574ca77c41823b94c99827416b1fdb6049935332.zip
u-boot-imx-574ca77c41823b94c99827416b1fdb6049935332.tar.gz
u-boot-imx-574ca77c41823b94c99827416b1fdb6049935332.tar.bz2
Merge with /home/tur/proj/v38b/u-boot
Diffstat (limited to 'board')
-rw-r--r--board/v38b/v38b.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/board/v38b/v38b.c b/board/v38b/v38b.c
index dede996..ace4aa2 100644
--- a/board/v38b/v38b.c
+++ b/board/v38b/v38b.c
@@ -191,16 +191,8 @@ int checkboard (void)
return 0;
}
-
-int board_early_init_r(void)
+int board_early_init_f(void)
{
- /*
- * Now, when we are in RAM, enable flash write access for the
- * detection process. Note that CS_BOOT cannot be cleared when
- * executing in flash.
- */
- *(vu_long *) MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */
-
#ifdef CONFIG_HW_WATCHDOG
/*
* Enable and configure the direction (output) of PSC3_9 - watchdog
@@ -210,6 +202,17 @@ int board_early_init_r(void)
*(vu_long *) MPC5XXX_WU_GPIO_ENABLE |= GPIO_PSC3_9;
*(vu_long *) MPC5XXX_WU_GPIO_DIR |= GPIO_PSC3_9;
#endif /* CONFIG_HW_WATCHDOG */
+ return 0;
+}
+
+int board_early_init_r(void)
+{
+ /*
+ * Now, when we are in RAM, enable flash write access for the
+ * detection process. Note that CS_BOOT cannot be cleared when
+ * executing in flash.
+ */
+ *(vu_long *) MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */
/*
* Enable GPIO_WKUP_7 to "read the status of the actual power