diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2007-01-22 13:15:35 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-01-22 13:15:35 +0800 |
| commit | ee460917afb74767aedc3da095d4fec4a50ba6f8 (patch) | |
| tree | fdead38c4681fc9adbedd6836792660f933614d3 /board/v38b/v38b.c | |
| parent | a41969e09b9d886091a804c2ba5f1ab84b084dd3 (diff) | |
| parent | a4012396645533aef218354eeba754dff0deace8 (diff) | |
| download | u-boot-imx-ee460917afb74767aedc3da095d4fec4a50ba6f8.zip u-boot-imx-ee460917afb74767aedc3da095d4fec4a50ba6f8.tar.gz u-boot-imx-ee460917afb74767aedc3da095d4fec4a50ba6f8.tar.bz2 | |
Merge branch 'master' into hpc2
Conflicts:
drivers/cfi_flash.c
The patch by Heiko Schocher <hs@pollux.denx.de> on Jan, 19, 2007
fixes cfi_driver bug for mpc7448hpc2 board. The default cfi_driver can support
mpc7448hpc2 board.
Diffstat (limited to 'board/v38b/v38b.c')
| -rw-r--r-- | board/v38b/v38b.c | 21 |
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 |