diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-19 22:05:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-19 22:05:31 -0500 |
| commit | 34059d8f502dec034af2387c7d00a56ccab99a9e (patch) | |
| tree | 0227cccae15473da34e95acf35140ef8be3f4643 /arch/arm/mach-socfpga/Makefile | |
| parent | 1c0e84ca829a09948a61107744402296566aa076 (diff) | |
| parent | 48275c96ff4deaeca10d9e18c78f6a1e3653efa2 (diff) | |
| download | u-boot-imx-34059d8f502dec034af2387c7d00a56ccab99a9e.zip u-boot-imx-34059d8f502dec034af2387c7d00a56ccab99a9e.tar.gz u-boot-imx-34059d8f502dec034af2387c7d00a56ccab99a9e.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-socfpga
Diffstat (limited to 'arch/arm/mach-socfpga/Makefile')
| -rw-r--r-- | arch/arm/mach-socfpga/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile index 316b326..809cd47 100644 --- a/arch/arm/mach-socfpga/Makefile +++ b/arch/arm/mach-socfpga/Makefile @@ -8,11 +8,12 @@ # obj-y += misc.o timer.o reset_manager.o system_manager.o clock_manager.o \ - fpga_manager.o scan_manager.o + fpga_manager.o board.o + obj-$(CONFIG_SPL_BUILD) += spl.o freeze_controller.o # QTS-generated config file wrappers -obj-y += wrap_pll_config.o +obj-$(CONFIG_TARGET_SOCFPGA_GEN5) += scan_manager.o 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) |