diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-21 20:20:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-21 20:20:00 -0400 |
| commit | 89ca873e2ddea859526f25f678fa53dda055e90f (patch) | |
| tree | 3de5d39c9e3a257d50727b50057336ca41aac2db /arch/powerpc/cpu/mpc85xx/cpu_init.c | |
| parent | 9f84da8de1873593d9b708aa4a8a24f46e67c744 (diff) | |
| parent | b24a4f6247d867f1301edc1c6390aca79ecbe16b (diff) | |
| download | u-boot-imx-89ca873e2ddea859526f25f678fa53dda055e90f.zip u-boot-imx-89ca873e2ddea859526f25f678fa53dda055e90f.tar.gz u-boot-imx-89ca873e2ddea859526f25f678fa53dda055e90f.tar.bz2 | |
Merge git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/cpu_init.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 61f5639..ace4279 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -439,7 +439,7 @@ ulong cpu_init_f(void) #ifdef CONFIG_SYS_DCSRBAR_PHYS ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); #endif -#if defined(CONFIG_SECURE_BOOT) +#if defined(CONFIG_SECURE_BOOT) && !defined(CONFIG_SYS_RAMBOOT) struct law_entry law; #endif #ifdef CONFIG_MPC8548 @@ -459,7 +459,7 @@ ulong cpu_init_f(void) disable_tlb(14); disable_tlb(15); -#if defined(CONFIG_SECURE_BOOT) +#if defined(CONFIG_SECURE_BOOT) && !defined(CONFIG_SYS_RAMBOOT) /* Disable the LAW created for NOR flash by the PBI commands */ law = find_law(CONFIG_SYS_PBI_FLASH_BASE); if (law.index != -1) |