From mboxrd@z Thu Jan 1 00:00:00 1970 From: Haiying Wang Date: Mon, 16 Aug 2010 23:50:36 -0400 Subject: [U-Boot] [PATCH 2/7] powerpc/85xx: do not reloc l2srbar if CONFIG_FLASH_BASE is not defined In-Reply-To: <20100816101116.8F1541606A5@gemini.denx.de> References: <1281945851.24612.15.camel@localhost.localdomain> <20100816101116.8F1541606A5@gemini.denx.de> Message-ID: <1282017036.2814.19.camel@localhost.localdomain> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Mon, 2010-16-08 at 12:11 +0200, Wolfgang Denk wrote: > > > > diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c > > index 2c3be6d..1fbc0cc 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) { > > Does this commit not break systems which have CONFIG_SYS_FLASH_BASE > defined, but with l2srbar < CONFIG_SYS_FLASH_BASE ? I did not see it breaks the system in that case. It only affects the system without CONFIG_SYS_FLASH_BASE defined. :) Haiying