arm: socfpga: Do not call board_init_r() from board_init_f()

[oweals/u-boot.git] / arch / arm / mach-socfpga / Makefile

diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile
index 7524ef90e49d6f9fa05b1645a52b6e0673bba3db..316b326d417e602b0fbde813bc4fb43932a3cc69 100644 (file)
--- a/arch/arm/mach-socfpga/Makefile
+++ b/arch/arm/mach-socfpga/Makefile
@@ -8,5 +8,14 @@
 #
 
 obj-y  += misc.o timer.o reset_manager.o system_manager.o clock_manager.o \
-          fpga_manager.o
-obj-$(CONFIG_SPL_BUILD) += spl.o freeze_controller.o scan_manager.o
+          fpga_manager.o scan_manager.o
+obj-$(CONFIG_SPL_BUILD) += spl.o freeze_controller.o
+
+# QTS-generated config file wrappers
+obj-y  += wrap_pll_config.o
+obj-$(CONFIG_SPL_BUILD) += wrap_iocsr_config.o wrap_pinmux_config.o    \
+                          wrap_sdram_config.o
+CFLAGS_wrap_iocsr_config.o     += -I$(srctree)/board/$(BOARDDIR)
+CFLAGS_wrap_pinmux_config.o    += -I$(srctree)/board/$(BOARDDIR)
+CFLAGS_wrap_pll_config.o       += -I$(srctree)/board/$(BOARDDIR)
+CFLAGS_wrap_sdram_config.o     += -I$(srctree)/board/$(BOARDDIR)