| Message ID | 1413744047-6682-1-git-send-email-marex@denx.de |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Marek Vasut |
| Headers | show |
On Sun 2014-10-19 20:40:47, Marek Vasut wrote: > Move this initialization code to proper place. The misc_init_r() > function is called way too late and the platform initialization > code should be executed much earlier. > > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Chin Liang See <clsee@altera.com> > Cc: Dinh Nguyen <dinguyen@altera.com> > Cc: Vince Bridgers <vbridger@altera.com> > Cc: Albert Aribaud <albert.u.boot@aribaud.net> Acked-by: Pavel Machek <pavel@denx.de>
On Monday, October 20, 2014 at 09:31:58 AM, Pavel Machek wrote: > On Sun 2014-10-19 20:40:47, Marek Vasut wrote: > > Move this initialization code to proper place. The misc_init_r() > > function is called way too late and the platform initialization > > code should be executed much earlier. > > > > Signed-off-by: Marek Vasut <marex@denx.de> > > Cc: Chin Liang See <clsee@altera.com> > > Cc: Dinh Nguyen <dinguyen@altera.com> > > Cc: Vince Bridgers <vbridger@altera.com> > > Cc: Albert Aribaud <albert.u.boot@aribaud.net> > > Acked-by: Pavel Machek <pavel@denx.de> Applied, thanks. Best regards, Marek Vasut
diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c index 8c26589..9b388b4 100644 --- a/arch/arm/cpu/armv7/socfpga/misc.c +++ b/arch/arm/cpu/armv7/socfpga/misc.c @@ -176,7 +176,7 @@ static void socfpga_nic301_slave_ns(void) static uint32_t iswgrp_handoff[8]; -int misc_init_r(void) +int arch_early_init_r(void) { int i; for (i = 0; i < 8; i++) /* Cache initial SW setting regs */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 3b82925..1fdc043 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -22,7 +22,7 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MISC_INIT_R +#define CONFIG_ARCH_EARLY_INIT_R #define CONFIG_SYS_NO_FLASH #define CONFIG_CLOCKS
Move this initialization code to proper place. The misc_init_r() function is called way too late and the platform initialization code should be executed much earlier. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chin Liang See <clsee@altera.com> Cc: Dinh Nguyen <dinguyen@altera.com> Cc: Vince Bridgers <vbridger@altera.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Pavel Machek <pavel@denx.de> --- arch/arm/cpu/armv7/socfpga/misc.c | 2 +- include/configs/socfpga_common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)