[coreboot-gerrit] New patch to review for coreboot: intel/sandybridge: Fix builds with System Agent blob

[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 https://review.coreboot.org/15328

-gerrit

commit 265a43ffc27ad25e74b1850ae1e6a5ba2db1ca5d
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Thu Jun 23 12:41:40 2016 +0300

    intel/sandybridge: Fix builds with System Agent blob
    
    Broken with commit:
      5c10abe nb/intel/sandybridge: increase MMCONF_BASE_ADDRESS
    
    Available sandybridge/systemagent-r6.bin has MMCONF hard-coded
    at some places and samsung/lumpy fails at boot here:
    
      CBFS: Locating 'mrc.bin'
      CBFS: Found @ offset 9fec0 size 2fc94
      System Agent: Starting up...
      System Agent: Initializing
    
    These are the last lines as captured over USB debug.
    
    Change-Id: I441847f0e71a5e1be9c8ef6a04a81eb7bdd8a6d9
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/mainboard/google/butterfly/Kconfig    | 2 +-
 src/mainboard/google/link/Kconfig         | 2 +-
 src/mainboard/google/parrot/Kconfig       | 2 +-
 src/mainboard/google/stout/Kconfig        | 2 +-
 src/mainboard/intel/emeraldlake2/Kconfig  | 2 +-
 src/mainboard/kontron/ktqm77/Kconfig      | 2 +-
 src/mainboard/samsung/lumpy/Kconfig       | 2 +-
 src/mainboard/samsung/stumpy/Kconfig      | 2 +-
 src/northbridge/intel/sandybridge/Kconfig | 4 ++++
 9 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 4115a79..4240076 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -30,7 +30,7 @@ config MAINBOARD_PART_NUMBER
 
 config MMCONF_BASE_ADDRESS
 	hex
-	default 0xf8000000
+	default 0xf8000000 if USE_NATIVE_RAMINIT
 
 config MAX_CPUS
 	int
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index e61bba0..8fe3a87 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -30,7 +30,7 @@ config MAINBOARD_PART_NUMBER
 
 config MMCONF_BASE_ADDRESS
 	hex
-	default 0xf8000000
+	default 0xf8000000 if USE_NATIVE_RAMINIT
 
 config MAX_CPUS
 	int
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index 3483a81..fa94ab6 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -31,7 +31,7 @@ config MAINBOARD_PART_NUMBER
 
 config MMCONF_BASE_ADDRESS
 	hex
-	default 0xf8000000
+	default 0xf8000000 if USE_NATIVE_RAMINIT
 
 config MAX_CPUS
 	int
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index 0aafc48..3a2250d 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -30,7 +30,7 @@ config MAINBOARD_PART_NUMBER
 
 config MMCONF_BASE_ADDRESS
 	hex
-	default 0xf8000000
+	default 0xf8000000 if USE_NATIVE_RAMINIT
 
 config MAX_CPUS
 	int
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index 7671c30..dd9a7c7 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -26,7 +26,7 @@ config MAINBOARD_PART_NUMBER
 
 config MMCONF_BASE_ADDRESS
 	hex
-	default 0xf8000000
+	default 0xf8000000 if USE_NATIVE_RAMINIT
 
 config MAX_CPUS
 	int
diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig
index 9f4d514..77ad91b 100644
--- a/src/mainboard/kontron/ktqm77/Kconfig
+++ b/src/mainboard/kontron/ktqm77/Kconfig
@@ -23,7 +23,7 @@ config MAINBOARD_PART_NUMBER
 
 config MMCONF_BASE_ADDRESS
 	hex
-	default 0xf8000000
+	default 0xf8000000 if USE_NATIVE_RAMINIT
 
 config MAX_CPUS
 	int
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 14db934..adeb9fb 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -33,7 +33,7 @@ config MAINBOARD_PART_NUMBER
 
 config MMCONF_BASE_ADDRESS
 	hex
-	default 0xf8000000
+	default 0xf8000000 if USE_NATIVE_RAMINIT
 
 config MAX_CPUS
 	int
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index 4f14a6c..699e58e 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -31,7 +31,7 @@ config MAINBOARD_PART_NUMBER
 
 config MMCONF_BASE_ADDRESS
 	hex
-	default 0xf8000000
+	default 0xf8000000 if USE_NATIVE_RAMINIT
 
 config MAX_CPUS
 	int
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index 0cfdf2b..d3edf03 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -94,4 +94,8 @@ config MRC_FILE
 	  The path and filename of the file to use as System Agent
 	  binary.
 
+config MMCONF_BASE_ADDRESS
+	hex
+	default 0xf0000000 if !USE_NATIVE_RAMINIT
+
 endif