diff options
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/cpu_init.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu_init.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index cac92807904..c2b2ef20414 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -38,7 +38,7 @@  #ifdef CONFIG_FSL_CAAM  #include <fsl_sec.h>  #endif -#if defined(CONFIG_SECURE_BOOT) && defined(CONFIG_FSL_CORENET) +#if defined(CONFIG_NXP_ESBC) && defined(CONFIG_FSL_CORENET)  #include <asm/fsl_pamu.h>  #include <fsl_secboot_err.h>  #endif @@ -440,7 +440,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) && !defined(CONFIG_SYS_RAMBOOT) +#if defined(CONFIG_NXP_ESBC) && !defined(CONFIG_SYS_RAMBOOT)  	struct law_entry law;  #endif  #ifdef CONFIG_ARCH_MPC8548 @@ -460,7 +460,7 @@ ulong cpu_init_f(void)  	disable_tlb(14);  	disable_tlb(15); -#if defined(CONFIG_SECURE_BOOT) && !defined(CONFIG_SYS_RAMBOOT) +#if defined(CONFIG_NXP_ESBC) && !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) @@ -963,7 +963,7 @@ int cpu_init_r(void)  	fman_enet_init();  #endif -#if defined(CONFIG_SECURE_BOOT) && defined(CONFIG_FSL_CORENET) +#if defined(CONFIG_NXP_ESBC) && defined(CONFIG_FSL_CORENET)  	if (pamu_init() < 0)  		fsl_secboot_handle_error(ERROR_ESBC_PAMU_INIT);  #endif | 
