summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2017-07-29 01:10:49 +0200
committerNico Huber <nico.h@gmx.de>2017-07-30 00:06:51 +0000
commit2b5c02143152cee95fc189f05cca2243089ab45d (patch)
tree38390ac38a30f8309e30aba4780fa6658b489519
parentf1778ce33366f2005f1ac5e492525012b47d788e (diff)
downloadcoreboot-2b5c02143152cee95fc189f05cca2243089ab45d.tar.xz
intel/sandybridge: Gather MMCONF_BASE_ADDRESS defaults
All affected boards did the same USE_NATIVE_RAMINIT distinction or actually selected USE_NATIVE_RAMINIT. Also update autoport. Change-Id: I924c43cec1e36e84db40e4b8e1dd0e05cad2b978 Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/20813 Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Rudolph <siro@das-labor.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-by: Alexander Couzens <lynxis@fe80.eu>
-rw-r--r--src/mainboard/apple/macbookair4_2/Kconfig4
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3h/Kconfig4
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3v/Kconfig4
-rw-r--r--src/mainboard/google/butterfly/Kconfig4
-rw-r--r--src/mainboard/google/link/Kconfig4
-rw-r--r--src/mainboard/google/parrot/Kconfig4
-rw-r--r--src/mainboard/google/stout/Kconfig4
-rw-r--r--src/mainboard/intel/emeraldlake2/Kconfig4
-rw-r--r--src/mainboard/kontron/ktqm77/Kconfig4
-rw-r--r--src/mainboard/lenovo/t420/Kconfig4
-rw-r--r--src/mainboard/lenovo/t420s/Kconfig4
-rw-r--r--src/mainboard/lenovo/t430/Kconfig4
-rw-r--r--src/mainboard/lenovo/t430s/Kconfig4
-rw-r--r--src/mainboard/lenovo/t520/Kconfig4
-rw-r--r--src/mainboard/lenovo/t530/Kconfig4
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/Kconfig4
-rw-r--r--src/mainboard/lenovo/x220/Kconfig4
-rw-r--r--src/mainboard/lenovo/x230/Kconfig4
-rw-r--r--src/mainboard/roda/rv11/Kconfig4
-rw-r--r--src/mainboard/samsung/lumpy/Kconfig4
-rw-r--r--src/mainboard/samsung/stumpy/Kconfig4
-rw-r--r--src/northbridge/intel/sandybridge/Kconfig12
-rw-r--r--util/autoport/sandybridge.go1
23 files changed, 8 insertions, 89 deletions
diff --git a/src/mainboard/apple/macbookair4_2/Kconfig b/src/mainboard/apple/macbookair4_2/Kconfig
index 08e7166ace..bdfe667cba 100644
--- a/src/mainboard/apple/macbookair4_2/Kconfig
+++ b/src/mainboard/apple/macbookair4_2/Kconfig
@@ -47,10 +47,6 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
hex
default 0x8086
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000
-
config DRAM_RESET_GATE_GPIO
int
default 60
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
index ef66418d55..36c7158abb 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
@@ -20,10 +20,6 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_LPC_TPM
select TPM
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000
-
config DRAM_RESET_GATE_GPIO
int
default 25
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig
index 8e83deb5c7..33b7ed77a2 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig
@@ -17,10 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
select INTEL_INT15
select SERIRQ_CONTINUOUS_MODE
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000
-
config DRAM_RESET_GATE_GPIO
int
default 25
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index ffd0c03cd1..1f4547dedd 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -28,10 +28,6 @@ config MAINBOARD_PART_NUMBER
string
default "Butterfly"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000 if USE_NATIVE_RAMINIT
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index 217e6c1d15..66b7421464 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -30,10 +30,6 @@ config MAINBOARD_PART_NUMBER
string
default "Link"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000 if USE_NATIVE_RAMINIT
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index 5ce1f2492e..fa45e4a4b4 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -28,10 +28,6 @@ config MAINBOARD_PART_NUMBER
string
default "Parrot"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000 if USE_NATIVE_RAMINIT
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index d34f595c9f..eca4eaeada 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -28,10 +28,6 @@ config MAINBOARD_PART_NUMBER
string
default "Stout"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000 if USE_NATIVE_RAMINIT
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index 7b5528ab8f..66c8329468 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -24,10 +24,6 @@ config MAINBOARD_PART_NUMBER
string
default "EMERALD LAKE 2"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000 if USE_NATIVE_RAMINIT
-
config MAX_CPUS
int
default 16
diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig
index 115a0faca7..17c28032c5 100644
--- a/src/mainboard/kontron/ktqm77/Kconfig
+++ b/src/mainboard/kontron/ktqm77/Kconfig
@@ -24,10 +24,6 @@ config MAINBOARD_PART_NUMBER
string
default "KTQM77/mITX"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000 if USE_NATIVE_RAMINIT
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig
index 76690776f4..784d38a303 100644
--- a/src/mainboard/lenovo/t420/Kconfig
+++ b/src/mainboard/lenovo/t420/Kconfig
@@ -42,10 +42,6 @@ config MAINBOARD_PART_NUMBER
string
default "ThinkPad T420"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig
index feacb51170..08052b14f6 100644
--- a/src/mainboard/lenovo/t420s/Kconfig
+++ b/src/mainboard/lenovo/t420s/Kconfig
@@ -39,10 +39,6 @@ config MAINBOARD_PART_NUMBER
string
default "ThinkPad T420s"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig
index df22c3e904..a621fdb740 100644
--- a/src/mainboard/lenovo/t430/Kconfig
+++ b/src/mainboard/lenovo/t430/Kconfig
@@ -53,10 +53,6 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
hex
default 0x17aa
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000
-
config DRAM_RESET_GATE_GPIO
int
default 10
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index bb898cf997..51c39e6149 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -39,10 +39,6 @@ config MAINBOARD_PART_NUMBER
string
default "ThinkPad T430s"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index ee5dd8163a..8c19c625e0 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -39,10 +39,6 @@ config MAINBOARD_PART_NUMBER
string
default "ThinkPad T520"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index d1c924ab60..84ebe86f98 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -40,10 +40,6 @@ config MAINBOARD_PART_NUMBER
string
default "ThinkPad T530"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
index 8d5907987c..4f9d7fb4b9 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
@@ -41,10 +41,6 @@ config MAINBOARD_PART_NUMBER
string
default "ThinkPad X1 carbon gen 1"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
index 9b70ef0bd4..4b9451b6a8 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -41,10 +41,6 @@ config MAINBOARD_PART_NUMBER
string
default "ThinkPad X220"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index 480bb9ae39..39af0e3e50 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -41,10 +41,6 @@ config MAINBOARD_PART_NUMBER
string
default "ThinkPad X230"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/roda/rv11/Kconfig b/src/mainboard/roda/rv11/Kconfig
index d6cb6bd5b8..4f8a4382fe 100644
--- a/src/mainboard/roda/rv11/Kconfig
+++ b/src/mainboard/roda/rv11/Kconfig
@@ -35,10 +35,6 @@ config MAINBOARD_PART_NUMBER
default "Lizard RW11" if BOARD_RODA_RW11
default "Lizard RV11"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000 if USE_NATIVE_RAMINIT
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index bd7078dd53..0c5fce472c 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -33,10 +33,6 @@ config MAINBOARD_PART_NUMBER
string
default "Lumpy"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000 if USE_NATIVE_RAMINIT
-
config MAX_CPUS
int
default 8
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index 4f3d1e9f09..f12de6e341 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -30,10 +30,6 @@ config MAINBOARD_PART_NUMBER
string
default "Stumpy"
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf8000000 if USE_NATIVE_RAMINIT
-
config MAX_CPUS
int
default 8
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index ae5ddfc398..2d13f286e9 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -78,6 +78,14 @@ config BOOTBLOCK_NORTHBRIDGE_INIT
string
default "northbridge/intel/sandybridge/bootblock.c"
+config MMCONF_BASE_ADDRESS
+ hex
+ default 0xf8000000 if USE_NATIVE_RAMINIT
+ default 0xf0000000
+ help
+ We can optimize the native case but the MRC blob requires it
+ to be at 0xf0000000.
+
if USE_NATIVE_RAMINIT
config DCACHE_RAM_BASE
@@ -115,10 +123,6 @@ config MRC_FILE
The path and filename of the file to use as System Agent
binary.
-config MMCONF_BASE_ADDRESS
- hex
- default 0xf0000000
-
endif # !USE_NATIVE_RAMINIT
endif
diff --git a/util/autoport/sandybridge.go b/util/autoport/sandybridge.go
index 65042550fd..45d4b0ced4 100644
--- a/util/autoport/sandybridge.go
+++ b/util/autoport/sandybridge.go
@@ -122,7 +122,6 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
KconfigBool["HAVE_IFD_BIN"] = false
KconfigBool["HAVE_ME_BIN"] = false
- KconfigHex["MMCONF_BASE_ADDRESS"] = 0xf0000000
KconfigInt["MAX_CPUS"] = 8
DSDTIncludes = append(DSDTIncludes, DSDTInclude{