From caea80649967b499a5dc2b8278d36c6eb15dec74 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 4 Feb 2022 17:20:45 -0600 Subject: [PATCH] mb/google/reef: drop nasher variant Release firmware on Nasher/Nasher360 are built as coral sub-variants; remove the old/unused code Change-Id: Ie8d10a31e663230b7deabf92e1c06cd991bbdccb Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/61686 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/mainboard/google/reef/Kconfig | 5 ----- src/mainboard/google/reef/Kconfig.name | 3 --- .../reef/variants/nasher/include/variant/acpi/dptf.asl | 4 ---- .../google/reef/variants/nasher/include/variant/ec.h | 4 ---- .../google/reef/variants/nasher/include/variant/gpio.h | 4 ---- 5 files changed, 20 deletions(-) delete mode 100644 src/mainboard/google/reef/variants/nasher/include/variant/acpi/dptf.asl delete mode 100644 src/mainboard/google/reef/variants/nasher/include/variant/ec.h delete mode 100644 src/mainboard/google/reef/variants/nasher/include/variant/gpio.h diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index 7b65f71a86..dc5ccba4f6 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -34,9 +34,6 @@ config BOARD_GOOGLE_SAND config BOARD_GOOGLE_SNAPPY select BOARD_GOOGLE_BASEBOARD_REEF -config BOARD_GOOGLE_NASHER - select BOARD_GOOGLE_BASEBOARD_REEF - config BOARD_GOOGLE_CORAL select BOARD_GOOGLE_BASEBOARD_REEF @@ -70,7 +67,6 @@ config VARIANT_DIR default "pyro" if BOARD_GOOGLE_PYRO default "sand" if BOARD_GOOGLE_SAND default "snappy" if BOARD_GOOGLE_SNAPPY - default "nasher" if BOARD_GOOGLE_NASHER default "coral" if BOARD_GOOGLE_CORAL config DEVICETREE @@ -85,7 +81,6 @@ config MAINBOARD_PART_NUMBER default "Pyro" if BOARD_GOOGLE_PYRO default "Sand" if BOARD_GOOGLE_SAND default "Snappy" if BOARD_GOOGLE_SNAPPY - default "Nasher" if BOARD_GOOGLE_NASHER default "Coral" if BOARD_GOOGLE_CORAL config MAINBOARD_FAMILY diff --git a/src/mainboard/google/reef/Kconfig.name b/src/mainboard/google/reef/Kconfig.name index 2b33741db7..ee6f6ca000 100644 --- a/src/mainboard/google/reef/Kconfig.name +++ b/src/mainboard/google/reef/Kconfig.name @@ -12,8 +12,5 @@ config BOARD_GOOGLE_SAND config BOARD_GOOGLE_SNAPPY bool "-> Snappy (HP Chromebook x360 11 G1 EE)" -config BOARD_GOOGLE_NASHER - bool "-> Nasher" - config BOARD_GOOGLE_CORAL bool "-> Coral" diff --git a/src/mainboard/google/reef/variants/nasher/include/variant/acpi/dptf.asl b/src/mainboard/google/reef/variants/nasher/include/variant/acpi/dptf.asl deleted file mode 100644 index a97421ed16..0000000000 --- a/src/mainboard/google/reef/variants/nasher/include/variant/acpi/dptf.asl +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Use the one from baseboard for now until the real testing is done. */ -#include diff --git a/src/mainboard/google/reef/variants/nasher/include/variant/ec.h b/src/mainboard/google/reef/variants/nasher/include/variant/ec.h deleted file mode 100644 index 21f78d2147..0000000000 --- a/src/mainboard/google/reef/variants/nasher/include/variant/ec.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Use the one from baseboard for now */ -#include diff --git a/src/mainboard/google/reef/variants/nasher/include/variant/gpio.h b/src/mainboard/google/reef/variants/nasher/include/variant/gpio.h deleted file mode 100644 index 0d47fa74b1..0000000000 --- a/src/mainboard/google/reef/variants/nasher/include/variant/gpio.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Use the one from baseboard for now */ -#include