[coreboot-gerrit] New patch to review for coreboot: 9fe563d Revert "Add support to enable/disable builtin GbE"

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3553

-gerrit

commit 9fe563db87bf6a2bc20c018b310ac9c0c82d679b
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Wed Jun 26 23:20:13 2013 +0200

    Revert "Add support to enable/disable builtin GbE"
    
    This reverts commit d358a506c4230950e34d783bd0187cd200d60691
    
    http://review.coreboot.org/#/c/3514/ comments:
    The pei_data version changed to 6, so new binaries are needed.
    
    However, demand for new binary blob is not referenced with this commit nor is git submodules hash updated. Also the new binary blob almost doubles its size and no longer fits in the allocation sandybridge defines.
    
    Change-Id: I84eb70517d5b9278c611fdfa587a71f6ca0f657f
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/northbridge/intel/haswell/pei_data.h     | 3 +--
 src/northbridge/intel/sandybridge/pei_data.h | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/northbridge/intel/haswell/pei_data.h b/src/northbridge/intel/haswell/pei_data.h
index 7c10e41..280c73b 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 11
+#define PEI_VERSION 10
 
 struct pei_data
 {
@@ -53,7 +53,6 @@ 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/pei_data.h b/src/northbridge/intel/sandybridge/pei_data.h
index d317515..fb56873 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 6
+#define PEI_VERSION 5
 
 struct pei_data
 {
@@ -61,7 +61,6 @@ 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