HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37788 )
Change subject: Makefile: Remove romcc ......................................................................
Makefile: Remove romcc
Change-Id: I2fe7fa8b23da3b909adc2b8bce59304acfb5b807 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M Makefile.inc 1 file changed, 2 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/37788/1
diff --git a/Makefile.inc b/Makefile.inc index dc5272e..82adc1d 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -486,7 +486,7 @@ 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 @@ 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 @@ 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
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37788 )
Change subject: Makefile: Remove romcc ......................................................................
Patch Set 2: Code-Review+1
Jacob Garber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37788 )
Change subject: Makefile: Remove romcc ......................................................................
Patch Set 3:
toolchain.inc and the libpayload Makefile also use romcc
Kyösti Mälkki has uploaded a new patch set (#4) to the change originally created by HAOUAS Elyes. ( https://review.coreboot.org/c/coreboot/+/37788 )
Change subject: Makefile: Remove romcc ......................................................................
Makefile: Remove romcc
Change-Id: I2fe7fa8b23da3b909adc2b8bce59304acfb5b807 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M Makefile.inc M payloads/libpayload/Makefile M toolchain.inc 3 files changed, 2 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/37788/4
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37788 )
Change subject: Makefile: Remove romcc ......................................................................
Patch Set 4: Code-Review+2
HAOUAS Elyes has removed a vote from this change. ( https://review.coreboot.org/c/coreboot/+/37788 )
Change subject: Makefile: Remove romcc ......................................................................
Removed Code-Review+2 by HAOUAS Elyes ehaouas@noos.fr
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37788 )
Change subject: Makefile: Remove romcc ......................................................................
Patch Set 4: Code-Review+1
Jacob Garber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37788 )
Change subject: Makefile: Remove romcc ......................................................................
Patch Set 4: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37788 )
Change subject: Makefile: Remove romcc ......................................................................
Makefile: Remove romcc
Change-Id: I2fe7fa8b23da3b909adc2b8bce59304acfb5b807 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/37788 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Jacob Garber jgarber1@ualberta.ca --- M Makefile.inc M payloads/libpayload/Makefile M toolchain.inc 3 files changed, 2 insertions(+), 15 deletions(-)
Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, but someone else must approve Jacob Garber: Looks good to me, approved
diff --git a/Makefile.inc b/Makefile.inc index dc5272e..82adc1d 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -486,7 +486,7 @@ 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 @@ 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 @@ 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 e5f49a6..03fb153 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -163,7 +163,6 @@ 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 c3aa3e5..865227b 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -29,7 +29,6 @@
HOSTCC:=$(CCACHE) $(HOSTCC) HOSTCXX:=$(CCACHE) $(HOSTCXX) -ROMCC=$(CCACHE) $(ROMCC_BIN) endif
# scan-build integration @@ -44,7 +43,6 @@
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