December 2015 - coreboot-gerrit

Patch set updated for coreboot: util/crossgcc: Regenerate GMP autotools files before build
by Timothy Pearson Dec. 31, 2015

Dec. 31, 2015

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12816 -gerrit commit e9f4c34f65d36ea4dd4fc1bed0196fe205896b91 Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Wed Dec 30 14:52:19 2015 -0600 util/crossgcc: Regenerate GMP autotools files before build The config.guess file included with GMP is completely obsolete, leading to build failures on ppc64el due to the system architecture not being detected. Regenerate the files from the host system via automake before attempting to build GMP. Change-Id: I00fc16003906e373d112c25978197ac907adccfd Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> --- util/crossgcc/buildgcc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 988e3c3..8b52d5f 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -367,6 +367,10 @@ build_GMP() { build_MPFR() { test $UNAME = "Darwin" && CFLAGS="$CFLAGS -force_cpusubtype_ALL" + BUILD_DIR="$PWD" + cd ../${MPFR_DIR}/ + CC="$CC" automake --add-missing --copy --force-missing + cd "$BUILD_DIR" CC="$CC" ../${MPFR_DIR}/configure --disable-shared --prefix=$TARGETDIR \ --infodir=$TARGETDIR/info \ --with-gmp=$DESTDIR$TARGETDIR CFLAGS="$HOSTCFLAGS" || \

1 0

Patch set updated for coreboot: superio/it8772f: Add switch to enable HWM (Hardware Monitor)
by Matt DeVillier Dec. 31, 2015

Dec. 31, 2015

Matt DeVillier (matt.devillier(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12798 -gerrit commit d6a13aaafa7ae0f6c98ed59792c7c8d3c9020222 Author: Ted Kuo <tedkuo(a)ami.com.tw> Date: Wed Mar 18 10:42:22 2015 +0800 superio/it8772f: Add switch to enable HWM (Hardware Monitor) Set up External Temperature to read via thermal diode/resistor into TMPINx register by setting thermal_mode switch. Original-Signed-off-by: Ted Kuo <tedkuo(a)ami.com.tw> Change-Id: I0e8621b92faa5c6246e009d2f852c8d4db484034 Original-Reviewed-on: https://chromium-review.googlesource.com/260545 Original-Reviewed-by: Shawn N <shawnn(a)chromium.org> Original-Tested-by: Ted Kuo <tedkuo(a)ami.com.tw> Original-(cherry picked from commit 973e2d393f2595b756f8aa20f6fbe3b6e045621a) Original-Reviewed-on: https://chromium-review.googlesource.com/262340 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> --- src/superio/ite/it8772f/chip.h | 7 +++++++ src/superio/ite/it8772f/it8772f.h | 8 +++++++ src/superio/ite/it8772f/superio.c | 44 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/src/superio/ite/it8772f/chip.h b/src/superio/ite/it8772f/chip.h index 78ded22..0d80fb8 100644 --- a/src/superio/ite/it8772f/chip.h +++ b/src/superio/ite/it8772f/chip.h @@ -18,6 +18,7 @@ #define SUPERIO_ITE_IT8772F_CHIP_H #include <device/device.h> +#include "it8772f.h" struct superio_ite_it8772f_config { /* GPIO SimpleIO register values via devicetree.cb */ @@ -37,6 +38,12 @@ struct superio_ite_it8772f_config { u8 peci_tmpin; /* + * Enable thermal mode on tmpinx. + */ + enum thermal_mode tmpin1_mode; + enum thermal_mode tmpin2_mode; + + /* * Enable a FAN for sofware control. */ u8 fan1_enable; diff --git a/src/superio/ite/it8772f/it8772f.h b/src/superio/ite/it8772f/it8772f.h index 8e82bef..2031fff 100644 --- a/src/superio/ite/it8772f/it8772f.h +++ b/src/superio/ite/it8772f/it8772f.h @@ -17,6 +17,13 @@ #ifndef SUPERIO_ITE_IT8772F_H #define SUPERIO_ITE_IT8772F_H +/* Supported thermal mode on TMPINx */ +enum thermal_mode { + THERMAL_MODE_DISABLED = 0, + THERMAL_DIODE, + THERMAL_RESISTOR, +}; + #define IT8772F_FDC 0x00 /* Floppy disk controller */ #define IT8772F_SP1 0x01 /* Com1 */ #define IT8772F_EC 0x04 /* Environment controller */ @@ -26,6 +33,7 @@ #define IT8772F_IR 0x0a /* Consumer IR */ /* Environmental Controller interface */ +#define IT8772F_CONFIGURATION 0x00 #define IT8772F_INTERFACE_SELECT 0x0a #define IT8772F_INTERFACE_PSEUDO_EOC (1 << 7) #define IT8772F_INTERFACE_SMB_ENABLE (1 << 6) diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c index 6c6a503..89f7cff 100644 --- a/src/superio/ite/it8772f/superio.c +++ b/src/superio/ite/it8772f/superio.c @@ -16,6 +16,7 @@ #include <device/device.h> #include <device/pnp.h> +#include <console/console.h> #include <pc80/keyboard.h> #include <arch/io.h> #include <delay.h> @@ -97,6 +98,43 @@ static void it8772f_enable_peci(struct resource *res, int tmpin) } /* + * Set up External Temperature to read via thermal diode/resistor + * into TMPINx register + */ +static void it8772f_enable_tmpin(struct resource *res, int tmpin, + enum thermal_mode mode) +{ + u8 reg; + + if (tmpin != 1 && tmpin != 2) + return; + + reg = it8772f_envc_read(res, IT8772F_ADC_TEMP_CHANNEL_ENABLE); + + switch (mode) { + case THERMAL_DIODE: + /* Thermal Diode Mode */ + it8772f_envc_write(res, IT8772F_ADC_TEMP_CHANNEL_ENABLE, + reg | tmpin); + break; + case THERMAL_RESISTOR: + /* Thermal Resistor Mode */ + it8772f_envc_write(res, IT8772F_ADC_TEMP_CHANNEL_ENABLE, + reg | (tmpin << 3)); + break; + default: + printk(BIOS_ERR, "Unsupported thermal mode 0x%x on TMPIN%d\n", + mode, tmpin); + return; + } + + reg = it8772f_envc_read(res, IT8772F_CONFIGURATION); + + /* Enable the startup of monitoring operation */ + it8772f_envc_write(res, IT8772F_CONFIGURATION, reg | 0x01); +} + +/* * Setup a FAN PWM interface for software control */ static void it8772f_enable_fan(struct resource *res, int fan) @@ -160,6 +198,12 @@ static void it8772f_init(struct device *dev) /* Enable PECI if configured */ it8772f_enable_peci(res, conf->peci_tmpin); + /* Enable HWM if configured */ + if (conf->tmpin1_mode != THERMAL_MODE_DISABLED) + it8772f_enable_tmpin(res, 1, conf->tmpin1_mode); + if (conf->tmpin2_mode != THERMAL_MODE_DISABLED) + it8772f_enable_tmpin(res, 2, conf->tmpin2_mode); + /* Enable FANx if configured */ if (conf->fan1_enable) it8772f_enable_fan(res, 1);

1 0

Patch set updated for coreboot: superio/it8772f: Add switch to enable HWM (Hardware Monitor)
by Matt DeVillier Dec. 31, 2015

Dec. 31, 2015

Matt DeVillier (matt.devillier(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12798 -gerrit commit cc0a1e484ffccfc1ddf44a15701f8fb9e2ed12b9 Author: Ted Kuo <tedkuo(a)ami.com.tw> Date: Wed Mar 18 10:42:22 2015 +0800 superio/it8772f: Add switch to enable HWM (Hardware Monitor) Set up External Temperature to read via thermal diode/resistor into TMPINx register by setting thermal_mode switch. Original-Signed-off-by: Ted Kuo <tedkuo(a)ami.com.tw> Change-Id: I0e8621b92faa5c6246e009d2f852c8d4db484034 Original-Reviewed-on: https://chromium-review.googlesource.com/260545 Original-Reviewed-by: Shawn N <shawnn(a)chromium.org> Original-Commit-Queue: Ted Kuo <tedkuo(a)ami.com.tw> Original-Tested-by: Ted Kuo <tedkuo(a)ami.com.tw> Original-(cherry picked from commit 973e2d393f2595b756f8aa20f6fbe3b6e045621a) Original-Reviewed-on: https://chromium-review.googlesource.com/262340 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> --- src/superio/ite/it8772f/chip.h | 7 +++++++ src/superio/ite/it8772f/it8772f.h | 8 +++++++ src/superio/ite/it8772f/superio.c | 44 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/src/superio/ite/it8772f/chip.h b/src/superio/ite/it8772f/chip.h index 78ded22..0d80fb8 100644 --- a/src/superio/ite/it8772f/chip.h +++ b/src/superio/ite/it8772f/chip.h @@ -18,6 +18,7 @@ #define SUPERIO_ITE_IT8772F_CHIP_H #include <device/device.h> +#include "it8772f.h" struct superio_ite_it8772f_config { /* GPIO SimpleIO register values via devicetree.cb */ @@ -37,6 +38,12 @@ struct superio_ite_it8772f_config { u8 peci_tmpin; /* + * Enable thermal mode on tmpinx. + */ + enum thermal_mode tmpin1_mode; + enum thermal_mode tmpin2_mode; + + /* * Enable a FAN for sofware control. */ u8 fan1_enable; diff --git a/src/superio/ite/it8772f/it8772f.h b/src/superio/ite/it8772f/it8772f.h index 8e82bef..2031fff 100644 --- a/src/superio/ite/it8772f/it8772f.h +++ b/src/superio/ite/it8772f/it8772f.h @@ -17,6 +17,13 @@ #ifndef SUPERIO_ITE_IT8772F_H #define SUPERIO_ITE_IT8772F_H +/* Supported thermal mode on TMPINx */ +enum thermal_mode { + THERMAL_MODE_DISABLED = 0, + THERMAL_DIODE, + THERMAL_RESISTOR, +}; + #define IT8772F_FDC 0x00 /* Floppy disk controller */ #define IT8772F_SP1 0x01 /* Com1 */ #define IT8772F_EC 0x04 /* Environment controller */ @@ -26,6 +33,7 @@ #define IT8772F_IR 0x0a /* Consumer IR */ /* Environmental Controller interface */ +#define IT8772F_CONFIGURATION 0x00 #define IT8772F_INTERFACE_SELECT 0x0a #define IT8772F_INTERFACE_PSEUDO_EOC (1 << 7) #define IT8772F_INTERFACE_SMB_ENABLE (1 << 6) diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c index 6c6a503..89f7cff 100644 --- a/src/superio/ite/it8772f/superio.c +++ b/src/superio/ite/it8772f/superio.c @@ -16,6 +16,7 @@ #include <device/device.h> #include <device/pnp.h> +#include <console/console.h> #include <pc80/keyboard.h> #include <arch/io.h> #include <delay.h> @@ -97,6 +98,43 @@ static void it8772f_enable_peci(struct resource *res, int tmpin) } /* + * Set up External Temperature to read via thermal diode/resistor + * into TMPINx register + */ +static void it8772f_enable_tmpin(struct resource *res, int tmpin, + enum thermal_mode mode) +{ + u8 reg; + + if (tmpin != 1 && tmpin != 2) + return; + + reg = it8772f_envc_read(res, IT8772F_ADC_TEMP_CHANNEL_ENABLE); + + switch (mode) { + case THERMAL_DIODE: + /* Thermal Diode Mode */ + it8772f_envc_write(res, IT8772F_ADC_TEMP_CHANNEL_ENABLE, + reg | tmpin); + break; + case THERMAL_RESISTOR: + /* Thermal Resistor Mode */ + it8772f_envc_write(res, IT8772F_ADC_TEMP_CHANNEL_ENABLE, + reg | (tmpin << 3)); + break; + default: + printk(BIOS_ERR, "Unsupported thermal mode 0x%x on TMPIN%d\n", + mode, tmpin); + return; + } + + reg = it8772f_envc_read(res, IT8772F_CONFIGURATION); + + /* Enable the startup of monitoring operation */ + it8772f_envc_write(res, IT8772F_CONFIGURATION, reg | 0x01); +} + +/* * Setup a FAN PWM interface for software control */ static void it8772f_enable_fan(struct resource *res, int fan) @@ -160,6 +198,12 @@ static void it8772f_init(struct device *dev) /* Enable PECI if configured */ it8772f_enable_peci(res, conf->peci_tmpin); + /* Enable HWM if configured */ + if (conf->tmpin1_mode != THERMAL_MODE_DISABLED) + it8772f_enable_tmpin(res, 1, conf->tmpin1_mode); + if (conf->tmpin2_mode != THERMAL_MODE_DISABLED) + it8772f_enable_tmpin(res, 2, conf->tmpin2_mode); + /* Enable FANx if configured */ if (conf->fan1_enable) it8772f_enable_fan(res, 1);

1 0

Patch set updated for coreboot: superio/it8772f: Add register to set the default value of FAN speed
by Matt DeVillier Dec. 31, 2015

Dec. 31, 2015

Matt DeVillier (matt.devillier(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12799 -gerrit commit 2f6ab98ca238e3743e2f5837f27f54ccda7b0a54 Author: Ted Kuo <tedkuo(a)ami.com.tw> Date: Fri Mar 27 18:59:07 2015 +0800 superio/it8772f: Add register to set the default value of FAN speed Original-Signed-off-by: Ted Kuo <tedkuo(a)ami.com.tw> Change-Id: I70d7b572e9ae030136a39fb6fa933f486d559aef Original-Reviewed-on: https://chromium-review.googlesource.com/262832 Original-Reviewed-by: Shawn N <shawnn(a)chromium.org> Original-Commit-Queue: Ted Kuo <tedkuo(a)ami.com.tw> Original-Tested-by: Ted Kuo <tedkuo(a)ami.com.tw> Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> --- src/superio/ite/it8772f/chip.h | 6 ++++++ src/superio/ite/it8772f/superio.c | 22 ++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/superio/ite/it8772f/chip.h b/src/superio/ite/it8772f/chip.h index 2ceeee0..1d84850 100644 --- a/src/superio/ite/it8772f/chip.h +++ b/src/superio/ite/it8772f/chip.h @@ -48,6 +48,12 @@ struct superio_ite_it8772f_config { u8 fan1_enable; u8 fan2_enable; u8 fan3_enable; + + /* + * Default FAN speed + */ + u8 fan2_speed; + u8 fan3_speed; }; #endif /* SUPERIO_ITE_IT8772F_CHIP_H */ diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c index cac6898..2b891b2 100644 --- a/src/superio/ite/it8772f/superio.c +++ b/src/superio/ite/it8772f/superio.c @@ -137,7 +137,7 @@ static void it8772f_enable_tmpin(struct resource *res, int tmpin, /* * Setup a FAN PWM interface for software control */ -static void it8772f_enable_fan(struct resource *res, int fan) +static void it8772f_enable_fan(struct resource *res, int fan, u8 fan_speed) { u8 reg; @@ -165,8 +165,10 @@ static void it8772f_enable_fan(struct resource *res, int fan) /* Disable Smoothing */ it8772f_envc_write(res, IT8772F_FAN_CTL2_AUTO_MODE, IT8772F_FAN_CTL_AUTO_SMOOTHING_DIS); - /* Set a default medium fan speed */ - it8772f_envc_write(res, IT8772F_FAN_CTL2_PWM_START, 0x80); + /* Set a default fan speed */ + if (fan_speed) + it8772f_envc_write(res, IT8772F_FAN_CTL2_PWM_START, + fan_speed); break; case 3: /* Enable software operation */ @@ -175,8 +177,10 @@ static void it8772f_enable_fan(struct resource *res, int fan) /* Disable Smoothing */ it8772f_envc_write(res, IT8772F_FAN_CTL3_AUTO_MODE, IT8772F_FAN_CTL_AUTO_SMOOTHING_DIS); - /* Set a default medium fan speed */ - it8772f_envc_write(res, IT8772F_FAN_CTL3_PWM_START, 0x80); + /* Set a default fan speed */ + if (fan_speed) + it8772f_envc_write(res, IT8772F_FAN_CTL3_PWM_START, + fan_speed); break; } } @@ -206,11 +210,13 @@ static void it8772f_init(struct device *dev) /* Enable FANx if configured */ if (conf->fan1_enable) - it8772f_enable_fan(res, 1); + it8772f_enable_fan(res, 1, 0); if (conf->fan2_enable) - it8772f_enable_fan(res, 2); + it8772f_enable_fan(res, 2, + conf->fan2_speed ? conf->fan2_speed : 0x80); if (conf->fan3_enable) - it8772f_enable_fan(res, 3); + it8772f_enable_fan(res, 3, + conf->fan3_speed ? conf->fan3_speed : 0x80); /* * System may get wrong temperature data when SIO is in

1 0

Patch set updated for coreboot: toolchain.inc: Skip how to use any toolchain if it's selected
by Martin Roth Dec. 30, 2015

Dec. 30, 2015

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 31ef2d1449f7bc3601c4ab015372e8e216cf40a4 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 ef3ae16..7a0864e 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)

1 0

Patch set updated for coreboot: toolchain.inc: Move nocompile around entire check, Comment endifs
by Martin Roth Dec. 30, 2015

Dec. 30, 2015

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 3a539b2bda7f1a2509e8860c8a1192912a96f1a7 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 c03881c..ef3ae16 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)

1 0

Patch set updated for coreboot: xcompile: Remove warnings about missing tools & architectures
by Martin Roth Dec. 30, 2015

Dec. 30, 2015

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 8fdfefb256483b7e98d52994241b79299a3aed7f 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 | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 635bcd6..afd5986 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,19 +348,13 @@ 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" -a "power8" != "$architecture" ]; then - echo "Warning: no suitable compiler for $architecture." >&2 - return 1 - fi } # This loops over all supported architectures. for architecture in $SUPPORTED_ARCHITECTURES; do - if test_architecture $architecture; then - detect_special_flags "$architecture" - detect_compiler_runtime "$architecture" - report_arch_toolchain - fi + test_architecture $architecture + detect_special_flags "$architecture" + detect_compiler_runtime "$architecture" + report_arch_toolchain done echo XCOMPILE_COMPLETE:=1

1 0

Patch set updated for coreboot: toolchain.inc: Test for valid toolchain when ANY_TOOLCHAIN is used
by Martin Roth Dec. 30, 2015

Dec. 30, 2015

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 ff3aed7ce981b0e649c1b4c21570ab1929ba79f2 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 f2a6232..ee8d776 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),)

1 0

Patch set updated for coreboot: toolchain.inc: Update help text, Add TODO.
by Martin Roth Dec. 30, 2015

Dec. 30, 2015

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 5a089f386b9991e9db76d16cd2019de4f6b13e04 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 7a0864e..f2a6232 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 "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)

1 0

Patch set updated for coreboot: toolchain.inc: Test for toolchain when using llvm/clang
by Martin Roth Dec. 30, 2015

Dec. 30, 2015

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 bdf9bbd33f61b960cfbfd0fe3662df67200fa7b9 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/toolchain.inc b/toolchain.inc index bbd99ca..c03881c 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -148,21 +148,21 @@ $(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), \ + $(if $(shell if [ -n "$(CC_$(arch))" ]; then $(CC_$(arch)) -v 2>&1 |grep -q "coreboot toolchain" || echo not-coreboot; else echo not-coreboot; fi), \ $(eval COMPILERFAIL:=1)$(warning Please use the coreboot toolchain for '$(arch)'))) #if iasl doesn't match the current coreboot version, fail the test $(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 -endif ifeq ($(COMPILERFAIL),1) ifneq ($(XGCCPATH),) $(warning )

1 0