Change in coreboot[master]: AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41595 )

Change subject: AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size
......................................................................

AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size

We set BLDCFG_PCI_MMIO_BASE and BLDCFG_PCI_MMIO_SIZE to the same values
everywhere, so we might as well factor them out. We set them as fallback
so that we can override the settings using BLDCFG options if desired.

Change-Id: I7244c39d2c2aa02a3a9092ddae98e4ac9da89107
Signed-off-by: Angel Pons 
---
M src/mainboard/amd/inagua/buildOpts.c
M src/mainboard/amd/olivehill/buildOpts.c
M src/mainboard/amd/parmer/buildOpts.c
M src/mainboard/amd/persimmon/buildOpts.c
M src/mainboard/amd/south_station/buildOpts.c
M src/mainboard/amd/thatcher/buildOpts.c
M src/mainboard/amd/union_station/buildOpts.c
M src/mainboard/asrock/e350m1/buildOpts.c
M src/mainboard/asrock/imb-a180/buildOpts.c
M src/mainboard/asus/am1i-a/buildOpts.c
M src/mainboard/asus/f2a85-m/buildOpts.c
M src/mainboard/bap/ode_e20XX/buildOpts.c
M src/mainboard/biostar/a68n_5200/buildOpts.c
M src/mainboard/biostar/am1ml/buildOpts.c
M src/mainboard/elmex/pcm205400/buildOpts.c
M src/mainboard/gizmosphere/gizmo/buildOpts.c
M src/mainboard/gizmosphere/gizmo2/buildOpts.c
M src/mainboard/hp/abm/buildOpts.c
M src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
M src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
M src/mainboard/lenovo/g505s/buildOpts.c
M src/mainboard/lippert/frontrunner-af/buildOpts.c
M src/mainboard/lippert/toucan-af/buildOpts.c
M src/mainboard/msi/ms7721/buildOpts.c
M src/mainboard/pcengines/apu1/buildOpts.c
M src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h
M src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h
M src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h
28 files changed, 6 insertions(+), 67 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/41595/1

diff --git a/src/mainboard/amd/inagua/buildOpts.c b/src/mainboard/amd/inagua/buildOpts.c
index 781dde3..4729577 100644
--- a/src/mainboard/amd/inagua/buildOpts.c
+++ b/src/mainboard/amd/inagua/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY		TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES		TRUE

-#define BLDCFG_PCI_MMIO_BASE			CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE			CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT		24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT		0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD		24000
diff --git a/src/mainboard/amd/olivehill/buildOpts.c b/src/mainboard/amd/olivehill/buildOpts.c
index dfcb465..d2bc4e7 100644
--- a/src/mainboard/amd/olivehill/buildOpts.c
+++ b/src/mainboard/amd/olivehill/buildOpts.c
@@ -66,8 +66,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/amd/parmer/buildOpts.c b/src/mainboard/amd/parmer/buildOpts.c
index e1c71c3..a3cbb7e 100644
--- a/src/mainboard/amd/parmer/buildOpts.c
+++ b/src/mainboard/amd/parmer/buildOpts.c
@@ -63,8 +63,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 90000
diff --git a/src/mainboard/amd/persimmon/buildOpts.c b/src/mainboard/amd/persimmon/buildOpts.c
index cda2d9d..5f18c39 100644
--- a/src/mainboard/amd/persimmon/buildOpts.c
+++ b/src/mainboard/amd/persimmon/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/mainboard/amd/south_station/buildOpts.c b/src/mainboard/amd/south_station/buildOpts.c
index 8bddb38..d3d65713 100644
--- a/src/mainboard/amd/south_station/buildOpts.c
+++ b/src/mainboard/amd/south_station/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY        TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES            TRUE

-#define BLDCFG_PCI_MMIO_BASE                    CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE                    CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT                24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT             0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD          24000
diff --git a/src/mainboard/amd/thatcher/buildOpts.c b/src/mainboard/amd/thatcher/buildOpts.c
index e1c3cd2..53929b8 100644
--- a/src/mainboard/amd/thatcher/buildOpts.c
+++ b/src/mainboard/amd/thatcher/buildOpts.c
@@ -63,8 +63,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 90000
diff --git a/src/mainboard/amd/union_station/buildOpts.c b/src/mainboard/amd/union_station/buildOpts.c
index 8bddb38..d3d65713 100644
--- a/src/mainboard/amd/union_station/buildOpts.c
+++ b/src/mainboard/amd/union_station/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY        TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES            TRUE

-#define BLDCFG_PCI_MMIO_BASE                    CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE                    CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT                24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT             0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD          24000
diff --git a/src/mainboard/asrock/e350m1/buildOpts.c b/src/mainboard/asrock/e350m1/buildOpts.c
index 0cd14d7..aab03de 100644
--- a/src/mainboard/asrock/e350m1/buildOpts.c
+++ b/src/mainboard/asrock/e350m1/buildOpts.c
@@ -62,9 +62,6 @@
  * needed by the system.
  */

-#define BLDCFG_PCI_MMIO_BASE                    CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE                    CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT                24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT             0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD          24000
diff --git a/src/mainboard/asrock/imb-a180/buildOpts.c b/src/mainboard/asrock/imb-a180/buildOpts.c
index 97d49c7..99b6180 100644
--- a/src/mainboard/asrock/imb-a180/buildOpts.c
+++ b/src/mainboard/asrock/imb-a180/buildOpts.c
@@ -66,8 +66,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/asus/am1i-a/buildOpts.c b/src/mainboard/asus/am1i-a/buildOpts.c
index e2c01fc..a364982 100644
--- a/src/mainboard/asus/am1i-a/buildOpts.c
+++ b/src/mainboard/asus/am1i-a/buildOpts.c
@@ -82,8 +82,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 15000
diff --git a/src/mainboard/asus/f2a85-m/buildOpts.c b/src/mainboard/asus/f2a85-m/buildOpts.c
index 6c368cb..38d302e 100644
--- a/src/mainboard/asus/f2a85-m/buildOpts.c
+++ b/src/mainboard/asus/f2a85-m/buildOpts.c
@@ -76,8 +76,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 90000
diff --git a/src/mainboard/bap/ode_e20XX/buildOpts.c b/src/mainboard/bap/ode_e20XX/buildOpts.c
index 0d98c02..2bcabf4 100644
--- a/src/mainboard/bap/ode_e20XX/buildOpts.c
+++ b/src/mainboard/bap/ode_e20XX/buildOpts.c
@@ -66,8 +66,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/biostar/a68n_5200/buildOpts.c b/src/mainboard/biostar/a68n_5200/buildOpts.c
index dfcb465..d2bc4e7 100644
--- a/src/mainboard/biostar/a68n_5200/buildOpts.c
+++ b/src/mainboard/biostar/a68n_5200/buildOpts.c
@@ -66,8 +66,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/biostar/am1ml/buildOpts.c b/src/mainboard/biostar/am1ml/buildOpts.c
index 5e9f256..b9a3efe 100644
--- a/src/mainboard/biostar/am1ml/buildOpts.c
+++ b/src/mainboard/biostar/am1ml/buildOpts.c
@@ -66,8 +66,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/elmex/pcm205400/buildOpts.c b/src/mainboard/elmex/pcm205400/buildOpts.c
index bbc8f00..8c34cd6 100644
--- a/src/mainboard/elmex/pcm205400/buildOpts.c
+++ b/src/mainboard/elmex/pcm205400/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/mainboard/gizmosphere/gizmo/buildOpts.c b/src/mainboard/gizmosphere/gizmo/buildOpts.c
index cda2d9d..5f18c39 100644
--- a/src/mainboard/gizmosphere/gizmo/buildOpts.c
+++ b/src/mainboard/gizmosphere/gizmo/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/mainboard/gizmosphere/gizmo2/buildOpts.c b/src/mainboard/gizmosphere/gizmo2/buildOpts.c
index 0d98c02..2bcabf4 100644
--- a/src/mainboard/gizmosphere/gizmo2/buildOpts.c
+++ b/src/mainboard/gizmosphere/gizmo2/buildOpts.c
@@ -66,8 +66,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/hp/abm/buildOpts.c b/src/mainboard/hp/abm/buildOpts.c
index 7ebf119..a649c73 100644
--- a/src/mainboard/hp/abm/buildOpts.c
+++ b/src/mainboard/hp/abm/buildOpts.c
@@ -71,8 +71,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c b/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
index 17b5804..e7ff996 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
@@ -77,8 +77,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 90000
diff --git a/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c b/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
index 02a416a..a20d133 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
@@ -68,9 +68,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/mainboard/lenovo/g505s/buildOpts.c b/src/mainboard/lenovo/g505s/buildOpts.c
index 789bb40..f4993d6 100644
--- a/src/mainboard/lenovo/g505s/buildOpts.c
+++ b/src/mainboard/lenovo/g505s/buildOpts.c
@@ -77,8 +77,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 90000
diff --git a/src/mainboard/lippert/frontrunner-af/buildOpts.c b/src/mainboard/lippert/frontrunner-af/buildOpts.c
index cda2d9d..5f18c39 100644
--- a/src/mainboard/lippert/frontrunner-af/buildOpts.c
+++ b/src/mainboard/lippert/frontrunner-af/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/mainboard/lippert/toucan-af/buildOpts.c b/src/mainboard/lippert/toucan-af/buildOpts.c
index cda2d9d..5f18c39 100644
--- a/src/mainboard/lippert/toucan-af/buildOpts.c
+++ b/src/mainboard/lippert/toucan-af/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/mainboard/msi/ms7721/buildOpts.c b/src/mainboard/msi/ms7721/buildOpts.c
index aaa88b6a..4029bc3 100644
--- a/src/mainboard/msi/ms7721/buildOpts.c
+++ b/src/mainboard/msi/ms7721/buildOpts.c
@@ -76,8 +76,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 90000
diff --git a/src/mainboard/pcengines/apu1/buildOpts.c b/src/mainboard/pcengines/apu1/buildOpts.c
index 4780c33..2bf1437 100644
--- a/src/mainboard/pcengines/apu1/buildOpts.c
+++ b/src/mainboard/pcengines/apu1/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h b/src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h
index eee3a4b..d5060d6 100644
--- a/src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h
@@ -1084,13 +1084,13 @@
 #ifdef BLDCFG_PCI_MMIO_BASE
   #define CFG_PCI_MMIO_BASE               (BLDCFG_PCI_MMIO_BASE)
 #else
-  #define CFG_PCI_MMIO_BASE               (0)
+  #define CFG_PCI_MMIO_BASE               (CONFIG_MMCONF_BASE_ADDRESS)
 #endif

#ifdef BLDCFG_PCI_MMIO_SIZE
   #define CFG_PCI_MMIO_SIZE               (BLDCFG_PCI_MMIO_SIZE)
 #else
-  #define CFG_PCI_MMIO_SIZE               (0)
+  #define CFG_PCI_MMIO_SIZE               (CONFIG_MMCONF_BUS_NUMBER)
 #endif

#ifdef BLDCFG_AP_MTRR_SETTINGS_LIST
diff --git a/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h
index 70c2135..6442064 100644
--- a/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h
@@ -2421,13 +2421,13 @@
 #ifdef BLDCFG_PCI_MMIO_BASE
   #define CFG_PCI_MMIO_BASE               (BLDCFG_PCI_MMIO_BASE)
 #else
-  #define CFG_PCI_MMIO_BASE               (0)
+  #define CFG_PCI_MMIO_BASE               (CONFIG_MMCONF_BASE_ADDRESS)
 #endif

#ifdef BLDCFG_PCI_MMIO_SIZE
   #define CFG_PCI_MMIO_SIZE               (BLDCFG_PCI_MMIO_SIZE)
 #else
-  #define CFG_PCI_MMIO_SIZE               (0)
+  #define CFG_PCI_MMIO_SIZE               (CONFIG_MMCONF_BUS_NUMBER)
 #endif

#ifdef BLDCFG_AP_MTRR_SETTINGS_LIST
diff --git a/src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h
index 90c4e3f..b74753d 100644
--- a/src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h
@@ -1429,13 +1429,13 @@
 #ifdef BLDCFG_PCI_MMIO_BASE
   #define CFG_PCI_MMIO_BASE               (BLDCFG_PCI_MMIO_BASE)
 #else
-  #define CFG_PCI_MMIO_BASE               (0)
+  #define CFG_PCI_MMIO_BASE               (CONFIG_MMCONF_BASE_ADDRESS)
 #endif

#ifdef BLDCFG_PCI_MMIO_SIZE
   #define CFG_PCI_MMIO_SIZE               (BLDCFG_PCI_MMIO_SIZE)
 #else
-  #define CFG_PCI_MMIO_SIZE               (0)
+  #define CFG_PCI_MMIO_SIZE               (CONFIG_MMCONF_BUS_NUMBER)
 #endif

#ifdef BLDCFG_AP_MTRR_SETTINGS_LIST

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41595 )

Change subject: AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size
......................................................................

Patch Set 3: Code-Review+1

[Angel Pons (Code Review)]

Hello build bot (Jenkins), Michał Żygowski, Paul Menzel, Alexander Couzens, Patrick Rudolph, Piotr Król,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/41595

to look at the new patch set (#4).

Change subject: AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size
......................................................................

AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size

We set BLDCFG_PCI_MMIO_BASE and BLDCFG_PCI_MMIO_SIZE to the same values
everywhere, so we might as well factor them out. We set them as fallback
so that we can override the settings using BLDCFG options if desired.

TEST=Use abuild --timeless to check that all AGESA f14/f15tn/f16kb
mainboards result in identical coreboot binaries.

Change-Id: I7244c39d2c2aa02a3a9092ddae98e4ac9da89107
Signed-off-by: Angel Pons 
---
M src/mainboard/amd/inagua/buildOpts.c
M src/mainboard/amd/olivehill/buildOpts.c
M src/mainboard/amd/parmer/buildOpts.c
M src/mainboard/amd/persimmon/buildOpts.c
M src/mainboard/amd/south_station/buildOpts.c
M src/mainboard/amd/thatcher/buildOpts.c
M src/mainboard/amd/union_station/buildOpts.c
M src/mainboard/asrock/e350m1/buildOpts.c
M src/mainboard/asrock/imb-a180/buildOpts.c
M src/mainboard/asus/am1i-a/buildOpts.c
M src/mainboard/asus/f2a85-m/buildOpts.c
M src/mainboard/bap/ode_e20XX/buildOpts.c
M src/mainboard/biostar/a68n_5200/buildOpts.c
M src/mainboard/biostar/am1ml/buildOpts.c
M src/mainboard/elmex/pcm205400/buildOpts.c
M src/mainboard/gizmosphere/gizmo/buildOpts.c
M src/mainboard/gizmosphere/gizmo2/buildOpts.c
M src/mainboard/hp/abm/buildOpts.c
M src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
M src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
M src/mainboard/lenovo/g505s/buildOpts.c
M src/mainboard/lippert/frontrunner-af/buildOpts.c
M src/mainboard/lippert/toucan-af/buildOpts.c
M src/mainboard/msi/ms7721/buildOpts.c
M src/mainboard/pcengines/apu1/buildOpts.c
M src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h
M src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h
M src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h
28 files changed, 6 insertions(+), 67 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/41595/4

[Arthur Heymans (Code Review)]

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41595 )

Change subject: AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size
......................................................................

Patch Set 4: Code-Review+2

[Arthur Heymans (Code Review)]

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41595 )

Change subject: AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size
......................................................................

Patch Set 4:

(1 comment)

https://review.coreboot.org/c/coreboot/+/41595/4//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/41595/4//COMMIT_MSG@10 
PS4, Line 10: We set them as fallback
            : so that we can override the settings using BLDCFG options if desired.
I think it has to be in sync with the Kconfig options so removing that override possibility seems like a good idea.

[Krystian Hebel (Code Review)]

Krystian Hebel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41595 )

Change subject: AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size
......................................................................

Patch Set 4: Code-Review+1

[Angel Pons (Code Review)]

Hello Mike Banon, build bot (Jenkins), Michał Żygowski, Paul Menzel, Arthur Heymans, Mike Banon, Krystian Hebel, Alexander Couzens, Patrick Rudolph, Piotr Król,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/41595

to look at the new patch set (#8).

Change subject: AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size
......................................................................

AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size

We set BLDCFG_PCI_MMIO_BASE and BLDCFG_PCI_MMIO_SIZE to the same values
everywhere, so we might as well factor them out. As we have equivalent
Kconfig options in coreboot, also deprecate overriding them via BLDCFG.

TEST=Use abuild --timeless to check that all AGESA f14/f15tn/f16kb
mainboards result in identical coreboot binaries.

Change-Id: I7244c39d2c2aa02a3a9092ddae98e4ac9da89107
Signed-off-by: Angel Pons 
---
M src/mainboard/amd/inagua/buildOpts.c
M src/mainboard/amd/olivehill/buildOpts.c
M src/mainboard/amd/parmer/buildOpts.c
M src/mainboard/amd/persimmon/buildOpts.c
M src/mainboard/amd/south_station/buildOpts.c
M src/mainboard/amd/thatcher/buildOpts.c
M src/mainboard/amd/union_station/buildOpts.c
M src/mainboard/asrock/e350m1/buildOpts.c
M src/mainboard/asrock/imb-a180/buildOpts.c
M src/mainboard/asus/am1i-a/buildOpts.c
M src/mainboard/asus/f2a85-m/buildOpts.c
M src/mainboard/bap/ode_e20XX/buildOpts.c
M src/mainboard/biostar/a68n_5200/buildOpts.c
M src/mainboard/biostar/am1ml/buildOpts.c
M src/mainboard/elmex/pcm205400/buildOpts.c
M src/mainboard/gizmosphere/gizmo/buildOpts.c
M src/mainboard/gizmosphere/gizmo2/buildOpts.c
M src/mainboard/hp/abm/buildOpts.c
M src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
M src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
M src/mainboard/lenovo/g505s/buildOpts.c
M src/mainboard/lippert/frontrunner-af/buildOpts.c
M src/mainboard/lippert/toucan-af/buildOpts.c
M src/mainboard/msi/ms7721/buildOpts.c
M src/mainboard/pcengines/apu1/buildOpts.c
M src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h
M src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h
M src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h
28 files changed, 27 insertions(+), 91 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/41595/8

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41595 )

Change subject: AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size
......................................................................

Patch Set 8:

(1 comment)

https://review.coreboot.org/c/coreboot/+/41595/4//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/41595/4//COMMIT_MSG@10 
PS4, Line 10: We set them as fallback
            : so that we can override the settings using BLDCFG options if desired.
> I think it has to be in sync with the Kconfig options so removing that override possibility seems li […]

Done

[Mike Banon (Code Review)]

Mike Banon has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41595 )

Change subject: AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size
......................................................................

Patch Set 8: Code-Review+2

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41595 )

Change subject: AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size
......................................................................

AGESA f14/f15tn/f16kb: Factor out PCI MMIO base/size

We set BLDCFG_PCI_MMIO_BASE and BLDCFG_PCI_MMIO_SIZE to the same values
everywhere, so we might as well factor them out. As we have equivalent
Kconfig options in coreboot, also deprecate overriding them via BLDCFG.

TEST=Use abuild --timeless to check that all AGESA f14/f15tn/f16kb
mainboards result in identical coreboot binaries.

Change-Id: I7244c39d2c2aa02a3a9092ddae98e4ac9da89107
Signed-off-by: Angel Pons 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41595
Tested-by: build bot (Jenkins) 
Reviewed-by: Mike Banon 
---
M src/mainboard/amd/inagua/buildOpts.c
M src/mainboard/amd/olivehill/buildOpts.c
M src/mainboard/amd/parmer/buildOpts.c
M src/mainboard/amd/persimmon/buildOpts.c
M src/mainboard/amd/south_station/buildOpts.c
M src/mainboard/amd/thatcher/buildOpts.c
M src/mainboard/amd/union_station/buildOpts.c
M src/mainboard/asrock/e350m1/buildOpts.c
M src/mainboard/asrock/imb-a180/buildOpts.c
M src/mainboard/asus/am1i-a/buildOpts.c
M src/mainboard/asus/f2a85-m/buildOpts.c
M src/mainboard/bap/ode_e20XX/buildOpts.c
M src/mainboard/biostar/a68n_5200/buildOpts.c
M src/mainboard/biostar/am1ml/buildOpts.c
M src/mainboard/elmex/pcm205400/buildOpts.c
M src/mainboard/gizmosphere/gizmo/buildOpts.c
M src/mainboard/gizmosphere/gizmo2/buildOpts.c
M src/mainboard/hp/abm/buildOpts.c
M src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
M src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
M src/mainboard/lenovo/g505s/buildOpts.c
M src/mainboard/lippert/frontrunner-af/buildOpts.c
M src/mainboard/lippert/toucan-af/buildOpts.c
M src/mainboard/msi/ms7721/buildOpts.c
M src/mainboard/pcengines/apu1/buildOpts.c
M src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h
M src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h
M src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h
28 files changed, 27 insertions(+), 91 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Mike Banon: Looks good to me, approved

diff --git a/src/mainboard/amd/inagua/buildOpts.c b/src/mainboard/amd/inagua/buildOpts.c
index 781dde3..4729577 100644
--- a/src/mainboard/amd/inagua/buildOpts.c
+++ b/src/mainboard/amd/inagua/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY		TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES		TRUE

-#define BLDCFG_PCI_MMIO_BASE			CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE			CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT		24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT		0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD		24000
diff --git a/src/mainboard/amd/olivehill/buildOpts.c b/src/mainboard/amd/olivehill/buildOpts.c
index dfcb465..d2bc4e7 100644
--- a/src/mainboard/amd/olivehill/buildOpts.c
+++ b/src/mainboard/amd/olivehill/buildOpts.c
@@ -66,8 +66,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/amd/parmer/buildOpts.c b/src/mainboard/amd/parmer/buildOpts.c
index e1c71c3..a3cbb7e 100644
--- a/src/mainboard/amd/parmer/buildOpts.c
+++ b/src/mainboard/amd/parmer/buildOpts.c
@@ -63,8 +63,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 90000
diff --git a/src/mainboard/amd/persimmon/buildOpts.c b/src/mainboard/amd/persimmon/buildOpts.c
index cda2d9d..5f18c39 100644
--- a/src/mainboard/amd/persimmon/buildOpts.c
+++ b/src/mainboard/amd/persimmon/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/mainboard/amd/south_station/buildOpts.c b/src/mainboard/amd/south_station/buildOpts.c
index 8bddb38..d3d65713 100644
--- a/src/mainboard/amd/south_station/buildOpts.c
+++ b/src/mainboard/amd/south_station/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY        TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES            TRUE

-#define BLDCFG_PCI_MMIO_BASE                    CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE                    CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT                24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT             0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD          24000
diff --git a/src/mainboard/amd/thatcher/buildOpts.c b/src/mainboard/amd/thatcher/buildOpts.c
index e1c3cd2..53929b8 100644
--- a/src/mainboard/amd/thatcher/buildOpts.c
+++ b/src/mainboard/amd/thatcher/buildOpts.c
@@ -63,8 +63,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 90000
diff --git a/src/mainboard/amd/union_station/buildOpts.c b/src/mainboard/amd/union_station/buildOpts.c
index 8bddb38..d3d65713 100644
--- a/src/mainboard/amd/union_station/buildOpts.c
+++ b/src/mainboard/amd/union_station/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY        TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES            TRUE

-#define BLDCFG_PCI_MMIO_BASE                    CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE                    CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT                24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT             0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD          24000
diff --git a/src/mainboard/asrock/e350m1/buildOpts.c b/src/mainboard/asrock/e350m1/buildOpts.c
index 1e2ebb0..5f8700b 100644
--- a/src/mainboard/asrock/e350m1/buildOpts.c
+++ b/src/mainboard/asrock/e350m1/buildOpts.c
@@ -62,9 +62,6 @@
  * needed by the system.
  */

-#define BLDCFG_PCI_MMIO_BASE                    CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE                    CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT                24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT             0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD          24000
diff --git a/src/mainboard/asrock/imb-a180/buildOpts.c b/src/mainboard/asrock/imb-a180/buildOpts.c
index 97d49c7..99b6180 100644
--- a/src/mainboard/asrock/imb-a180/buildOpts.c
+++ b/src/mainboard/asrock/imb-a180/buildOpts.c
@@ -66,8 +66,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/asus/am1i-a/buildOpts.c b/src/mainboard/asus/am1i-a/buildOpts.c
index e2c01fc..a364982 100644
--- a/src/mainboard/asus/am1i-a/buildOpts.c
+++ b/src/mainboard/asus/am1i-a/buildOpts.c
@@ -82,8 +82,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 15000
diff --git a/src/mainboard/asus/f2a85-m/buildOpts.c b/src/mainboard/asus/f2a85-m/buildOpts.c
index 6c368cb..38d302e 100644
--- a/src/mainboard/asus/f2a85-m/buildOpts.c
+++ b/src/mainboard/asus/f2a85-m/buildOpts.c
@@ -76,8 +76,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 90000
diff --git a/src/mainboard/bap/ode_e20XX/buildOpts.c b/src/mainboard/bap/ode_e20XX/buildOpts.c
index 0d98c02..2bcabf4 100644
--- a/src/mainboard/bap/ode_e20XX/buildOpts.c
+++ b/src/mainboard/bap/ode_e20XX/buildOpts.c
@@ -66,8 +66,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/biostar/a68n_5200/buildOpts.c b/src/mainboard/biostar/a68n_5200/buildOpts.c
index dfcb465..d2bc4e7 100644
--- a/src/mainboard/biostar/a68n_5200/buildOpts.c
+++ b/src/mainboard/biostar/a68n_5200/buildOpts.c
@@ -66,8 +66,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/biostar/am1ml/buildOpts.c b/src/mainboard/biostar/am1ml/buildOpts.c
index 5e9f256..b9a3efe 100644
--- a/src/mainboard/biostar/am1ml/buildOpts.c
+++ b/src/mainboard/biostar/am1ml/buildOpts.c
@@ -66,8 +66,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/elmex/pcm205400/buildOpts.c b/src/mainboard/elmex/pcm205400/buildOpts.c
index bbc8f00..8c34cd6 100644
--- a/src/mainboard/elmex/pcm205400/buildOpts.c
+++ b/src/mainboard/elmex/pcm205400/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/mainboard/gizmosphere/gizmo/buildOpts.c b/src/mainboard/gizmosphere/gizmo/buildOpts.c
index cda2d9d..5f18c39 100644
--- a/src/mainboard/gizmosphere/gizmo/buildOpts.c
+++ b/src/mainboard/gizmosphere/gizmo/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/mainboard/gizmosphere/gizmo2/buildOpts.c b/src/mainboard/gizmosphere/gizmo2/buildOpts.c
index 0d98c02..2bcabf4 100644
--- a/src/mainboard/gizmosphere/gizmo2/buildOpts.c
+++ b/src/mainboard/gizmosphere/gizmo2/buildOpts.c
@@ -66,8 +66,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/hp/abm/buildOpts.c b/src/mainboard/hp/abm/buildOpts.c
index 7ebf119..a649c73 100644
--- a/src/mainboard/hp/abm/buildOpts.c
+++ b/src/mainboard/hp/abm/buildOpts.c
@@ -71,8 +71,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                  15000
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c b/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
index 17b5804..e7ff996 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
@@ -77,8 +77,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 90000
diff --git a/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c b/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
index 02a416a..a20d133 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
@@ -68,9 +68,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/mainboard/lenovo/g505s/buildOpts.c b/src/mainboard/lenovo/g505s/buildOpts.c
index 789bb40..f4993d6 100644
--- a/src/mainboard/lenovo/g505s/buildOpts.c
+++ b/src/mainboard/lenovo/g505s/buildOpts.c
@@ -77,8 +77,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 90000
diff --git a/src/mainboard/lippert/frontrunner-af/buildOpts.c b/src/mainboard/lippert/frontrunner-af/buildOpts.c
index cda2d9d..5f18c39 100644
--- a/src/mainboard/lippert/frontrunner-af/buildOpts.c
+++ b/src/mainboard/lippert/frontrunner-af/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/mainboard/lippert/toucan-af/buildOpts.c b/src/mainboard/lippert/toucan-af/buildOpts.c
index cda2d9d..5f18c39 100644
--- a/src/mainboard/lippert/toucan-af/buildOpts.c
+++ b/src/mainboard/lippert/toucan-af/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/mainboard/msi/ms7721/buildOpts.c b/src/mainboard/msi/ms7721/buildOpts.c
index aaa88b6a..4029bc3 100644
--- a/src/mainboard/msi/ms7721/buildOpts.c
+++ b/src/mainboard/msi/ms7721/buildOpts.c
@@ -76,8 +76,6 @@

//#define BLDCFG_FORCE_INDEPENDENT_PSD_OBJECT  TRUE

-#define BLDCFG_PCI_MMIO_BASE	CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE	CONFIG_MMCONF_BUS_NUMBER
 /* Build configuration values here.
  */
 #define BLDCFG_VRM_CURRENT_LIMIT                 90000
diff --git a/src/mainboard/pcengines/apu1/buildOpts.c b/src/mainboard/pcengines/apu1/buildOpts.c
index 5f92720..639d605 100644
--- a/src/mainboard/pcengines/apu1/buildOpts.c
+++ b/src/mainboard/pcengines/apu1/buildOpts.c
@@ -54,9 +54,6 @@
 #define BLDOPT_REMOVE_GFX_RECOVERY				TRUE
 #define BLDOPT_REMOVE_EARLY_SAMPLES				TRUE

-#define BLDCFG_PCI_MMIO_BASE					CONFIG_MMCONF_BASE_ADDRESS
-#define BLDCFG_PCI_MMIO_SIZE					CONFIG_MMCONF_BUS_NUMBER
-
 #define BLDCFG_VRM_CURRENT_LIMIT				24000
 //#define BLDCFG_VRM_NB_CURRENT_LIMIT			0
 #define BLDCFG_VRM_LOW_POWER_THRESHOLD			24000
diff --git a/src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h b/src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h
index 9aa9cbd..2de9de5 100644
--- a/src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h
@@ -1081,17 +1081,9 @@
   #define CFG_PLATFORM_POWER_POLICY_MODE  (Performance)
 #endif

-#ifdef BLDCFG_PCI_MMIO_BASE
-  #define CFG_PCI_MMIO_BASE               (BLDCFG_PCI_MMIO_BASE)
-#else
-  #define CFG_PCI_MMIO_BASE               (0)
-#endif
+#define CFG_PCI_MMIO_BASE                 (CONFIG_MMCONF_BASE_ADDRESS)

-#ifdef BLDCFG_PCI_MMIO_SIZE
-  #define CFG_PCI_MMIO_SIZE               (BLDCFG_PCI_MMIO_SIZE)
-#else
-  #define CFG_PCI_MMIO_SIZE               (0)
-#endif
+#define CFG_PCI_MMIO_SIZE                 (CONFIG_MMCONF_BUS_NUMBER)

#ifdef BLDCFG_AP_MTRR_SETTINGS_LIST
   #define CFG_AP_MTRR_SETTINGS_LIST           (BLDCFG_AP_MTRR_SETTINGS_LIST)
@@ -1102,6 +1094,13 @@
 /*---------------------------------------------------------------------------
  *       Processing the options:  Third, perform the option cross checks
  *--------------------------------------------------------------------------*/
+// Check that deprecated options are not used
+#ifdef BLDCFG_PCI_MMIO_BASE
+  #error  BLDOPT: BLDCFG_PCI_MMIO_BASE has been deprecated in coreboot. Do not use!
+#endif
+#ifdef BLDCFG_PCI_MMIO_SIZE
+  #error  BLDOPT: BLDCFG_PCI_MMIO_SIZE has been deprecated in coreboot. Do not use!
+#endif
 // Assure that at least one type of memory support is included
 #if OPTION_UDIMMS == FALSE
   #if OPTION_RDIMMS == FALSE
diff --git a/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h
index 70c2135..63dae95 100644
--- a/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h
@@ -2418,17 +2418,9 @@
   #define CFG_PLATFORM_POWER_POLICY_MODE  (Performance)
 #endif

-#ifdef BLDCFG_PCI_MMIO_BASE
-  #define CFG_PCI_MMIO_BASE               (BLDCFG_PCI_MMIO_BASE)
-#else
-  #define CFG_PCI_MMIO_BASE               (0)
-#endif
+#define CFG_PCI_MMIO_BASE                 (CONFIG_MMCONF_BASE_ADDRESS)

-#ifdef BLDCFG_PCI_MMIO_SIZE
-  #define CFG_PCI_MMIO_SIZE               (BLDCFG_PCI_MMIO_SIZE)
-#else
-  #define CFG_PCI_MMIO_SIZE               (0)
-#endif
+#define CFG_PCI_MMIO_SIZE                 (CONFIG_MMCONF_BUS_NUMBER)

#ifdef BLDCFG_AP_MTRR_SETTINGS_LIST
   #define CFG_AP_MTRR_SETTINGS_LIST           (BLDCFG_AP_MTRR_SETTINGS_LIST)
@@ -2445,6 +2437,13 @@
 /*---------------------------------------------------------------------------
  *       Processing the options:  Third, perform the option cross checks
  *--------------------------------------------------------------------------*/
+// Check that deprecated options are not used
+#ifdef BLDCFG_PCI_MMIO_BASE
+  #error  BLDOPT: BLDCFG_PCI_MMIO_BASE has been deprecated in coreboot. Do not use!
+#endif
+#ifdef BLDCFG_PCI_MMIO_SIZE
+  #error  BLDOPT: BLDCFG_PCI_MMIO_SIZE has been deprecated in coreboot. Do not use!
+#endif
 // Assure that at least one type of memory support is included
 #if OPTION_UDIMMS == FALSE
   #if OPTION_RDIMMS == FALSE
diff --git a/src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h
index 90c4e3f..6c84bcb 100644
--- a/src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h
@@ -1426,17 +1426,9 @@
   #define CFG_LHTC_TEMPERATURE_LIMIT        (0)
 #endif

-#ifdef BLDCFG_PCI_MMIO_BASE
-  #define CFG_PCI_MMIO_BASE               (BLDCFG_PCI_MMIO_BASE)
-#else
-  #define CFG_PCI_MMIO_BASE               (0)
-#endif
+#define CFG_PCI_MMIO_BASE                   (CONFIG_MMCONF_BASE_ADDRESS)

-#ifdef BLDCFG_PCI_MMIO_SIZE
-  #define CFG_PCI_MMIO_SIZE               (BLDCFG_PCI_MMIO_SIZE)
-#else
-  #define CFG_PCI_MMIO_SIZE               (0)
-#endif
+#define CFG_PCI_MMIO_SIZE                   (CONFIG_MMCONF_BUS_NUMBER)

#ifdef BLDCFG_AP_MTRR_SETTINGS_LIST
   #define CFG_AP_MTRR_SETTINGS_LIST           (BLDCFG_AP_MTRR_SETTINGS_LIST)
@@ -1501,6 +1493,13 @@
 /*---------------------------------------------------------------------------
  *       Processing the options:  Third, perform the option cross checks
  *--------------------------------------------------------------------------*/
+// Check that deprecated options are not used
+#ifdef BLDCFG_PCI_MMIO_BASE
+  #error  BLDOPT: BLDCFG_PCI_MMIO_BASE has been deprecated in coreboot. Do not use!
+#endif
+#ifdef BLDCFG_PCI_MMIO_SIZE
+  #error  BLDOPT: BLDCFG_PCI_MMIO_SIZE has been deprecated in coreboot. Do not use!
+#endif
 // Assure that at least one type of memory support is included
 #if OPTION_UDIMMS == FALSE
   #if OPTION_RDIMMS == FALSE