10 files changed, 30 insertions, 10 deletions
diff --git a/src/mainboard/amd/bettong/Kconfig b/src/mainboard/amd/bettong/Kconfig
index 5f26e8777e..bcfceb19b3 100644
--- a/src/mainboard/amd/bettong/Kconfig
+++ b/src/mainboard/amd/bettong/Kconfig
@@ -13,6 +13,9 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_AMD_BETTONG
+	def_bool n
+
 if BOARD_AMD_BETTONG
 
 config BOARD_SPECIFIC_OPTIONS
diff --git a/src/mainboard/amd/bettong/Kconfig.name b/src/mainboard/amd/bettong/Kconfig.name
index 09201b5f80..4bd13291cd 100644
--- a/src/mainboard/amd/bettong/Kconfig.name
+++ b/src/mainboard/amd/bettong/Kconfig.name
@@ -1,2 +1,3 @@
-config BOARD_AMD_BETTONG
-	bool "Bettong"
+# Disabled
+#config BOARD_AMD_BETTONG
+#	bool "Bettong"
diff --git a/src/mainboard/amd/db-ft3b-lc/Kconfig b/src/mainboard/amd/db-ft3b-lc/Kconfig
index 256b5553bf..eaee3e7cd3 100644
--- a/src/mainboard/amd/db-ft3b-lc/Kconfig
+++ b/src/mainboard/amd/db-ft3b-lc/Kconfig
@@ -14,6 +14,9 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_AMD_DB_FT3B_LC
+	def_bool n
+
 if BOARD_AMD_DB_FT3B_LC
 
 config BOARD_SPECIFIC_OPTIONS
diff --git a/src/mainboard/amd/db-ft3b-lc/Kconfig.name b/src/mainboard/amd/db-ft3b-lc/Kconfig.name
index 7caf95ddfe..3197a70694 100644
--- a/src/mainboard/amd/db-ft3b-lc/Kconfig.name
+++ b/src/mainboard/amd/db-ft3b-lc/Kconfig.name
@@ -1,2 +1,3 @@
-config BOARD_AMD_DB_FT3B_LC
-	bool "DB-FT3b-LC"
+# Disabled
+#config BOARD_AMD_DB_FT3B_LC
+#	bool "DB-FT3b-LC"
diff --git a/src/mainboard/amd/lamar/Kconfig b/src/mainboard/amd/lamar/Kconfig
index 025e5ffa80..5527d59a1b 100644
--- a/src/mainboard/amd/lamar/Kconfig
+++ b/src/mainboard/amd/lamar/Kconfig
@@ -13,6 +13,9 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_AMD_LAMAR
+	def_bool n
+
 if BOARD_AMD_LAMAR
 
 config BOARD_SPECIFIC_OPTIONS
diff --git a/src/mainboard/amd/lamar/Kconfig.name b/src/mainboard/amd/lamar/Kconfig.name
index 1831b9a133..75eec04ae3 100644
--- a/src/mainboard/amd/lamar/Kconfig.name
+++ b/src/mainboard/amd/lamar/Kconfig.name
@@ -1,2 +1,3 @@
-config BOARD_AMD_LAMAR
-	bool "Lamar"
+# Disabled
+#config BOARD_AMD_LAMAR
+#	bool "Lamar"
diff --git a/src/mainboard/amd/olivehillplus/Kconfig b/src/mainboard/amd/olivehillplus/Kconfig
index 96d934702e..61ba33d3b9 100644
--- a/src/mainboard/amd/olivehillplus/Kconfig
+++ b/src/mainboard/amd/olivehillplus/Kconfig
@@ -13,6 +13,9 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_AMD_OLIVEHILLPLUS
+	def_bool n
+
 if BOARD_AMD_OLIVEHILLPLUS
 
 config BOARD_SPECIFIC_OPTIONS
diff --git a/src/mainboard/amd/olivehillplus/Kconfig.name b/src/mainboard/amd/olivehillplus/Kconfig.name
index 85a3e86ca2..1ce4a204b9 100644
--- a/src/mainboard/amd/olivehillplus/Kconfig.name
+++ b/src/mainboard/amd/olivehillplus/Kconfig.name
@@ -1,2 +1,3 @@
-config BOARD_AMD_OLIVEHILLPLUS
-	bool "Olive Hill Plus"
+# Disabled
+#config BOARD_AMD_OLIVEHILLPLUS
+#	bool "Olive Hill Plus"
diff --git a/src/mainboard/bap/ode_e21XX/Kconfig b/src/mainboard/bap/ode_e21XX/Kconfig
index bf812f26ea..5b0d2fb2f3 100644
--- a/src/mainboard/bap/ode_e21XX/Kconfig
+++ b/src/mainboard/bap/ode_e21XX/Kconfig
@@ -13,6 +13,9 @@
 # GNU General Public License for more details.
 #
 
+config BOARD_ODE_E21XX
+	def_bool n
+
 if BOARD_ODE_E21XX
 
 config BOARD_SPECIFIC_OPTIONS
diff --git a/src/mainboard/bap/ode_e21XX/Kconfig.name b/src/mainboard/bap/ode_e21XX/Kconfig.name
index 5ef8804717..64665daea7 100644
--- a/src/mainboard/bap/ode_e21XX/Kconfig.name
+++ b/src/mainboard/bap/ode_e21XX/Kconfig.name
@@ -1,2 +1,3 @@
-config BOARD_ODE_E21XX
-	bool "ODE_e21xx"
+# Disabled
+#config BOARD_ODE_E21XX
+#	bool "ODE_e21xx"