Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/71880 )
Change subject: mb/google/skyrim: remove morthal variant ......................................................................
mb/google/skyrim: remove morthal variant
Morthal has been overcome by events.
Signed-off-by: Martin Roth gaumless@gmail.com Change-Id: Ice46f4c7400772dbf51eb9d20b61af277daa8513 Reviewed-on: https://review.coreboot.org/c/coreboot/+/71880 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Eric Lai eric_lai@quanta.corp-partner.google.com --- M src/mainboard/google/skyrim/Kconfig M src/mainboard/google/skyrim/Kconfig.name D src/mainboard/google/skyrim/variants/morthal/include/variant/ec.h D src/mainboard/google/skyrim/variants/morthal/overridetree.cb 4 files changed, 15 insertions(+), 15 deletions(-)
Approvals: build bot (Jenkins): Verified Eric Lai: Looks good to me, approved
diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig index 94659db..d89d290 100644 --- a/src/mainboard/google/skyrim/Kconfig +++ b/src/mainboard/google/skyrim/Kconfig @@ -89,7 +89,6 @@ config MAINBOARD_PART_NUMBER default "Skyrim" if BOARD_GOOGLE_SKYRIM default "Winterhold" if BOARD_GOOGLE_WINTERHOLD - default "Morthal" if BOARD_GOOGLE_MORTHAL default "Frostflow" if BOARD_GOOGLE_FROSTFLOW default "Crystaldrift" if BOARD_GOOGLE_CRYSTALDRIFT default "Markarth" if BOARD_GOOGLE_MARKARTH @@ -102,7 +101,6 @@ string default "skyrim" if BOARD_GOOGLE_SKYRIM default "winterhold" if BOARD_GOOGLE_WINTERHOLD - default "morthal" if BOARD_GOOGLE_MORTHAL default "frostflow" if BOARD_GOOGLE_FROSTFLOW default "crystaldrift" if BOARD_GOOGLE_CRYSTALDRIFT default "markarth" if BOARD_GOOGLE_MARKARTH diff --git a/src/mainboard/google/skyrim/Kconfig.name b/src/mainboard/google/skyrim/Kconfig.name index 0095433..7e45877 100644 --- a/src/mainboard/google/skyrim/Kconfig.name +++ b/src/mainboard/google/skyrim/Kconfig.name @@ -11,11 +11,6 @@ select SOC_AMD_COMMON_BLOCK_ACPI_DPTC select FEATURE_DYNAMIC_DPTC
-config BOARD_GOOGLE_MORTHAL - bool "-> Morthal" - select BOARD_GOOGLE_BASEBOARD_SKYRIM - select SOC_AMD_COMMON_BLOCK_ACPI_DPTC - config BOARD_GOOGLE_FROSTFLOW bool "-> Frostflow" select BOARD_GOOGLE_BASEBOARD_SKYRIM diff --git a/src/mainboard/google/skyrim/variants/morthal/include/variant/ec.h b/src/mainboard/google/skyrim/variants/morthal/include/variant/ec.h deleted file mode 100644 index 9e61a44..0000000 --- a/src/mainboard/google/skyrim/variants/morthal/include/variant/ec.h +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/ec.h> diff --git a/src/mainboard/google/skyrim/variants/morthal/overridetree.cb b/src/mainboard/google/skyrim/variants/morthal/overridetree.cb deleted file mode 100644 index 7a56f93..0000000 --- a/src/mainboard/google/skyrim/variants/morthal/overridetree.cb +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -chip soc/amd/mendocino - device domain 0 on end -end # chip soc/amd/mendocino