AGESA: Disable boards from build

As per the 4.11 release requirement, C_ENVIRONMENT_BOOTBLOCK=y
is a mandatory feature, which most AGESA and binaryPI boards lack.
Disable such platforms from the build for the time being.

The Kconfig symbol has been flipped, ROMCC_BOOTBLOCK=n is the
same mandated feature as C_ENVIRONMENT_BOOTBLOCK=y.

If a platform does not reach ROMCC_BOOTBLOCK=n within a
reasonable timeframe both the mainboard and the respective
unused platform support code will get removed.

Change-Id: I7fceb0370f7f4f5f52080277c5d21615d3ab3454
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37355
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

48 files changed, 134 insertions, 61 deletions

diff --git a/src/mainboard/amd/bettong/Kconfig b/src/mainboard/amd/bettong/Kconfig
index 08410d3a72..4617360ea1 100644
--- a/src/mainboard/amd/bettong/Kconfig
+++ b/src/mainboard/amd/bettong/Kconfig
@@ -21,7 +21,7 @@ if BOARD_AMD_BETTONG
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	#select BINARYPI_LEGACY_WRAPPER
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_PI_00660F01
 	select NORTHBRIDGE_AMD_PI_00660F01
 	select SOUTHBRIDGE_AMD_PI_KERN
diff --git a/src/mainboard/amd/db-ft3b-lc/Kconfig b/src/mainboard/amd/db-ft3b-lc/Kconfig
index eb5fe8786f..f17d2d34e9 100644
--- a/src/mainboard/amd/db-ft3b-lc/Kconfig
+++ b/src/mainboard/amd/db-ft3b-lc/Kconfig
@@ -22,7 +22,7 @@ if BOARD_AMD_DB_FT3B_LC
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	#select BINARYPI_LEGACY_WRAPPER
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_PI_00730F01
 	select NORTHBRIDGE_AMD_PI_00730F01
 	select SOUTHBRIDGE_AMD_PI_AVALON
diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig
index 541868bd71..a5ba07e637 100644
--- a/src/mainboard/amd/inagua/Kconfig
+++ b/src/mainboard/amd/inagua/Kconfig
@@ -13,11 +13,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_AMD_INAGUA
+	def_bool n
+
 if BOARD_AMD_INAGUA
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/amd/inagua/Kconfig.name b/src/mainboard/amd/inagua/Kconfig.name
index 668b22a7d7..1784fe6fd8 100644
--- a/src/mainboard/amd/inagua/Kconfig.name
+++ b/src/mainboard/amd/inagua/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_AMD_INAGUA
-	bool "Inagua"
+#config BOARD_AMD_INAGUA
+#	bool"Inagua"
diff --git a/src/mainboard/amd/lamar/Kconfig b/src/mainboard/amd/lamar/Kconfig
index d509afcfa9..c8565341d7 100644
--- a/src/mainboard/amd/lamar/Kconfig
+++ b/src/mainboard/amd/lamar/Kconfig
@@ -21,7 +21,7 @@ if BOARD_AMD_LAMAR
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	#select BINARYPI_LEGACY_WRAPPER
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_PI_00630F01
 	select NORTHBRIDGE_AMD_PI_00630F01
 	select SOUTHBRIDGE_AMD_PI_BOLTON
diff --git a/src/mainboard/amd/olivehill/Kconfig b/src/mainboard/amd/olivehill/Kconfig
index e1b5215348..78f768f132 100644
--- a/src/mainboard/amd/olivehill/Kconfig
+++ b/src/mainboard/amd/olivehill/Kconfig
@@ -13,11 +13,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_AMD_OLIVEHILL
+	def_bool n
+
 if BOARD_AMD_OLIVEHILL
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY16_KB
 	select NORTHBRIDGE_AMD_AGESA_FAMILY16_KB
 	select SOUTHBRIDGE_AMD_AGESA_YANGTZE
diff --git a/src/mainboard/amd/olivehill/Kconfig.name b/src/mainboard/amd/olivehill/Kconfig.name
index fd1a713aac..d065472731 100644
--- a/src/mainboard/amd/olivehill/Kconfig.name
+++ b/src/mainboard/amd/olivehill/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_AMD_OLIVEHILL
-	bool "Olive Hill"
+#config BOARD_AMD_OLIVEHILL
+#	bool"Olive Hill"
diff --git a/src/mainboard/amd/olivehillplus/Kconfig b/src/mainboard/amd/olivehillplus/Kconfig
index 229e3f97e0..907de3be03 100644
--- a/src/mainboard/amd/olivehillplus/Kconfig
+++ b/src/mainboard/amd/olivehillplus/Kconfig
@@ -21,7 +21,7 @@ if BOARD_AMD_OLIVEHILLPLUS
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	#select BINARYPI_LEGACY_WRAPPER
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_PI_00730F01
 	select NORTHBRIDGE_AMD_PI_00730F01
 	select SOUTHBRIDGE_AMD_PI_AVALON
diff --git a/src/mainboard/amd/parmer/Kconfig b/src/mainboard/amd/parmer/Kconfig
index 3b6cb5ce89..ae024dd91f 100644
--- a/src/mainboard/amd/parmer/Kconfig
+++ b/src/mainboard/amd/parmer/Kconfig
@@ -13,11 +13,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_AMD_PARMER
+	def_bool n
+
 if BOARD_AMD_PARMER
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY15_TN
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
 	select SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/mainboard/amd/parmer/Kconfig.name b/src/mainboard/amd/parmer/Kconfig.name
index 3aedc956ae..07714686dd 100644
--- a/src/mainboard/amd/parmer/Kconfig.name
+++ b/src/mainboard/amd/parmer/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_AMD_PARMER
-	bool "Parmer"
+#config BOARD_AMD_PARMER
+#	bool"Parmer"
diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index 005741e8b4..f243f0f9c7 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -13,11 +13,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_AMD_PERSIMMON
+	def_bool n
+
 if BOARD_AMD_PERSIMMON
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/amd/persimmon/Kconfig.name b/src/mainboard/amd/persimmon/Kconfig.name
index ba24b13aa4..d50ebbe8cd 100644
--- a/src/mainboard/amd/persimmon/Kconfig.name
+++ b/src/mainboard/amd/persimmon/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_AMD_PERSIMMON
-	bool "Persimmon"
+#config BOARD_AMD_PERSIMMON
+#	bool"Persimmon"
diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig
index f10ff7a940..42841cbb93 100644
--- a/src/mainboard/amd/south_station/Kconfig
+++ b/src/mainboard/amd/south_station/Kconfig
@@ -13,11 +13,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_AMD_SOUTHSTATION
+	def_bool n
+
 if BOARD_AMD_SOUTHSTATION
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/amd/south_station/Kconfig.name b/src/mainboard/amd/south_station/Kconfig.name
index 0cc745e3bc..f8f1404af2 100644
--- a/src/mainboard/amd/south_station/Kconfig.name
+++ b/src/mainboard/amd/south_station/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_AMD_SOUTHSTATION
-	bool "Southstation"
+#config BOARD_AMD_SOUTHSTATION
+#	bool"Southstation"
diff --git a/src/mainboard/amd/thatcher/Kconfig b/src/mainboard/amd/thatcher/Kconfig
index 2c0939c84e..e55659225f 100644
--- a/src/mainboard/amd/thatcher/Kconfig
+++ b/src/mainboard/amd/thatcher/Kconfig
@@ -13,11 +13,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_AMD_THATCHER
+	def_bool n
+
 if BOARD_AMD_THATCHER
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY15_TN
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
 	select SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/mainboard/amd/thatcher/Kconfig.name b/src/mainboard/amd/thatcher/Kconfig.name
index aff5246cc7..b57bdb9a7f 100644
--- a/src/mainboard/amd/thatcher/Kconfig.name
+++ b/src/mainboard/amd/thatcher/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_AMD_THATCHER
-	bool "Thatcher"
+#config BOARD_AMD_THATCHER
+#	bool"Thatcher"
diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index f03fb08f8b..1532d34062 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -13,11 +13,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_AMD_UNIONSTATION
+	def_bool n
+
 if BOARD_AMD_UNIONSTATION
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/amd/union_station/Kconfig.name b/src/mainboard/amd/union_station/Kconfig.name
index 9af3c8270b..b4dc53656d 100644
--- a/src/mainboard/amd/union_station/Kconfig.name
+++ b/src/mainboard/amd/union_station/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_AMD_UNIONSTATION
-	bool "Unionstation"
+#config BOARD_AMD_UNIONSTATION
+#	bool"Unionstation"
diff --git a/src/mainboard/asus/am1i-a/Kconfig b/src/mainboard/asus/am1i-a/Kconfig
index f194519393..8ccb1742af 100644
--- a/src/mainboard/asus/am1i-a/Kconfig
+++ b/src/mainboard/asus/am1i-a/Kconfig
@@ -1,9 +1,12 @@
+config BOARD_ASUS_AM1I_A
+	def_bool n
+
 if BOARD_ASUS_AM1I_A
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY16_KB
 	select FORCE_AM1_SOCKET_SUPPORT
 	select GFXUMA
diff --git a/src/mainboard/asus/am1i-a/Kconfig.name b/src/mainboard/asus/am1i-a/Kconfig.name
index 840e821f65..57c62278ca 100644
--- a/src/mainboard/asus/am1i-a/Kconfig.name
+++ b/src/mainboard/asus/am1i-a/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_ASUS_AM1I_A
-	bool "AM1I-A"
+#config BOARD_ASUS_AM1I_A
+#	bool"AM1I-A"
diff --git a/src/mainboard/bap/Kconfig b/src/mainboard/bap/Kconfig
index 9af496dca6..a638509026 100644
--- a/src/mainboard/bap/Kconfig
+++ b/src/mainboard/bap/Kconfig
@@ -13,6 +13,7 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 ##
+
 if VENDOR_BAP
 
 choice
@@ -20,6 +21,9 @@ choice
 
 source "src/mainboard/bap/*/Kconfig.name"
 
+config BAP_BOARDS_DISABLED
+	bool "Boards from vendor are disabled"
+
 endchoice
 
 source "src/mainboard/bap/*/Kconfig"
diff --git a/src/mainboard/bap/ode_e20XX/Kconfig b/src/mainboard/bap/ode_e20XX/Kconfig
index 97593d5d78..2a72debf58 100644
--- a/src/mainboard/bap/ode_e20XX/Kconfig
+++ b/src/mainboard/bap/ode_e20XX/Kconfig
@@ -14,11 +14,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_ODE_E20XX
+	def_bool n
+
 if BOARD_ODE_E20XX
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY16_KB
 	select NORTHBRIDGE_AMD_AGESA_FAMILY16_KB
 	select SOUTHBRIDGE_AMD_AGESA_YANGTZE
diff --git a/src/mainboard/bap/ode_e20XX/Kconfig.name b/src/mainboard/bap/ode_e20XX/Kconfig.name
index a482846808..54ddcac682 100644
--- a/src/mainboard/bap/ode_e20XX/Kconfig.name
+++ b/src/mainboard/bap/ode_e20XX/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_ODE_E20XX
-	bool "ODE_e20xx"
+#config BOARD_ODE_E20XX
+#	bool"ODE_e20xx"
diff --git a/src/mainboard/bap/ode_e21XX/Kconfig b/src/mainboard/bap/ode_e21XX/Kconfig
index bc5c131f79..ff71d5bdc3 100644
--- a/src/mainboard/bap/ode_e21XX/Kconfig
+++ b/src/mainboard/bap/ode_e21XX/Kconfig
@@ -21,7 +21,7 @@ if BOARD_ODE_E21XX
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	#select BINARYPI_LEGACY_WRAPPER
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_PI_00730F01
 	select NORTHBRIDGE_AMD_PI_00730F01
 	select SOUTHBRIDGE_AMD_PI_AVALON
diff --git a/src/mainboard/biostar/Kconfig b/src/mainboard/biostar/Kconfig
index 43896a3f1f..6469d4e6b5 100644
--- a/src/mainboard/biostar/Kconfig
+++ b/src/mainboard/biostar/Kconfig
@@ -20,6 +20,9 @@ choice
 
 source "src/mainboard/biostar/*/Kconfig.name"
 
+config BIOSTAR_BOARDS_DISABLED
+	bool "Boards from vendor are disabled"
+
 endchoice
 
 source "src/mainboard/biostar/*/Kconfig"
diff --git a/src/mainboard/biostar/a68n_5200/Kconfig b/src/mainboard/biostar/a68n_5200/Kconfig
index a452569a9b..f608513d0e 100644
--- a/src/mainboard/biostar/a68n_5200/Kconfig
+++ b/src/mainboard/biostar/a68n_5200/Kconfig
@@ -15,11 +15,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_BIOSTAR_A68N5200
+	def_bool n
+
 if BOARD_BIOSTAR_A68N5200
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY16_KB
 	select NORTHBRIDGE_AMD_AGESA_FAMILY16_KB
 	select SOUTHBRIDGE_AMD_AGESA_YANGTZE
diff --git a/src/mainboard/biostar/a68n_5200/Kconfig.name b/src/mainboard/biostar/a68n_5200/Kconfig.name
index 52a7f1511a..6d765d2712 100644
--- a/src/mainboard/biostar/a68n_5200/Kconfig.name
+++ b/src/mainboard/biostar/a68n_5200/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_BIOSTAR_A68N5200
-	bool "A68N-5200"
+#config BOARD_BIOSTAR_A68N5200
+#	bool"A68N-5200"
diff --git a/src/mainboard/biostar/am1ml/Kconfig b/src/mainboard/biostar/am1ml/Kconfig
index 3c87965998..866fc66e5d 100644
--- a/src/mainboard/biostar/am1ml/Kconfig
+++ b/src/mainboard/biostar/am1ml/Kconfig
@@ -14,12 +14,15 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_BIOSTAR_AM1ML
+	def_bool n
+
 if BOARD_BIOSTAR_AM1ML
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_4096
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY16_KB
 	select FORCE_AM1_SOCKET_SUPPORT
 	select GFXUMA
diff --git a/src/mainboard/biostar/am1ml/Kconfig.name b/src/mainboard/biostar/am1ml/Kconfig.name
index ccfa6fea85..0980c2e85d 100644
--- a/src/mainboard/biostar/am1ml/Kconfig.name
+++ b/src/mainboard/biostar/am1ml/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_BIOSTAR_AM1ML
-	bool "AM1ML"
+#config BOARD_BIOSTAR_AM1ML
+#	bool"AM1ML"
diff --git a/src/mainboard/elmex/Kconfig b/src/mainboard/elmex/Kconfig
index d1fc9adda7..54217ea217 100644
--- a/src/mainboard/elmex/Kconfig
+++ b/src/mainboard/elmex/Kconfig
@@ -5,6 +5,9 @@ choice
 
 source "src/mainboard/elmex/*/Kconfig.name"
 
+config ELMEX_BOARDS_DISABLED
+	bool "Boards from vendor are disabled"
+
 endchoice
 
 source "src/mainboard/elmex/*/Kconfig"
diff --git a/src/mainboard/elmex/pcm205400/Kconfig b/src/mainboard/elmex/pcm205400/Kconfig
index 14254ca02d..e94a6d89bb 100644
--- a/src/mainboard/elmex/pcm205400/Kconfig
+++ b/src/mainboard/elmex/pcm205400/Kconfig
@@ -13,6 +13,9 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_ELMEX_PCM205400
+	def_bool n
+
 if BOARD_ELMEX_PCM205400
 
 config MAINBOARD_PART_NUMBER
@@ -29,7 +32,7 @@ if BOARD_ELMEX_PCM205400 || BOARD_ELMEX_PCM205401
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/elmex/pcm205400/Kconfig.name b/src/mainboard/elmex/pcm205400/Kconfig.name
index 445b58868a..6488992de2 100644
--- a/src/mainboard/elmex/pcm205400/Kconfig.name
+++ b/src/mainboard/elmex/pcm205400/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_ELMEX_PCM205400
-	bool "pcm205400"
+#config BOARD_ELMEX_PCM205400
+#	bool"pcm205400"
diff --git a/src/mainboard/elmex/pcm205401/Kconfig b/src/mainboard/elmex/pcm205401/Kconfig
index a9bbe6e471..15c741abf2 100644
--- a/src/mainboard/elmex/pcm205401/Kconfig
+++ b/src/mainboard/elmex/pcm205401/Kconfig
@@ -13,6 +13,9 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_ELMEX_PCM205401
+	def_bool n
+
 if BOARD_ELMEX_PCM205401
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/elmex/pcm205401/Kconfig.name b/src/mainboard/elmex/pcm205401/Kconfig.name
index f70b215abc..050b94c4b4 100644
--- a/src/mainboard/elmex/pcm205401/Kconfig.name
+++ b/src/mainboard/elmex/pcm205401/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_ELMEX_PCM205401
-	bool "pcm205401"
+#config BOARD_ELMEX_PCM205401
+#	bool "pcm205401"
diff --git a/src/mainboard/gizmosphere/gizmo2/Kconfig b/src/mainboard/gizmosphere/gizmo2/Kconfig
index b066cdb8cf..685e27190a 100644
--- a/src/mainboard/gizmosphere/gizmo2/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo2/Kconfig
@@ -14,11 +14,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_GIZMOSPHERE_GIZMO2
+	def_bool n
+
 if BOARD_GIZMOSPHERE_GIZMO2
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY16_KB
 	select NORTHBRIDGE_AMD_AGESA_FAMILY16_KB
 	select SOUTHBRIDGE_AMD_AGESA_YANGTZE
diff --git a/src/mainboard/gizmosphere/gizmo2/Kconfig.name b/src/mainboard/gizmosphere/gizmo2/Kconfig.name
index a3bae57b28..29688e2a34 100644
--- a/src/mainboard/gizmosphere/gizmo2/Kconfig.name
+++ b/src/mainboard/gizmosphere/gizmo2/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_GIZMOSPHERE_GIZMO2
-	bool "Gizmo2"
+#config BOARD_GIZMOSPHERE_GIZMO2
+#	bool"Gizmo2"
diff --git a/src/mainboard/hp/abm/Kconfig b/src/mainboard/hp/abm/Kconfig
index 9e35163180..907c02546c 100644
--- a/src/mainboard/hp/abm/Kconfig
+++ b/src/mainboard/hp/abm/Kconfig
@@ -14,11 +14,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_HP_ABM
+	def_bool n
+
 if BOARD_HP_ABM
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY16_KB
 	select NORTHBRIDGE_AMD_AGESA_FAMILY16_KB
 	select SOUTHBRIDGE_AMD_AGESA_YANGTZE
diff --git a/src/mainboard/hp/abm/Kconfig.name b/src/mainboard/hp/abm/Kconfig.name
index 4ace57323d..27eda0c7d9 100644
--- a/src/mainboard/hp/abm/Kconfig.name
+++ b/src/mainboard/hp/abm/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_HP_ABM
-	bool "ABM"
+#config BOARD_HP_ABM
+#	bool"ABM"
diff --git a/src/mainboard/jetway/Kconfig b/src/mainboard/jetway/Kconfig
index 63b3accd8d..530700d816 100644
--- a/src/mainboard/jetway/Kconfig
+++ b/src/mainboard/jetway/Kconfig
@@ -5,6 +5,9 @@ choice
 
 source "src/mainboard/jetway/*/Kconfig.name"
 
+config JETWAY_BOARDS_DISABLED
+	bool "Boards from vendor are disabled"
+
 endchoice
 
 source "src/mainboard/jetway/*/Kconfig"
diff --git a/src/mainboard/jetway/nf81-t56n-lf/Kconfig b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
index 95d3b7ef11..dfa01b93a6 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/Kconfig
+++ b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
@@ -14,11 +14,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_JETWAY_NF81_T56N_LF
+	def_bool n
+
 if BOARD_JETWAY_NF81_T56N_LF
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/jetway/nf81-t56n-lf/Kconfig.name b/src/mainboard/jetway/nf81-t56n-lf/Kconfig.name
index 2e660f937c..0b676274ae 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/Kconfig.name
+++ b/src/mainboard/jetway/nf81-t56n-lf/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_JETWAY_NF81_T56N_LF
-	bool "NF81_T56N_LF"
+#config BOARD_JETWAY_NF81_T56N_LF
+#	bool"NF81_T56N_LF"
diff --git a/src/mainboard/lippert/Kconfig b/src/mainboard/lippert/Kconfig
index 76cf305f82..e45fc3e6a2 100644
--- a/src/mainboard/lippert/Kconfig
+++ b/src/mainboard/lippert/Kconfig
@@ -5,6 +5,9 @@ comment "was acquired by ADLINK"
 choice
 	prompt "Mainboard model"
 
+config LIPPERT_BOARDS_DISABLED
+	bool "Boards from vendor are disabled"
+
 source "src/mainboard/lippert/*/Kconfig.name"
 
 endchoice
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index 8b33810ada..4a007bf394 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -13,11 +13,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_LIPPERT_FRONTRUNNER_AF
+	def_bool n
+
 if BOARD_LIPPERT_FRONTRUNNER_AF
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig.name b/src/mainboard/lippert/frontrunner-af/Kconfig.name
index 2a8cba52ab..1939264bc4 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig.name
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_LIPPERT_FRONTRUNNER_AF
-	bool "FrontRunner-AF aka ADLINK CoreModule2-GF"
+#config BOARD_LIPPERT_FRONTRUNNER_AF
+#	bool"FrontRunner-AF aka ADLINK CoreModule2-GF"
diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig
index 146af07821..b62da2e333 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig
+++ b/src/mainboard/lippert/toucan-af/Kconfig
@@ -13,11 +13,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_LIPPERT_TOUCAN_AF
+	def_bool n
+
 if BOARD_LIPPERT_TOUCAN_AF
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/lippert/toucan-af/Kconfig.name b/src/mainboard/lippert/toucan-af/Kconfig.name
index 3481f92fba..6eceb51f0c 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig.name
+++ b/src/mainboard/lippert/toucan-af/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_LIPPERT_TOUCAN_AF
-	bool "Toucan-AF aka cExpress-GFR (+W83627DHG SIO)"
+#config BOARD_LIPPERT_TOUCAN_AF
+#	bool"Toucan-AF aka cExpress-GFR (+W83627DHG SIO)"
diff --git a/src/mainboard/msi/ms7721/Kconfig b/src/mainboard/msi/ms7721/Kconfig
index 779d3b1baa..5f68e750d5 100644
--- a/src/mainboard/msi/ms7721/Kconfig
+++ b/src/mainboard/msi/ms7721/Kconfig
@@ -16,11 +16,14 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_MSI_MS7721
+	def_bool n
+
 if BOARD_MSI_MS7721
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ROMCC_BOOTBLOCK
+	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY15_TN
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
 	select SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/mainboard/msi/ms7721/Kconfig.name b/src/mainboard/msi/ms7721/Kconfig.name
index bce5b99d43..9ed5473acf 100644
--- a/src/mainboard/msi/ms7721/Kconfig.name
+++ b/src/mainboard/msi/ms7721/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_MSI_MS7721
-	bool "MS-7721 (FM2-A75MA-E35)"
+#config BOARD_MSI_MS7721
+#	bool"MS-7721 (FM2-A75MA-E35)"