From: Haiying Wang Date: Wed, 1 Dec 2010 15:35:30 +0000 (-0500) Subject: powerpc/85xx: do not reloc l2srbar if CONFIG_FLASH_BASE is not defined X-Git-Tag: v2010.12-rc3~31 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=888279b5ed8a6243eda81af84a98adc64c5e4453;p=u-boot powerpc/85xx: do not reloc l2srbar if CONFIG_FLASH_BASE is not defined This fixes the compiling error for the board which doesn't have NOR flash (so CONFIG_FLASH_BASE is not defined) Signed-off-by: Haiying Wang Signed-off-by: Kumar Gala --- diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 27236a0bad..4b8faa5daf 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -327,7 +327,7 @@ int cpu_init_r(void) if (l2cache->l2ctl & MPC85xx_L2CTL_L2E) { puts("already enabled"); l2srbar = l2cache->l2srbar0; -#ifdef CONFIG_SYS_INIT_L2_ADDR +#if defined(CONFIG_SYS_INIT_L2_ADDR) && defined(CONFIG_SYS_FLASH_BASE) if (l2cache->l2ctl & MPC85xx_L2CTL_L2SRAM_ENTIRE && l2srbar >= CONFIG_SYS_FLASH_BASE) { l2srbar = CONFIG_SYS_INIT_L2_ADDR;