Message ID | 1427752878-18426-17-git-send-email-dinguyen@opensource.altera.com |
---|---|
State | Superseded |
Delegated to: | Marek Vasut |
Headers | show |
On Mon 2015-03-30 17:01:17, dinguyen@opensource.altera.com wrote: > From: Dinh Nguyen <dinguyen@opensource.altera.com> > > Since we are already mapping sdram 0x0 in board_init_f, we can remove it > here. > > Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > Reviewed-by: Marek Vasut <marex@denx.de> Yes, and you want to merge this to the patch that does that. Also.. what about that "VIRTUAL_TARGET" ifdef? Should not the remap be done in the same place for both? Reviewed-by: Pavel Machek <pavel@denx.de> > --- > arch/arm/cpu/armv7/socfpga/misc.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c > index 7873c38..3cee6ff 100644 > --- a/arch/arm/cpu/armv7/socfpga/misc.c > +++ b/arch/arm/cpu/armv7/socfpga/misc.c > @@ -205,9 +205,6 @@ int arch_early_init_r(void) > /* Configure the L2 controller to make SDRAM start at 0 */ > #ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET > writel(0x2, &nic301_regs->remap); > -#else > - writel(0x1, &nic301_regs->remap); /* remap.mpuzero */ > - writel(0x1, &pl310->pl310_addr_filter_start); > #endif > > /* Add device descriptor to FPGA device table */
On Tuesday, March 31, 2015 at 12:01:17 AM, dinguyen@opensource.altera.com wrote: > From: Dinh Nguyen <dinguyen@opensource.altera.com> > > Since we are already mapping sdram 0x0 in board_init_f, we can remove it > here. > > Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > Reviewed-by: Marek Vasut <marex@denx.de> I'm kinda hesitant to apply this now, while we still don't have the SPL well in place. Is it OK to postpone this patch until we have the SPL well in place please ? Best regards, Marek Vasut
diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c index 7873c38..3cee6ff 100644 --- a/arch/arm/cpu/armv7/socfpga/misc.c +++ b/arch/arm/cpu/armv7/socfpga/misc.c @@ -205,9 +205,6 @@ int arch_early_init_r(void) /* Configure the L2 controller to make SDRAM start at 0 */ #ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET writel(0x2, &nic301_regs->remap); -#else - writel(0x1, &nic301_regs->remap); /* remap.mpuzero */ - writel(0x1, &pl310->pl310_addr_filter_start); #endif /* Add device descriptor to FPGA device table */