From 5acdfa23fd4277bd46067ef5bdc2d6a175a38987 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Mon, 17 Jun 2024 15:53:34 +0000 Subject: Revert "mb/google/brox/var/lotso: enable CNVi bluetooth" This reverts commit 0e0bc618e3ed1888ac140010057dc7485443c3c2. Reason for revert: Merged out of order, breaks tree Change-Id: I22bd85a2008db471177257a8b779c06898b1010c Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/83105 Reviewed-by: Martin L Roth Tested-by: build bot (Jenkins) Reviewed-by: Felix Held Reviewed-by: Felix Singer Reviewed-by: Karthik Ramasubramanian --- src/mainboard/google/brox/variants/lotso/Makefile.mk | 1 - src/mainboard/google/brox/variants/lotso/variant.c | 20 -------------------- 2 files changed, 21 deletions(-) delete mode 100644 src/mainboard/google/brox/variants/lotso/variant.c (limited to 'src/mainboard/google/brox/variants') diff --git a/src/mainboard/google/brox/variants/lotso/Makefile.mk b/src/mainboard/google/brox/variants/lotso/Makefile.mk index 849eb1ad3a..48683172d6 100644 --- a/src/mainboard/google/brox/variants/lotso/Makefile.mk +++ b/src/mainboard/google/brox/variants/lotso/Makefile.mk @@ -3,5 +3,4 @@ bootblock-y += gpio.c romstage-y += memory.c romstage-y += gpio.c -ramstage-$(CONFIG_FW_CONFIG) += variant.c ramstage-y += gpio.c diff --git a/src/mainboard/google/brox/variants/lotso/variant.c b/src/mainboard/google/brox/variants/lotso/variant.c deleted file mode 100644 index 72b7cbe5f0..0000000000 --- a/src/mainboard/google/brox/variants/lotso/variant.c +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include -#include - -void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config) -{ - if (fw_config_probe(FW_CONFIG(WIFI_BT, WIFI_CNVI_WIFI6E))) { - printk(BIOS_INFO, "CNVi bluetooth enabled by fw_config\n"); - config->cnvi_bt_core = true; - } -} - -const char *get_wifi_sar_cbfs_filename(void) -{ - return get_wifi_sar_fw_config_filename(FW_CONFIG_FIELD(WIFI_BT)); -} -- cgit v1.2.3