diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-19 10:53:59 (GMT) |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-19 10:53:59 (GMT) |
commit | 69f14dc2fd64307f012381dd333a06001dec75dc (patch) | |
tree | 1c520dfb9afd8406230a5382ebaf57b0b8cd6c5d /board/samsung/smdk5250/Makefile | |
parent | 847e6693ccb529bf8346db62876f38f0c4e04ade (diff) | |
parent | ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f (diff) | |
download | u-boot-69f14dc2fd64307f012381dd333a06001dec75dc.tar.xz |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Conflicts:
spl/Makefile
Diffstat (limited to 'board/samsung/smdk5250/Makefile')
-rw-r--r-- | board/samsung/smdk5250/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/board/samsung/smdk5250/Makefile b/board/samsung/smdk5250/Makefile index 47c6a5a..f2c32ee 100644 --- a/board/samsung/smdk5250/Makefile +++ b/board/samsung/smdk5250/Makefile @@ -28,12 +28,15 @@ SOBJS := lowlevel_init.o COBJS := clock_init.o COBJS += dmc_common.o dmc_init_ddr3.o -COBJS += tzpc_init.o COBJS += smdk5250_spl.o ifndef CONFIG_SPL_BUILD +ifdef CONFIG_OF_CONTROL +COBJS += exynos5-dt.o +else COBJS += smdk5250.o endif +endif ifdef CONFIG_SPL_BUILD COBJS += spl_boot.o |