Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12497
-gerrit
commit d9eb00ef9b77e7cdef371b78a7e024c3c8551b80
Author: Martin Roth <martinroth(a)google.com>
Date: Thu Nov 19 18:24:30 2015 -0700
chromeos: Fix Kconfig TPM warnings on systems with no LPC TPM
Put dependecies on CHROMEOS's selection of the Kconfig symbols
TPM_INIT_FAILURE_IS_FATAL and SKIP_TPM_STARTUP_ON_NORMAL_BOOT to match
the dependencies on those symbols where they are defined in
src/drivers/pc80/tpm/Kconfig
The file that uses these only gets built in if CONFIG_LPC_TPM is
selected selected.
The warnings were:
warning: (CHROMEOS) selects TPM_INIT_FAILURE_IS_FATAL which has unmet
direct dependencies (PC80_SYSTEM && LPC_TPM)
warning: (CHROMEOS) selects SKIP_TPM_STARTUP_ON_NORMAL_BOOT which has
unmet direct dependencies (PC80_SYSTEM && LPC_TPM)
Change-Id: I7af00c79050bf511758bf29e3d57f6ff34d2a296
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
src/vendorcode/google/chromeos/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index 02bb227..4d05b3e 100644
--- a/src/vendorcode/google/chromeos/Kconfig
+++ b/src/vendorcode/google/chromeos/Kconfig
@@ -22,8 +22,8 @@ config CHROMEOS
bool "Build for ChromeOS"
default n
select TPM
- select TPM_INIT_FAILURE_IS_FATAL
- select SKIP_TPM_STARTUP_ON_NORMAL_BOOT
+ select TPM_INIT_FAILURE_IS_FATAL if PC80_SYSTEM && LPC_TPM
+ select SKIP_TPM_STARTUP_ON_NORMAL_BOOT if PC80_SYSTEM && LPC_TPM
select BOOTMODE_STRAPS
select ELOG
select COLLECT_TIMESTAMPS
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12497
-gerrit
commit b8a7d2e055ff46920c39adef9d65476431f28b23
Author: Martin Roth <martinroth(a)google.com>
Date: Thu Nov 19 18:24:30 2015 -0700
chromeos: Fix Kconfig TPM warnings on systems with no LPC TPM
Put dependecies on CHROMEOS's selection of the Kconfig symbols
TPM_INIT_FAILURE_IS_FATAL and SKIP_TPM_STARTUP_ON_NORMAL_BOOT to match
the dependencies on those symbols where they are defined in
src/drivers/pc80/tpm/Kconfig
The file that uses these only gets built in if CONFIG_LPC_TPM is
selected selected.
The warnings were:
warning: (CHROMEOS) selects TPM_INIT_FAILURE_IS_FATAL which has unmet
direct dependencies (PC80_SYSTEM && LPC_TPM)
warning: (CHROMEOS) selects SKIP_TPM_STARTUP_ON_NORMAL_BOOT which has
unmet direct dependencies (PC80_SYSTEM && LPC_TPM)
Change-Id: I7af00c79050bf511758bf29e3d57f6ff34d2a296
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
src/vendorcode/google/chromeos/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index 02bb227..4d05b3e 100644
--- a/src/vendorcode/google/chromeos/Kconfig
+++ b/src/vendorcode/google/chromeos/Kconfig
@@ -22,8 +22,8 @@ config CHROMEOS
bool "Build for ChromeOS"
default n
select TPM
- select TPM_INIT_FAILURE_IS_FATAL
- select SKIP_TPM_STARTUP_ON_NORMAL_BOOT
+ select TPM_INIT_FAILURE_IS_FATAL if PC80_SYSTEM && LPC_TPM
+ select SKIP_TPM_STARTUP_ON_NORMAL_BOOT if PC80_SYSTEM && LPC_TPM
select BOOTMODE_STRAPS
select ELOG
select COLLECT_TIMESTAMPS
Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12495
-gerrit
commit a8d43350a741f42d90bddf3d5c3448115a0f38fe
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Thu Nov 19 17:12:30 2015 -0800
Add rules.h to FSP include util.h
util.h uses ENV_* and hence needs to have rules.h
This is required for successful compilation of strago.
Change-Id: I0df35e90e2010aac43ef0a4d900f20c842d3bcb5
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
src/drivers/intel/fsp1_1/include/fsp/util.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/drivers/intel/fsp1_1/include/fsp/util.h b/src/drivers/intel/fsp1_1/include/fsp/util.h
index 49a7798..5595e73 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/util.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/util.h
@@ -17,6 +17,7 @@
#ifndef FSP1_1_UTIL_H
#define FSP1_1_UTIL_H
+#include <rules.h>
#include <fsp/api.h>
/* Current users expect to get the SoC's FSP definitions by including util.h. */
#include <fsp/soc_binding.h>
Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12463
-gerrit
commit 7fb286a3ee5118c26b4339b5ef2fcc732a73ef70
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Wed Nov 18 15:21:34 2015 -0800
Drop abuild.disabled files for Braswell / Skylake boards
Make sure the latest & greatest Intel targets actually
build in our build system.
Change-Id: I479ad473c260fc914d224cb58f4be1837aff2502
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
src/mainboard/google/chell/abuild.disabled | 2 --
src/mainboard/google/cyan/abuild.disabled | 2 --
src/mainboard/google/glados/abuild.disabled | 2 --
src/mainboard/google/lars/abuild.disabled | 2 --
src/mainboard/intel/kunimitsu/abuild.disabled | 2 --
src/mainboard/intel/sklrvp/abuild.disabled | 2 --
src/mainboard/intel/strago/abuild.disabled | 2 --
7 files changed, 14 deletions(-)
diff --git a/src/mainboard/google/chell/abuild.disabled b/src/mainboard/google/chell/abuild.disabled
deleted file mode 100644
index 7d1725a..0000000
--- a/src/mainboard/google/chell/abuild.disabled
+++ /dev/null
@@ -1,2 +0,0 @@
-Successful builds for this board require the Skylake FSP binary and header files
-along with the Skylake microcode files from Intel.
diff --git a/src/mainboard/google/cyan/abuild.disabled b/src/mainboard/google/cyan/abuild.disabled
deleted file mode 100644
index 025ebea..0000000
--- a/src/mainboard/google/cyan/abuild.disabled
+++ /dev/null
@@ -1,2 +0,0 @@
-Successful builds for this board require the Braswell FSP binary and header
-files along with the Braswell microcode files from Intel.
diff --git a/src/mainboard/google/glados/abuild.disabled b/src/mainboard/google/glados/abuild.disabled
deleted file mode 100644
index 7d1725a..0000000
--- a/src/mainboard/google/glados/abuild.disabled
+++ /dev/null
@@ -1,2 +0,0 @@
-Successful builds for this board require the Skylake FSP binary and header files
-along with the Skylake microcode files from Intel.
diff --git a/src/mainboard/google/lars/abuild.disabled b/src/mainboard/google/lars/abuild.disabled
deleted file mode 100644
index 7d1725a..0000000
--- a/src/mainboard/google/lars/abuild.disabled
+++ /dev/null
@@ -1,2 +0,0 @@
-Successful builds for this board require the Skylake FSP binary and header files
-along with the Skylake microcode files from Intel.
diff --git a/src/mainboard/intel/kunimitsu/abuild.disabled b/src/mainboard/intel/kunimitsu/abuild.disabled
deleted file mode 100644
index 7d1725a..0000000
--- a/src/mainboard/intel/kunimitsu/abuild.disabled
+++ /dev/null
@@ -1,2 +0,0 @@
-Successful builds for this board require the Skylake FSP binary and header files
-along with the Skylake microcode files from Intel.
diff --git a/src/mainboard/intel/sklrvp/abuild.disabled b/src/mainboard/intel/sklrvp/abuild.disabled
deleted file mode 100644
index 7d1725a..0000000
--- a/src/mainboard/intel/sklrvp/abuild.disabled
+++ /dev/null
@@ -1,2 +0,0 @@
-Successful builds for this board require the Skylake FSP binary and header files
-along with the Skylake microcode files from Intel.
diff --git a/src/mainboard/intel/strago/abuild.disabled b/src/mainboard/intel/strago/abuild.disabled
deleted file mode 100644
index 025ebea..0000000
--- a/src/mainboard/intel/strago/abuild.disabled
+++ /dev/null
@@ -1,2 +0,0 @@
-Successful builds for this board require the Braswell FSP binary and header
-files along with the Braswell microcode files from Intel.
Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12493
-gerrit
commit b2c7be061b8566a17571cc721b3b7c7c767b5c6c
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Thu Nov 19 15:02:21 2015 -0800
x86emu: Undefine _NO_INLINE
Never defined by the server.
Change-Id: If22727cf3953c2931d107146fb99b5997f8a13d5
Original-Reviewed-by: Eric Anholt <eric(a)anholt.net>
Original-Signed-off-by: Adam Jackson <ajax(a)redhat.com>
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
src/device/oprom/x86emu/x86emui.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/device/oprom/x86emu/x86emui.h b/src/device/oprom/x86emu/x86emui.h
index 37339d5..fb6f8ca 100644
--- a/src/device/oprom/x86emu/x86emui.h
+++ b/src/device/oprom/x86emu/x86emui.h
@@ -48,7 +48,7 @@
* dramatically in this case).
*/
-#if defined(__cplusplus) && !defined(_NO_INLINE)
+#if defined(__cplusplus)
#define _INLINE inline
#else
#define _INLINE static
the following patch was just integrated into master:
commit f730e44baaf061e2ab8ea4e21b5b0d60bc681dc3
Author: Martin Roth <martinroth(a)google.com>
Date: Wed Nov 18 16:13:12 2015 -0700
google/veyron_danger & veyron_emile: Fix Kconfig warnings
These platforms needed to be adjusted to fix various Kconfig warnings.
Both platforms needed MAINBOARD_HAS_NATIVE_VGA_INIT because they're setting
MAINBOARD_DO_NATIVE_VGA_INIT.
veyron_emile needed a few symbols that depend on CHROMEOS to be moved
into a new config CHROMEOS section. This matches the other CHROMEOS
platforms.
veyron_danger needed to select MAINBOARD_HAS_CHROMEOS before the
CHROMEOS symbol was set.
Change-Id: I8c7f594ba572a02513a68095c16314006fb4e379
Signed-off-by: Martin Roth <martinroth(a)google.com>
Reviewed-on: http://review.coreboot.org/12462
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Tested-by: build bot (Jenkins)
See http://review.coreboot.org/12462 for details.
-gerrit