Few V38B changes:

- fix a typo in V38B config file
  - move watchdog initialisation earlier in the boot process
  - add "wdt=off" to default kernel command line (disables kernel watchdog)
This commit is contained in:
Bartlomiej Sieka
2006-12-28 19:08:21 +01:00
parent ce3f1a40c5
commit cce4acbb68
2 changed files with 16 additions and 12 deletions

View File

@@ -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