[coreboot-gerrit] New patch to review for coreboot: 86cf7e6 Add support to enable/disable builtin GbE (again)

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Fri Jun 28 01:04:42 CEST 2013


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3568

-gerrit

commit 86cf7e6345865a2a00c4ff04e041e6e336ee5919
Author: Stefan Reinauer <reinauer at chromium.org>
Date:   Thu Jun 27 15:59:18 2013 -0700

    Add support to enable/disable builtin GbE (again)
    
    This requires a new system agent binary (v6 / v11 on haswell).
    Note that the existing system agent binaries are long time obsolete
    and won't work with current coreboot, so this update is overview.
    
    Change-Id: I48d8649576ca84d2b85ab082ce06f3462e189059
    Signed-off-by: Stefan Reinauer <reinauer at google.com>
---
 src/mainboard/samsung/lumpy/romstage.c         | 1 +
 src/mainboard/samsung/stumpy/romstage.c        | 1 +
 src/northbridge/intel/haswell/pei_data.h       | 3 ++-
 src/northbridge/intel/sandybridge/Kconfig      | 3 +--
 src/northbridge/intel/sandybridge/Makefile.inc | 5 -----
 src/northbridge/intel/sandybridge/pei_data.h   | 3 ++-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index b941021..be1411e 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -148,6 +148,7 @@ void main(unsigned long bist)
 #endif
 
 	struct pei_data pei_data = {
+		.pei_version = PEI_VERSION,
 		.mchbar = DEFAULT_MCHBAR,
 		.dmibar = DEFAULT_DMIBAR,
 		.epbar = DEFAULT_EPBAR,
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index dda3ab5..f64e860 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -183,6 +183,7 @@ void main(unsigned long bist)
 	};
 #endif
 	struct pei_data pei_data = {
+		pei_version: PEI_VERSION,
 		mchbar: DEFAULT_MCHBAR,
 		dmibar: DEFAULT_DMIBAR,
 		epbar: DEFAULT_EPBAR,
diff --git a/src/northbridge/intel/haswell/pei_data.h b/src/northbridge/intel/haswell/pei_data.h
index 280c73b..7c10e41 100644
--- a/src/northbridge/intel/haswell/pei_data.h
+++ b/src/northbridge/intel/haswell/pei_data.h
@@ -31,7 +31,7 @@
 #define PEI_DATA_H
 
 typedef void (*tx_byte_func)(unsigned char byte);
-#define PEI_VERSION 10
+#define PEI_VERSION 11
 
 struct pei_data
 {
@@ -53,6 +53,7 @@ struct pei_data
 	uint8_t spd_addresses[4];
 	int boot_mode;
 	int ec_present;
+	int gbe_enable;
 	// 0 = leave channel enabled
 	// 1 = disable dimm 0 on channel
 	// 2 = disable dimm 1 on channel
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index 56d2cd7..28244f3 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -118,8 +118,7 @@ config HAVE_MRC
 config MRC_FILE
 	string "Intel System Agent path and filename"
 	depends on HAVE_MRC
-	default "systemagent-ivybridge.bin" if NORTHBRIDGE_INTEL_IVYBRIDGE
-	default "systemagent-sandybridge.bin" if NORTHBRIDGE_INTEL_SANDYBRIDGE
+	default "systemagent-v6.bin"
 	help
 	  The path and filename of the file to use as System Agent
 	  binary.
diff --git a/src/northbridge/intel/sandybridge/Makefile.inc b/src/northbridge/intel/sandybridge/Makefile.inc
index 1428bdb..be07e93 100644
--- a/src/northbridge/intel/sandybridge/Makefile.inc
+++ b/src/northbridge/intel/sandybridge/Makefile.inc
@@ -35,12 +35,7 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c
 # We don't ship that, but booting without it is bound to fail
 cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin
 mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE))
-ifeq ($(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE),y)
 mrc.bin-position := 0xfffa0000
-endif
-ifeq ($(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE),y)
-mrc.bin-position := 0xfffe0000
-endif
 mrc.bin-type := 0xab
 
 $(obj)/mrc.cache:
diff --git a/src/northbridge/intel/sandybridge/pei_data.h b/src/northbridge/intel/sandybridge/pei_data.h
index fb56873..d317515 100644
--- a/src/northbridge/intel/sandybridge/pei_data.h
+++ b/src/northbridge/intel/sandybridge/pei_data.h
@@ -38,7 +38,7 @@ typedef struct {
 } pch_usb3_controller_settings;
 
 typedef void (*tx_byte_func)(unsigned char byte);
-#define PEI_VERSION 5
+#define PEI_VERSION 6
 
 struct pei_data
 {
@@ -61,6 +61,7 @@ struct pei_data
 	uint8_t ts_addresses[4];
 	int boot_mode;
 	int ec_present;
+	int gbe_enable;
 	// 0 = leave channel enabled
 	// 1 = disable dimm 0 on channel
 	// 2 = disable dimm 1 on channel



More information about the coreboot-gerrit mailing list