diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-25 10:25:14 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-25 10:53:15 +0100 |
commit | ab6423cae0323e8db2c8fdd0a99138d93fde2137 (patch) | |
tree | a97493753a119e577161a4fb0b40b8edfc3923bb /arch/m68k/cpu/mcf532x/config.mk | |
parent | 63f347ec4ca94e3b57c6c719e4acaec81b61dc7a (diff) | |
parent | 2c072c958bb544c72f0e848375803dbd6971f022 (diff) | |
download | u-boot-imx-ab6423cae0323e8db2c8fdd0a99138d93fde2137.zip u-boot-imx-ab6423cae0323e8db2c8fdd0a99138d93fde2137.tar.gz u-boot-imx-ab6423cae0323e8db2c8fdd0a99138d93fde2137.tar.bz2 |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.
Conflicts:
board/samsung/common/board.c
Diffstat (limited to 'arch/m68k/cpu/mcf532x/config.mk')
-rw-r--r-- | arch/m68k/cpu/mcf532x/config.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/cpu/mcf532x/config.mk b/arch/m68k/cpu/mcf532x/config.mk index 0604ab0..af94354 100644 --- a/arch/m68k/cpu/mcf532x/config.mk +++ b/arch/m68k/cpu/mcf532x/config.mk @@ -7,9 +7,9 @@ # SPDX-License-Identifier: GPL-2.0+ # -cfg=$(shell grep configs $(OBJTREE)/include/config.h | sed 's/.*<\(configs.*\)>/\1/') -is5301x:=$(shell grep CONFIG_MCF5301x $(TOPDIR)/include/$(cfg)) -is532x:=$(shell grep CONFIG_MCF532x $(TOPDIR)/include/$(cfg)) +cfg=$(shell grep configs $(objtree)/include/config.h | sed 's/.*<\(configs.*\)>/\1/') +is5301x:=$(shell grep CONFIG_MCF5301x $(srctree)/include/$(cfg)) +is532x:=$(shell grep CONFIG_MCF532x $(srctree)/include/$(cfg)) ifneq (,$(findstring CONFIG_MCF5301x,$(is5301x))) PLATFORM_CPPFLAGS += -mcpu=53015 -fPIC |