diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:26:52 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:26:52 +0100 |
| commit | 9e04a8138892d64848dc6e8e74213086d9190d9a (patch) | |
| tree | 1740a361891d2390631ec053f1bc42e524913b78 /cpu/mpc86xx/cpu_init.c | |
| parent | 32c70d3420739930165271d9a1b04572adf799fd (diff) | |
| parent | 746c4b9490495dc4381dbcc49f40078d423e0a48 (diff) | |
| download | olio-uboot-2014.01-9e04a8138892d64848dc6e8e74213086d9190d9a.tar.xz olio-uboot-2014.01-9e04a8138892d64848dc6e8e74213086d9190d9a.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Conflicts:
common/cmd_reginfo.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
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 4f8956e0a..ab5906dbc 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; } |