Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12682
-gerrit
commit e1545c4c9924abfd88cadbb084d73ec118ca5899
Author: Martin Roth <martinroth(a)google.com>
Date: Mon Dec 7 14:34:46 2015 -0700
xcompile: Remove warnings about missing tools & architectures
Let toolchain.inc error out when the architecture or tool is missing.
Change-Id: I39a51e5a2c778d6bbc50354807e5e2b717fa9e52
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/xcompile/xcompile | 7 -------
1 file changed, 7 deletions(-)
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 7f44df6..0b864d3 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -56,8 +56,6 @@ if [ "$(${XGCCPATH}/iasl 2>/dev/null | grep -c ACPI)" -gt 0 ]; then
IASL=${XGCCPATH}iasl
elif [ "$(iasl 2>/dev/null | grep -c ACPI)" -gt 0 ]; then
IASL=iasl
-else
- die "no iasl found"
fi
if program_exists gcc; then
@@ -350,11 +348,6 @@ test_architecture() {
# that this will change in the future.
CLANG="clang -target ${clang_arch}-${TABI} -ccc-gcc-name ${GCC}"
fi
-
- if [ -z "$GCC" -a -z "$CLANG" ]; then
- echo "Warning: no suitable compiler for $architecture." >&2
- return 1
- fi
}
# This loops over all supported architectures.
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12681
-gerrit
commit ad933a86d53e9c2f7df36f6a0daec8cf8193f7ce
Author: Martin Roth <martinroth(a)google.com>
Date: Mon Dec 7 14:33:44 2015 -0700
toolchain.inc: Test for valid toolchain when ANY_TOOLCHAIN is used
Even when ANY_TOOLCHAIN is selected, a valid compiler for the requested
architecture is needed.
Change-Id: If1a0a1ca6b726e8e58d29c69de93546510582548
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
toolchain.inc | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/toolchain.inc b/toolchain.inc
index d512d89..3b9096c 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -162,6 +162,14 @@ $(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage
#TODO: Figure out if iasl is even needed for the build.
$(if $(shell if [ -n "$(IASL)" ]; then $(IASL) -v 2>&1 | grep -q "$(shell util/crossgcc/buildgcc -s iasl)" || echo not-coreboot; else echo not-coreboot; fi), \
$(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)$(warning The coreboot toolchain version of iasl '$(shell util/crossgcc/buildgcc -s iasl)' was not found))
+else #$(CONFIG_ANY_TOOLCHAIN)
+$(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage)-y))), \
+ $(if $(CC_$(arch)),, $(eval COMPILERFAIL:=1)$(warning No compiler found for '$(arch)' architecture. \
+Install one or use the coreboot toolchain?)) )
+#if iasl isn't present, fail
+#TODO: Figure out if iasl is even needed for the build.
+$(if $(IASL),, $(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)$(warning iasl not found. \
+Please install it or use the coreboot toolchain.))
endif
ifeq ($(COMPILERFAIL),1)
ifneq ($(XGCCPATH),)
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12680
-gerrit
commit 862bdec05ce035b82ba0c1035f42bfdd20c9cdde
Author: Martin Roth <martinroth(a)google.com>
Date: Mon Dec 7 14:27:34 2015 -0700
toolchain.inc: Update help text, Add TODO.
- Update the help text to be more informative.
- Add todo about IASL - we shouldn't require it if the build doesn't
use it.
Change-Id: Iffeb94f78c1ae7535a8a7b9b0b9f1728301a42b3
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
toolchain.inc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/toolchain.inc b/toolchain.inc
index 3b66b06..d512d89 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -157,10 +157,11 @@ IASLFAIL:=0
ifneq ($(CONFIG_ANY_TOOLCHAIN),y)
$(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage)-y))), \
$(if $(shell if [ -n "$(CC_$(arch))" ]; then $(CC_$(arch)) -v 2>&1 |grep -q "gcc version .*coreboot toolchain" || echo not-coreboot; else echo not-coreboot; fi), \
- $(eval COMPILERFAIL:=1)$(warning Please use the coreboot toolchain for '$(arch)')))
+ $(eval COMPILERFAIL:=1)$(warning The coreboot toolchain for '$(arch)' architecture was not found.)))
#if iasl doesn't match the current coreboot version, fail the test
+#TODO: Figure out if iasl is even needed for the build.
$(if $(shell if [ -n "$(IASL)" ]; then $(IASL) -v 2>&1 | grep -q "$(shell util/crossgcc/buildgcc -s iasl)" || echo not-coreboot; else echo not-coreboot; fi), \
- $(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)$(warning Please use the coreboot toolchain version of iasl - $(shell util/crossgcc/buildgcc -s iasl)))
+ $(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)$(warning The coreboot toolchain version of iasl '$(shell util/crossgcc/buildgcc -s iasl)' was not found))
endif
ifeq ($(COMPILERFAIL),1)
ifneq ($(XGCCPATH),)
@@ -168,11 +169,11 @@ $(warning )
$(warning Path to your toolchain is currently set to '$(XGCCPATH)')
endif
$(warning )
-$(warning To build the entire coreboot toolchain: make crossgcc)
+$(warning To build the entire coreboot toolchain: run 'make crossgcc')
ifeq ($(IASLFAIL),1)
-$(warning To build just IASL: make iasl)
+$(warning To build just IASL: run 'make iasl')
endif #($(IASLFAIL),1)
-$(warning For more toolchain build targets: make help_toolchain)
+$(warning For more toolchain build targets: run 'make help_toolchain')
$(warning )
ifneq ($(CONFIG_ANY_TOOLCHAIN),y)
$(warning To try to use any toolchain in your path, run 'make menuconfig', then select)
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12679
-gerrit
commit ae25d892063e237ecbcb932cae751992f0c5ebca
Author: Martin Roth <martinroth(a)google.com>
Date: Mon Dec 7 14:24:57 2015 -0700
toolchain.inc: Skip how to use any toolchain if it's selected
If ANY_TOOLCHAIN is selected, don't bother telling the user how to
do what they've already done.
Change-Id: I7182d18a91e832aa56638ec64fe8b3b0c38cff7a
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
toolchain.inc | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/toolchain.inc b/toolchain.inc
index b5af5c6..3b66b06 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -174,9 +174,13 @@ $(warning To build just IASL: make iasl)
endif #($(IASLFAIL),1)
$(warning For more toolchain build targets: make help_toolchain)
$(warning )
-$(warning *** To try to use your own toolchain, run 'make menuconfig', then select the)
-$(warning *** config option: General setup -> Allow building with any toolchain)
-$(error Note that this is NOT supported. Using it means you're on your own)
+ifneq ($(CONFIG_ANY_TOOLCHAIN),y)
+$(warning To try to use any toolchain in your path, run 'make menuconfig', then select)
+$(warning the config option: 'General setup', and 'Allow building with any toolchain')
+$(warning Note that this is NOT supported. Using it means you're on your own.)
+$(warning )
+endif #($(CONFIG_ANY_TOOLCHAIN),y)
+$(error Halting the build)
endif #($(COMPILERFAIL),1)
endif #($(NOCOMPILE),1)
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12678
-gerrit
commit fffbb436407f1381b3ff5de842d7e044c2cfe137
Author: Martin Roth <martinroth(a)google.com>
Date: Mon Dec 7 14:20:55 2015 -0700
toolchain.inc: Move nocompile around entire check, Comment endifs
Move the check for NOCOMPILE flag around the whole block. There's
no need to test COMPILERFAIL if NOCOMPILE is set.
Comment the endif lines to make it easier to understand.
Signed-off-by: Martin Roth <martinroth(a)google.com>
Change-Id: Id7bb5ca13e6bf1cabf4b7b2ff3256b47b966bac1
---
toolchain.inc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/toolchain.inc b/toolchain.inc
index a73ecaa..b5af5c6 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -162,7 +162,6 @@ $(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage
$(if $(shell if [ -n "$(IASL)" ]; then $(IASL) -v 2>&1 | grep -q "$(shell util/crossgcc/buildgcc -s iasl)" || echo not-coreboot; else echo not-coreboot; fi), \
$(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)$(warning Please use the coreboot toolchain version of iasl - $(shell util/crossgcc/buildgcc -s iasl)))
endif
-endif
ifeq ($(COMPILERFAIL),1)
ifneq ($(XGCCPATH),)
$(warning )
@@ -172,10 +171,12 @@ $(warning )
$(warning To build the entire coreboot toolchain: make crossgcc)
ifeq ($(IASLFAIL),1)
$(warning To build just IASL: make iasl)
-endif
+endif #($(IASLFAIL),1)
$(warning For more toolchain build targets: make help_toolchain)
$(warning )
$(warning *** To try to use your own toolchain, run 'make menuconfig', then select the)
$(warning *** config option: General setup -> Allow building with any toolchain)
$(error Note that this is NOT supported. Using it means you're on your own)
-endif
+endif #($(COMPILERFAIL),1)
+
+endif #($(NOCOMPILE),1)
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12677
-gerrit
commit 4951f7094a53ea4e9fcfb4674312e912c9bf9151
Author: Martin Roth <martinroth(a)google.com>
Date: Mon Dec 7 14:13:40 2015 -0700
toolchain.inc: print XGCCPATH if it's set
To help a user debug issues, print the current XGCCPATH value if
it's set.
Change-Id: I69afdd1c93cfd4747547ecad0d5e1ab4c87511b7
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
toolchain.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/toolchain.inc b/toolchain.inc
index 94b0bc4..a73ecaa 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -164,6 +164,10 @@ $(if $(shell if [ -n "$(IASL)" ]; then $(IASL) -v 2>&1 | grep -q "$(shell util/c
endif
endif
ifeq ($(COMPILERFAIL),1)
+ifneq ($(XGCCPATH),)
+$(warning )
+$(warning Path to your toolchain is currently set to '$(XGCCPATH)')
+endif
$(warning )
$(warning To build the entire coreboot toolchain: make crossgcc)
ifeq ($(IASLFAIL),1)
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12676
-gerrit
commit f94984ef1233600e89c213b113157a68f2902e84
Author: Martin Roth <martinroth(a)google.com>
Date: Mon Dec 7 14:07:10 2015 -0700
toolchain.inc: Test for toolchain when using llvm/clang
Change-Id: I45ed5e289f9bfae90d71938243f921588b256e39
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
toolchain.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/toolchain.inc b/toolchain.inc
index c325509..94b0bc4 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -148,11 +148,12 @@ $(call init_stages)
# Test for coreboot toolchain (except when explicitly not requested)
ifneq ($(NOCOMPILE),1)
-# only run if we're doing a build (not for tests, kconfig, ...), using gcc
+# only run if we're doing a build (not for tests, kconfig, ...)
# rationale: gcc versions by Linux distributions tend to be quite messed up
+# llvm/clang also needs patches supplied by the coreboot build
COMPILERFAIL:=0
IASLFAIL:=0
-ifeq ($(CONFIG_COMPILER_GCC),y)
+
ifneq ($(CONFIG_ANY_TOOLCHAIN),y)
$(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage)-y))), \
$(if $(shell if [ -n "$(CC_$(arch))" ]; then $(CC_$(arch)) -v 2>&1 |grep -q "gcc version .*coreboot toolchain" || echo not-coreboot; else echo not-coreboot; fi), \
@@ -162,7 +163,6 @@ $(if $(shell if [ -n "$(IASL)" ]; then $(IASL) -v 2>&1 | grep -q "$(shell util/c
$(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)$(warning Please use the coreboot toolchain version of iasl - $(shell util/crossgcc/buildgcc -s iasl)))
endif
endif
-endif
ifeq ($(COMPILERFAIL),1)
$(warning )
$(warning To build the entire coreboot toolchain: make crossgcc)
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12675
-gerrit
commit 764995d494ad68cc0cdb745c540162383de575ee
Author: Martin Roth <martinroth(a)google.com>
Date: Mon Dec 7 14:04:27 2015 -0700
toolchain.inc: fix typo
Change-Id: I6336881f0ec3568e14c03c55c7c060eba9f4be53
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
toolchain.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolchain.inc b/toolchain.inc
index 7246580..c325509 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -146,7 +146,7 @@ $(eval $(call toolchain_to_dir))
$(call init_stages)
-# Test for coreboot toolchain (except when explicitely not requested)
+# Test for coreboot toolchain (except when explicitly not requested)
ifneq ($(NOCOMPILE),1)
# only run if we're doing a build (not for tests, kconfig, ...), using gcc
# rationale: gcc versions by Linux distributions tend to be quite messed up
Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12674
-gerrit
commit e1a5c43e4995d29c8f0bfb34ac95cfba7e3991ed
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Mon Dec 7 21:35:40 2015 +0100
google/oak: define flash size
We never defined the flash size for this board, so the (too small)
default was used. Instead, adopt the size given in depthcharge's fmap
description.
Change-Id: I63782922ee05a9595d6c0de56750460ebb67aec6
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
---
src/mainboard/google/oak/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig
index e45fb4c..6c3fd5f 100644
--- a/src/mainboard/google/oak/Kconfig
+++ b/src/mainboard/google/oak/Kconfig
@@ -23,6 +23,7 @@ config BOARD_SPECIFIC_OPTIONS
def_bool y
select SOC_MEDIATEK_MT8173
select BOARD_ID_AUTO
+ select BOARD_ROMSIZE_KB_4096
select CHROMEOS_VBNV_EC
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI