Merge branch 'topic/arm/socfpga-20141006' of git://git.denx.de/u-boot…

…-socfpga Fix a trivial conflict in dw_mmc.c after talking with Marek. Conflicts: drivers/mmc/dw_mmc.c Signed-off-by: Tom Rini <[email protected]>
lbmeng · Oct 6, 2014 · 04de09f · 04de09f
2 parents 9169305 + 2f21063
commit 04de09f
Show file tree

Hide file tree

Showing 37 changed files with 2,502 additions and 815 deletions.
diff --git a/arch/arm/cpu/armv7/socfpga/Makefile b/arch/arm/cpu/armv7/socfpga/Makefile
@@ -8,5 +8,6 @@
 #
 
 obj-y	:= lowlevel_init.o
-obj-y	+= misc.o timer.o reset_manager.o system_manager.o clock_manager.o
+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