summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-07-09 05:36:23 +0200
committerMarek Vasut <marex@denx.de>2015-08-08 14:14:07 +0200
commit6473054a125f712648038c100d3c5ab9743cb1f1 (patch)
treed6cfedeefadaa724c25021fb49c73a2b28c7c7d2 /include
parentbd65fe35fffd9a9e8c8abe5321a51a8c43eda97d (diff)
downloadu-boot-imx-6473054a125f712648038c100d3c5ab9743cb1f1.zip
u-boot-imx-6473054a125f712648038c100d3c5ab9743cb1f1.tar.gz
u-boot-imx-6473054a125f712648038c100d3c5ab9743cb1f1.tar.bz2
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 <marex@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/configs/socfpga_common.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 66972cd..a5f39b4 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