New patch to review for coreboot: 16742d5 AMD Hudson A55E: Remove GEC Options from Build

[Bruce Griffith]

Bruce Griffith ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3127

-gerrit

commit 16742d5a98dac5aa19d82d8cc4bc4b700e72abcb
Author: Bruce Griffith <[e-mail]>
Date:   Tue Apr 23 14:31:55 2013 -0600

    AMD Hudson A55E: Remove GEC Options from Build
    
    Remove the GEC kconfig option from AMD Hudson builds.
    The GEC blobs are proprietary to AMD and there is no plan to
    release these into open-source.
    
    The "gigabit ethernet controller" (GEC) block was added to AMD
    Hudson A55E to integrate ethernet capabilities into an AMD
    southbridge.  The GEC block requires an opaque firmware blob to
    function and only works with B50610 and B50610M gigabit PHY chips
    from Broadcom.
    
    Change-Id: I7a7bf4d41e453390ecf987c9c45ef2434fc1f1a3
    Signed-off-by: Bruce Griffith <[e-mail]>
---
 src/mainboard/amd/parmer/BiosCallOuts.c       |  2 +-
 src/mainboard/amd/parmer/agesawrapper.c       |  1 -
 src/mainboard/amd/thatcher/BiosCallOuts.c     |  2 +-
 src/mainboard/amd/thatcher/agesawrapper.c     |  1 -
 src/southbridge/amd/agesa/hudson/Kconfig      | 11 -----------
 src/southbridge/amd/agesa/hudson/Makefile.inc | 25 +++----------------------
 6 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/src/mainboard/amd/parmer/BiosCallOuts.c b/src/mainboard/amd/parmer/BiosCallOuts.c
index 924ea19..c77d78d 100644
--- a/src/mainboard/amd/parmer/BiosCallOuts.c
+++ b/src/mainboard/amd/parmer/BiosCallOuts.c
@@ -269,7 +269,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
  * Fch Oem setting callback
  *
  *  Configure platform specific Hudson device,
- *   such Azalia, SATA, GEC, IMC etc.
+ *   such Azalia, SATA, IMC etc.
  */
 AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
 {
diff --git a/src/mainboard/amd/parmer/agesawrapper.c b/src/mainboard/amd/parmer/agesawrapper.c
index aecd1ea..a81a997 100644
--- a/src/mainboard/amd/parmer/agesawrapper.c
+++ b/src/mainboard/amd/parmer/agesawrapper.c
@@ -557,7 +557,6 @@ STATIC VOID s3_resume_init_data(FCH_DATA_BLOCK *FchParams)
 	FchParams->Sata.SataRaidSsid           = UserOptions.FchBldCfg->CfgSataRaidSsid;
 	FchParams->Sata.SataAhciSsid           = UserOptions.FchBldCfg->CfgSataAhciSsid;
 	FchParams->Sata.SataIdeSsid            = UserOptions.FchBldCfg->CfgSataIdeSsid;
-	FchParams->Gec.GecShadowRomBase        = UserOptions.FchBldCfg->CfgGecShadowRomBase;
 	FchParams->Spi.RomBaseAddress          = UserOptions.FchBldCfg->CfgSpiRomBaseAddress;
 	FchParams->Sd.SdSsid                   = UserOptions.FchBldCfg->CfgSdSsid;
 	FchParams->Spi.LpcSsid                 = UserOptions.FchBldCfg->CfgLpcSsid;
diff --git a/src/mainboard/amd/thatcher/BiosCallOuts.c b/src/mainboard/amd/thatcher/BiosCallOuts.c
index e0af994..9a3f61c 100644
--- a/src/mainboard/amd/thatcher/BiosCallOuts.c
+++ b/src/mainboard/amd/thatcher/BiosCallOuts.c
@@ -269,7 +269,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
  * Fch Oem setting callback
  *
  *  Configure platform specific Hudson device,
- *   such Azalia, SATA, GEC, IMC etc.
+ *   such Azalia, SATA, IMC etc.
  */
 AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
 {
diff --git a/src/mainboard/amd/thatcher/agesawrapper.c b/src/mainboard/amd/thatcher/agesawrapper.c
index df45148..f7577fd 100644
--- a/src/mainboard/amd/thatcher/agesawrapper.c
+++ b/src/mainboard/amd/thatcher/agesawrapper.c
@@ -559,7 +559,6 @@ STATIC VOID s3_resume_init_data(FCH_DATA_BLOCK *FchParams)
 	FchParams->Sata.SataRaidSsid           = UserOptions.FchBldCfg->CfgSataRaidSsid;
 	FchParams->Sata.SataAhciSsid           = UserOptions.FchBldCfg->CfgSataAhciSsid;
 	FchParams->Sata.SataIdeSsid            = UserOptions.FchBldCfg->CfgSataIdeSsid;
-	FchParams->Gec.GecShadowRomBase        = UserOptions.FchBldCfg->CfgGecShadowRomBase;
 	FchParams->Spi.RomBaseAddress          = UserOptions.FchBldCfg->CfgSpiRomBaseAddress;
 	FchParams->Sd.SdSsid                   = UserOptions.FchBldCfg->CfgSdSsid;
 	FchParams->Spi.LpcSsid                 = UserOptions.FchBldCfg->CfgLpcSsid;
diff --git a/src/southbridge/amd/agesa/hudson/Kconfig b/src/southbridge/amd/agesa/hudson/Kconfig
index 52692f9..0234a7b 100644
--- a/src/southbridge/amd/agesa/hudson/Kconfig
+++ b/src/southbridge/amd/agesa/hudson/Kconfig
@@ -55,12 +55,6 @@ config HUDSON_IMC_FWM
         help
 	  Add Hudson 2/3/4 IMC Firmware to support the onboard fan control
 
-config HUDSON_GEC_FWM
-	bool "Add gec firmware"
-	default n
-        help
-	  Add Hudson 2/3/4 GEC Firmware
-
 config HUDSON_XHCI_FWM_FILE
         string "XHCI firmware path and filename"
         default "3rdparty/southbridge/amd/hudson/xhci.bin"
@@ -71,11 +65,6 @@ config HUDSON_IMC_FWM_FILE
         default "3rdparty/southbridge/amd/hudson/imc.bin"
 	depends on HUDSON_IMC_FWM
 
-config HUDSON_GEC_FWM_FILE
-        string "GEC firmware path and filename"
-        default "3rdparty/southbridge/amd/hudson/gec.bin"
-	depends on HUDSON_GEC_FWM
-
 config HUDSON_FWM
 	bool
 	default y if HUDSON_XHCI_FWM || HUDSON_IMC_FWM || HUDSON_GEC_FWM
diff --git a/src/southbridge/amd/agesa/hudson/Makefile.inc b/src/southbridge/amd/agesa/hudson/Makefile.inc
index da029a0..9d06a24 100644
--- a/src/southbridge/amd/agesa/hudson/Makefile.inc
+++ b/src/southbridge/amd/agesa/hudson/Makefile.inc
@@ -17,7 +17,7 @@ ramstage-$(CONFIG_HAVE_ACPI_RESUME) += spi.c
 
 # ROMSIG At ROMBASE + 0x20000:
 # +-----------+---------------+----------------+------------+
-# |0x55AA55AA |EC ROM Address |GEC ROM Address |USB3 ROM    |
+# |0x55AA55AA |EC ROM Address |Rsvd 0x00000000 |USB3 ROM    |
 # +-----------+---------------+----------------+------------+
 # EC ROM should be 64K aligned.
 HUDSON_FWM_POSITION=$(shell printf %u $(CONFIG_HUDSON_FWM_POSITION))
@@ -33,19 +33,9 @@ HUDSON_XHCI_POSITION=0
 XHCI_FWM_SIZE=0
 endif
 
-ifeq ($(CONFIG_HUDSON_GEC_FWM), y)
-HUDSON_GEC_POSITION=$(shell echo $(HUDSON_FWM_POSITION) $(ROMSIG_SIZE) 128 \
-	$(XHCI_FWM_SIZE) 128 \
-	| awk '{printf("%.0f", $$1 + $$2 + $$3 + $$4 + $$5)}')
-GEC_FWM_SIZE=$(word 5,$(shell ls -l $(CONFIG_HUDSON_GEC_FWM_FILE)))
-else
-HUDSON_GEC_POSITION=0
-GEC_FWM_SIZE=0
-endif
-
 ifeq ($(CONFIG_HUDSON_IMC_FWM), y)
 HUDSON_IMC_POSITION_UNALIGN=$(shell echo $(HUDSON_FWM_POSITION) \
-	$(ROMSIG_SIZE) 128 $(XHCI_FWM_SIZE) 128 $(GEC_FWM_SIZE) 128 65535 \
+	$(ROMSIG_SIZE) 128 $(XHCI_FWM_SIZE) 128 0x00000000 128 65535 \
 	| awk '{printf("%.0f", $$1 + $$2 + $$3 + $$4 + $$5 + $$6 + $$7 + $$8)}')
 HUDSON_IMC_POSITION=$(shell echo $(HUDSON_IMC_POSITION_UNALIGN) \
 	| awk '{printf("%.0f", $$1 - $$1 % 65536)}')
@@ -55,12 +45,11 @@ endif
 
 $(obj)/coreboot_hudson_romsig.bin: $(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \
 			$(call strip_quotes, $(CONFIG_HUDSON_IMC_FWM_FILE)) \
-			$(call strip_quotes, $(CONFIG_HUDSON_GEC_FWM_FILE)) \
 			$(obj)/config.h
 	echo "    Hudson FW  $@"
 	for fwm in 1437226410 \
 		$(HUDSON_IMC_POSITION) \
-		$(HUDSON_GEC_POSITION) \
+		0x00000000 \
 		$(HUDSON_XHCI_POSITION) ; do \
 		echo  $$fwm | LC_ALL=C awk '{printf ("%c%c%c%c", $$1 % 256, int($$1/256) % 256, int($$1/65536) % 256, int($$1/16777216));}'; \
 	done > $@
@@ -88,14 +77,6 @@ hudson/imc-type := raw
 hudson/imc-required := Hudson IMC Firmware (available in coreboot/3rdparty if enabled)
 endif
 
-ifeq ($(CONFIG_HUDSON_GEC_FWM), y)
-cbfs-files-y += hudson/gec
-hudson/gec-file := $(call strip_quotes, $(CONFIG_HUDSON_GEC_FWM_FILE))
-hudson/gec-position := $(HUDSON_GEC_POSITION)
-hudson/gec-type := raw
-hudson/gec-required := Hudson Gigabit Ethernet Controller Firmware (Contact your AMD representative)
-endif
-
 #ifeq ($(CONFIG_HUDSON_SATA_AHCI), y)
 ifdef CONFIG_HUDSON_AHCI_ROM
 stripped_ahci_rom_id = $(call strip_quotes,$(CONFIG_AHCI_ROM_ID))