diff options
| author | Marek Vasut <marex@denx.de> | 2014-10-18 03:52:36 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2014-10-27 02:26:24 +0100 |
| commit | fc520894d426aae5dc0b87aa012520fc18231e1e (patch) | |
| tree | 1ca7b7c3718a20a5f70d4e3ac407efe02ac021fe | |
| parent | 5b3ee386fde82a1ba42ff09b95247842c9a1585e (diff) | |
| download | u-boot-imx-fc520894d426aae5dc0b87aa012520fc18231e1e.zip u-boot-imx-fc520894d426aae5dc0b87aa012520fc18231e1e.tar.gz u-boot-imx-fc520894d426aae5dc0b87aa012520fc18231e1e.tar.bz2 | |
arm: socfpga: Move code from misc_init_r() to arch_early_init_r()
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>
| -rw-r--r-- | arch/arm/cpu/armv7/socfpga/misc.c | 2 | ||||
| -rw-r--r-- | include/configs/socfpga_common.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c index 0eab264..8c3e5f7 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 49504dc..6952798 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 |