From 6473054a125f712648038c100d3c5ab9743cb1f1 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 9 Jul 2015 05:36:23 +0200 Subject: arm: socfpga: spl: Merge spl_board_init() into board_init_f() The code in spl_board_init() should have been in board_init_f() from the beginning, since it is code which configures system and then starts DRAM. Thus, it cannot be in spl_board_init(), which is called from board_init_r() , which already expects a working DRAM. Signed-off-by: Marek Vasut --- include/configs/socfpga_common.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 66972cd89a..a5f39b4c34 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -287,7 +287,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); * 0xFFFF_FF00 ...... End of SRAM */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_RAM_DEVICE #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR #define CONFIG_SYS_SPL_MALLOC_START CONFIG_SYS_INIT_SP_ADDR -- cgit v1.2.1