diff options
| author | Stefan Roese <sr@denx.de> | 2007-01-05 10:40:50 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-01-05 10:40:50 +0100 |
| commit | c04a1a72878f6edf7b0ce62f166cdb857a8c2d88 (patch) | |
| tree | e237abcabb79e1059e848c07ddb85009d5b999b2 /board | |
| parent | a78bc443ae5a4a8ba87590587d5e35bf5a787b2e (diff) | |
| parent | 574ca77c41823b94c99827416b1fdb6049935332 (diff) | |
| download | u-boot-imx-c04a1a72878f6edf7b0ce62f166cdb857a8c2d88.zip u-boot-imx-c04a1a72878f6edf7b0ce62f166cdb857a8c2d88.tar.gz u-boot-imx-c04a1a72878f6edf7b0ce62f166cdb857a8c2d88.tar.bz2 | |
Merge with /home/stefan/git/u-boot/denx-merge-sr
Diffstat (limited to 'board')
| -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 |