diff options
| author | Tom Rini <trini@ti.com> | 2013-12-10 17:15:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-10 17:15:18 -0500 |
| commit | 4b210ad34282bfd9fc982a8e3c9a9126f4094cdb (patch) | |
| tree | f91ebdc46ede952728602d5ecc18e64ad0e52682 /arch/arm/cpu/armv7/rmobile/Makefile | |
| parent | 65b7fe28a12bbaccc7a0c076f5f9f213150030e7 (diff) | |
| parent | f15ea6e1d67782a1626d4a4922b6c20e380085e5 (diff) | |
| download | blackbird-obmc-uboot-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.tar.gz blackbird-obmc-uboot-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
board/samsung/trats2/trats2.c
include/configs/exynos5250-dt.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7/rmobile/Makefile')
| -rw-r--r-- | arch/arm/cpu/armv7/rmobile/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv7/rmobile/Makefile b/arch/arm/cpu/armv7/rmobile/Makefile index 5e296c4208..22219990dd 100644 --- a/arch/arm/cpu/armv7/rmobile/Makefile +++ b/arch/arm/cpu/armv7/rmobile/Makefile @@ -5,14 +5,13 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y = lowlevel_init.o -obj-y += cpu_info.o +obj-y = cpu_info.o obj-y += emac.o obj-$(CONFIG_DISPLAY_BOARDINFO) += board.o obj-$(CONFIG_GLOBAL_TIMER) += timer.o -obj-$(CONFIG_R8A7740) += cpu_info-r8a7740.o -obj-$(CONFIG_R8A7740) += pfc-r8a7740.o -obj-$(CONFIG_SH73A0) += cpu_info-sh73a0.o -obj-$(CONFIG_SH73A0) += pfc-sh73a0.o +obj-$(CONFIG_R8A7740) += lowlevel_init.o cpu_info-r8a7740.o pfc-r8a7740.o +obj-$(CONFIG_R8A7790) += lowlevel_init_ca15.o cpu_info-r8a7790.o pfc-r8a7790.o +obj-$(CONFIG_R8A7791) += lowlevel_init_ca15.o cpu_info-r8a7791.o pfc-r8a7791.o +obj-$(CONFIG_SH73A0) += lowlevel_init.o cpu_info-sh73a0.o pfc-sh73a0.o obj-$(CONFIG_TMU_TIMER) += ../../../../sh/lib/time.o |
