From b320bc5e0e6863126b57166923f3e0fac96bbb0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sat, 23 Nov 2019 20:22:09 +0200 Subject: AGESA: Disable boards from build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/37355 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/mainboard/amd/bettong/Kconfig | 2 +- src/mainboard/amd/db-ft3b-lc/Kconfig | 2 +- src/mainboard/amd/inagua/Kconfig | 5 ++++- src/mainboard/amd/inagua/Kconfig.name | 4 ++-- src/mainboard/amd/lamar/Kconfig | 2 +- src/mainboard/amd/olivehill/Kconfig | 5 ++++- src/mainboard/amd/olivehill/Kconfig.name | 4 ++-- src/mainboard/amd/olivehillplus/Kconfig | 2 +- src/mainboard/amd/parmer/Kconfig | 5 ++++- src/mainboard/amd/parmer/Kconfig.name | 4 ++-- src/mainboard/amd/persimmon/Kconfig | 5 ++++- src/mainboard/amd/persimmon/Kconfig.name | 4 ++-- src/mainboard/amd/south_station/Kconfig | 5 ++++- src/mainboard/amd/south_station/Kconfig.name | 4 ++-- src/mainboard/amd/thatcher/Kconfig | 5 ++++- src/mainboard/amd/thatcher/Kconfig.name | 4 ++-- src/mainboard/amd/union_station/Kconfig | 5 ++++- src/mainboard/amd/union_station/Kconfig.name | 4 ++-- 18 files changed, 46 insertions(+), 25 deletions(-) (limited to 'src/mainboard/amd') 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" -- cgit v1.2.3