Patch set updated for coreboot: 3255dae Fix compilation with CONFIG_DEBUG_SPI_FLASH enabled

[Stefan Reinauer]

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

-gerrit

commit 3255dae09981daa753118fd3f9cd46dbd071001a
Author: Stefan Reinauer 
Date:   Tue May 22 15:24:51 2012 -0700

Fix compilation with CONFIG_DEBUG_SPI_FLASH enabled

Right now coreboot compilation fails when SPI flash debugging is
    enabled. Fix it by using the right set of memory functions.

Change-Id: I5e372c4a5df53b4d46aaed9e251e5205ff68cb5b
    Signed-off-by: Stefan Reinauer 
---
 src/drivers/spi/spi_flash.c         |    1 -
 src/southbridge/intel/bd82x6x/spi.c |   12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c
index 2c0f702..0b859f3 100644
--- a/src/drivers/spi/spi_flash.c
+++ b/src/drivers/spi/spi_flash.c
@@ -264,7 +264,6 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,

#if CONFIG_DEBUG_SPI_FLASH
    printk(BIOS_SPEW, "SF: Got idcodes\n");
-	print_buffer(0, idcode, 1, sizeof(idcode), 0);
 #endif

/* count the number of continuation bytes */
diff --git a/src/southbridge/intel/bd82x6x/spi.c b/src/southbridge/intel/bd82x6x/spi.c
index 2508a96..95fbfb9 100644
--- a/src/southbridge/intel/bd82x6x/spi.c
+++ b/src/southbridge/intel/bd82x6x/spi.c
@@ -162,7 +162,7 @@ enum {

static u8 readb_(const void *addr)
 {
-	u8 v = readb(addr);
+	u8 v = read8((unsigned long)addr);
    printk(BIOS_DEBUG, "read %2.2x from %4.4x\n",
           v, ((unsigned) addr & 0xffff) - 0xf020);
    return v;
@@ -170,7 +170,7 @@ static u8 readb_(const void *addr)

static u16 readw_(const void *addr)
 {
-	u16 v = readw(addr);
+	u16 v = read16((unsigned long)addr);
    printk(BIOS_DEBUG, "read %4.4x from %4.4x\n",
           v, ((unsigned) addr & 0xffff) - 0xf020);
    return v;
@@ -178,7 +178,7 @@ static u16 readw_(const void *addr)

static u32 readl_(const void *addr)
 {
-	u32 v = readl(addr);
+	u32 v = read32((unsigned long)addr);
    printk(BIOS_DEBUG, "read %8.8x from %4.4x\n",
           v, ((unsigned) addr & 0xffff) - 0xf020);
    return v;
@@ -186,21 +186,21 @@ static u32 readl_(const void *addr)

static void writeb_(u8 b, const void *addr)
 {
-	writeb(b, addr);
+	write8((unsigned long)addr, b);
    printk(BIOS_DEBUG, "wrote %2.2x to %4.4x\n",
           b, ((unsigned) addr & 0xffff) - 0xf020);
 }

static void writew_(u16 b, const void *addr)
 {
-	writew(b, addr);
+	write16((unsigned long)addr, b);
    printk(BIOS_DEBUG, "wrote %4.4x to %4.4x\n",
           b, ((unsigned) addr & 0xffff) - 0xf020);
 }

static void writel_(u32 b, const void *addr)
 {
-	writel(b, addr);
+	write32((unsigned long)addr, b);
    printk(BIOS_DEBUG, "wrote %8.8x to %4.4x\n",
           b, ((unsigned) addr & 0xffff) - 0xf020);
 }