[coreboot-gerrit] Patch set updated for coreboot: 0b8487f i82801gx: Enable CONFIG_SPI_FLASH

[Denis Carikli (GNUtoo@no-log.org)]

Denis Carikli (GNUtoo at no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3550

-gerrit

commit 0b8487f8915c0fd7e165cd9cd5657a21cdfd2be5
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Wed Jun 26 19:55:21 2013 +0200

    i82801gx: Enable CONFIG_SPI_FLASH
    
    Change-Id: I306d79697c730ba03730590554aeb540c0a1b5ed
    Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
---
 src/southbridge/intel/bd82x6x/spi.c         | 3 ++-
 src/southbridge/intel/i82801gx/Kconfig      | 1 +
 src/southbridge/intel/i82801gx/Makefile.inc | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/southbridge/intel/bd82x6x/spi.c b/src/southbridge/intel/bd82x6x/spi.c
index 09169b1..943cda6 100644
--- a/src/southbridge/intel/bd82x6x/spi.c
+++ b/src/southbridge/intel/bd82x6x/spi.c
@@ -309,7 +309,8 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
  */
 static inline int get_ich_version(uint16_t device_id)
 {
-	if (device_id == PCI_DEVICE_ID_INTEL_TGP_LPC)
+	if (device_id == PCI_DEVICE_ID_INTEL_TGP_LPC ||
+	    device_id == PCI_DEVICE_ID_INTEL_82801GBM_LPC)
 		return 7;
 
 	if ((device_id >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN &&
diff --git a/src/southbridge/intel/i82801gx/Kconfig b/src/southbridge/intel/i82801gx/Kconfig
index a991f60..716c5c7 100644
--- a/src/southbridge/intel/i82801gx/Kconfig
+++ b/src/southbridge/intel/i82801gx/Kconfig
@@ -24,6 +24,7 @@ config SOUTHBRIDGE_INTEL_I82801GX
 	select HAVE_USBDEBUG
 	select USE_WATCHDOG_ON_BOOT
 	select HAVE_SMI_HANDLER
+	select SPI_FLASH
 
 if SOUTHBRIDGE_INTEL_I82801GX
 
diff --git a/src/southbridge/intel/i82801gx/Makefile.inc b/src/southbridge/intel/i82801gx/Makefile.inc
index c21b684..ad9a66e 100644
--- a/src/southbridge/intel/i82801gx/Makefile.inc
+++ b/src/southbridge/intel/i82801gx/Makefile.inc
@@ -33,6 +33,8 @@ ramstage-y += usb_ehci.c
 ramstage-y += reset.c
 ramstage-y += watchdog.c
 
+ramstage-y += ../bd82x6x/spi.c
+
 ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c