diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-11 01:20:30 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-11 01:20:30 +0200 |
| commit | 790af815436bc6a93e4c581840be2419897f23b1 (patch) | |
| tree | 1ba0aaacad86092aea67d3612ae066b33b117619 /arch/arm/cpu/armv7/socfpga/Makefile | |
| parent | d0b3723034aa865b8618428739efe1d98b1a2e2b (diff) | |
| parent | db67801bf92f7fae6131dbc0d387131698fb9490 (diff) | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/socfpga/Makefile')
| -rw-r--r-- | arch/arm/cpu/armv7/socfpga/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/socfpga/Makefile b/arch/arm/cpu/armv7/socfpga/Makefile index eb33f2c5fb..8b6e108c42 100644 --- 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 |