diff options
author | Jon Loeliger <jdl@freescale.com> | 2008-01-30 10:56:19 -0600 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2008-01-30 10:56:19 -0600 |
commit | 60c1b95aabbfac17b0ea9422828784e163348c5c (patch) | |
tree | 62f0ac7e1d93db435643c21609ec4bfe02e4111c /cpu/mpc86xx/cpu_init.c | |
parent | 98b742489c09780be6a832eeaa4e5eff824792bb (diff) | |
parent | 4f93f8b1a4d35b6d302842132edba920ef8f62aa (diff) | |
download | u-boot-imx-60c1b95aabbfac17b0ea9422828784e163348c5c.zip u-boot-imx-60c1b95aabbfac17b0ea9422828784e163348c5c.tar.gz u-boot-imx-60c1b95aabbfac17b0ea9422828784e163348c5c.tar.bz2 |
Merge branch 'mpc86xx'
Diffstat (limited to 'cpu/mpc86xx/cpu_init.c')
-rw-r--r-- | cpu/mpc86xx/cpu_init.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpu/mpc86xx/cpu_init.c b/cpu/mpc86xx/cpu_init.c index 4f8956e..ab5906d 100644 --- a/cpu/mpc86xx/cpu_init.c +++ b/cpu/mpc86xx/cpu_init.c @@ -49,6 +49,10 @@ void cpu_init_f(void) /* Clear initial global data */ memset ((void *) gd, 0, sizeof (gd_t)); +#ifdef CONFIG_FSL_LAW + init_laws(); +#endif + /* Map banks 0 and 1 to the FLASH banks 0 and 1 at preliminary * addresses - these have to be modified later when FLASH size * has been determined @@ -114,5 +118,8 @@ void cpu_init_f(void) */ int cpu_init_r(void) { +#ifdef CONFIG_FSL_LAW + disable_law(0); +#endif return 0; } |