diff options
| -rw-r--r-- | Makefile.inc | 14 | ||||
| -rw-r--r-- | payloads/libpayload/Makefile | 1 | ||||
| -rw-r--r-- | toolchain.inc | 2 |
3 files changed, 2 insertions, 15 deletions
diff --git a/Makefile.inc b/Makefile.inc index dc5272efb5..82adc1d0f9 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -486,7 +486,7 @@ ifeq ($(CONFIG_DEBUG_ADA_CODE),y) ADAFLAGS_common += -gnata endif -additional-dirs := $(objutil)/cbfstool $(objutil)/romcc $(objutil)/ifdtool \ +additional-dirs := $(objutil)/cbfstool $(objutil)/ifdtool \ $(objutil)/options $(objutil)/amdfwtool \ $(objutil)/cbootimage @@ -552,16 +552,6 @@ ifeq ($(_WINCHECK),Cygwin) STACK=-Wl,--stack,16384000 endif -# this allows ccache to prepend itself -# (ccache handling happens first) -ROMCC_BIN= $(objutil)/romcc/romcc -ROMCC?=$(ROMCC_BIN) -$(ROMCC_BIN): $(top)/util/romcc/romcc.c - @printf " HOSTCC $(subst $(obj)/,,$(@)) (this may take a while)\n" - @# Note: Adding -O2 here might cause problems. For details see: - @# https://www.coreboot.org/pipermail/coreboot/2010-February/055825.html - $(HOSTCC) -g $(STACK) -Wall -o $@ $< - BINCFG:=$(objutil)/bincfg/bincfg IFDTOOL:=$(objutil)/ifdtool/ifdtool @@ -651,7 +641,7 @@ install-git-commit-clangfmt: include util/crossgcc/Makefile.inc .PHONY: tools -tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(ROMCC_BIN) $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL) +tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL) ########################################################################### # Common recipes for all stages diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index e5f49a6701..03fb153d5c 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -163,7 +163,6 @@ CCACHE:=CCACHE_COMPILERCHECK=content CCACHE_BASEDIR=$(top) $(CCACHE) CC := $(CCACHE) $(CC) HOSTCC := $(CCACHE) $(HOSTCC) HOSTCXX := $(CCACHE) $(HOSTCXX) -ROMCC := $(CCACHE) $(ROMCC) endif strip_quotes = $(subst ",,$(subst \",,$(1))) diff --git a/toolchain.inc b/toolchain.inc index c3aa3e50fa..865227b3a7 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -29,7 +29,6 @@ $(foreach arch,$(ARCH_SUPPORTED), \ HOSTCC:=$(CCACHE) $(HOSTCC) HOSTCXX:=$(CCACHE) $(HOSTCXX) -ROMCC=$(CCACHE) $(ROMCC_BIN) endif # scan-build integration @@ -44,7 +43,6 @@ $(foreach arch,$(ARCH_SUPPORTED), \ HOSTCC:=CCC_CC="$(HOSTCC)" $(CC) HOSTCXX:=CCC_CXX="$(HOSTCXX)" $(CXX) -ROMCC=CCC_CC="$(ROMCC_BIN)" $(CC) endif COREBOOT_STANDARD_STAGES := decompressor bootblock verstage romstage ramstage |