X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config.mk;h=b915c29b3f3e0c9957976c00a3698fcb27270bd4;hb=1be8b6a24d356fa80210f78d8ad39aaafbfd55ca;hp=2157537c823056729fef0aae65cffabfe1588b15;hpb=2c2277f15cbaa9533ef8aead7328c3f605251147;p=thirdparty%2Fu-boot.git diff --git a/config.mk b/config.mk index 2157537c823..b915c29b3f3 100644 --- a/config.mk +++ b/config.mk @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2013 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# ######################################################################### # This file is included from ./Makefile and spl/Makefile. @@ -14,14 +12,20 @@ # If we did not have Tegra SoCs, build system would be much simpler...) PLATFORM_RELFLAGS := PLATFORM_CPPFLAGS := -PLATFORM_LDFLAGS := -LDFLAGS := LDFLAGS_FINAL := +LDFLAGS_STANDALONE := OBJCOPYFLAGS := +# clear VENDOR for tcsh +VENDOR := ######################################################################### ARCH := $(CONFIG_SYS_ARCH:"%"=%) CPU := $(CONFIG_SYS_CPU:"%"=%) +ifdef CONFIG_SPL_BUILD +ifdef CONFIG_ARCH_TEGRA +CPU := arm720t +endif +endif BOARD := $(CONFIG_SYS_BOARD:"%"=%) ifneq ($(CONFIG_SYS_VENDOR),) VENDOR := $(CONFIG_SYS_VENDOR:"%"=%) @@ -45,8 +49,10 @@ endif ifneq ($(BOARD),) ifdef VENDOR BOARDDIR = $(VENDOR)/$(BOARD) +ENVDIR=${vendor}/env else BOARDDIR = $(BOARD) +ENVDIR=${board}/env endif endif ifdef BOARD @@ -61,15 +67,13 @@ endif RELFLAGS := $(PLATFORM_RELFLAGS) -OBJCOPYFLAGS += --gap-fill=0xff - PLATFORM_CPPFLAGS += $(RELFLAGS) PLATFORM_CPPFLAGS += -pipe -LDFLAGS += $(PLATFORM_LDFLAGS) LDFLAGS_FINAL += -Bstatic export PLATFORM_CPPFLAGS export RELFLAGS export LDFLAGS_FINAL +export LDFLAGS_STANDALONE export CONFIG_STANDALONE_LOAD_ADDR