From 2d852cffb9918c8eff536108d8f44079ee863aef Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 28 Jan 2021 16:39:45 -0800 Subject: mb/google/volteer: Drop boldar variant This variant never really got used and can be deprecated. Change-Id: I5d59460c90266ba5f9c3bdb951f53a37ffae9e03 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/50095 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/mainboard/google/volteer/Kconfig | 2 -- src/mainboard/google/volteer/Kconfig.name | 5 ----- .../google/volteer/variants/boldar/include/variant/ec.h | 8 -------- .../google/volteer/variants/boldar/include/variant/gpio.h | 15 --------------- .../google/volteer/variants/boldar/memory/Makefile.inc | 5 ----- .../volteer/variants/boldar/memory/dram_id.generated.txt | 2 -- .../volteer/variants/boldar/memory/mem_list_variant.txt | 1 - .../google/volteer/variants/boldar/overridetree.cb | 6 ------ 8 files changed, 44 deletions(-) delete mode 100644 src/mainboard/google/volteer/variants/boldar/include/variant/ec.h delete mode 100644 src/mainboard/google/volteer/variants/boldar/include/variant/gpio.h delete mode 100644 src/mainboard/google/volteer/variants/boldar/memory/Makefile.inc delete mode 100644 src/mainboard/google/volteer/variants/boldar/memory/dram_id.generated.txt delete mode 100644 src/mainboard/google/volteer/variants/boldar/memory/mem_list_variant.txt delete mode 100644 src/mainboard/google/volteer/variants/boldar/overridetree.cb diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index cfe8dde46e..e529c7ae2e 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -104,7 +104,6 @@ config MAINBOARD_PART_NUMBER default "Volteer2" if BOARD_GOOGLE_VOLTEER2 default "Volteer2_Ti50" if BOARD_GOOGLE_VOLTEER2_TI50 default "Voxel" if BOARD_GOOGLE_VOXEL - default "Boldar" if BOARD_GOOGLE_BOLDAR default "Elemi" if BOARD_GOOGLE_ELEMI default "Voema" if BOARD_GOOGLE_VOEMA default "Drobit" if BOARD_GOOGLE_DROBIT @@ -146,7 +145,6 @@ config VARIANT_DIR default "volteer2" if BOARD_GOOGLE_VOLTEER2 default "volteer2" if BOARD_GOOGLE_VOLTEER2_TI50 default "voxel" if BOARD_GOOGLE_VOXEL - default "boldar" if BOARD_GOOGLE_BOLDAR default "elemi" if BOARD_GOOGLE_ELEMI default "voema" if BOARD_GOOGLE_VOEMA default "drobit" if BOARD_GOOGLE_DROBIT diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name index 2b0a0896c8..292ab3ec72 100644 --- a/src/mainboard/google/volteer/Kconfig.name +++ b/src/mainboard/google/volteer/Kconfig.name @@ -77,11 +77,6 @@ config BOARD_GOOGLE_VOXEL select BOARD_GOOGLE_BASEBOARD_VOLTEER select SOC_INTEL_CSE_LITE_SKU -config BOARD_GOOGLE_BOLDAR - bool "-> Boldar" - select BOARD_GOOGLE_BASEBOARD_VOLTEER - select INTEL_CAR_NEM - config BOARD_GOOGLE_ELEMI bool "-> Elemi" select BOARD_GOOGLE_BASEBOARD_VOLTEER diff --git a/src/mainboard/google/volteer/variants/boldar/include/variant/ec.h b/src/mainboard/google/volteer/variants/boldar/include/variant/ec.h deleted file mode 100644 index 7a2a6ff8b7..0000000000 --- a/src/mainboard/google/volteer/variants/boldar/include/variant/ec.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#ifndef __VARIANT_EC_H__ -#define __VARIANT_EC_H__ - -#include - -#endif diff --git a/src/mainboard/google/volteer/variants/boldar/include/variant/gpio.h b/src/mainboard/google/volteer/variants/boldar/include/variant/gpio.h deleted file mode 100644 index b5fa8c5485..0000000000 --- a/src/mainboard/google/volteer/variants/boldar/include/variant/gpio.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#ifndef VARIANT_GPIO_H -#define VARIANT_GPIO_H - -#include - -/* Memory configuration board straps */ -/* Copied from baseboard and may need to change for the new variant. */ -#define GPIO_MEM_CONFIG_0 GPP_C12 -#define GPIO_MEM_CONFIG_1 GPP_C15 -#define GPIO_MEM_CONFIG_2 GPP_C14 -#define GPIO_MEM_CONFIG_3 GPP_D15 - -#endif diff --git a/src/mainboard/google/volteer/variants/boldar/memory/Makefile.inc b/src/mainboard/google/volteer/variants/boldar/memory/Makefile.inc deleted file mode 100644 index ed894fee62..0000000000 --- a/src/mainboard/google/volteer/variants/boldar/memory/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-or-later -## This is an auto-generated file. Do not edit!! - -SPD_SOURCES = -SPD_SOURCES += ddr4-spd-empty.hex # ID = 0(0b0000) Parts = EMPTY diff --git a/src/mainboard/google/volteer/variants/boldar/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/boldar/memory/dram_id.generated.txt deleted file mode 100644 index 2e3fcbc4b5..0000000000 --- a/src/mainboard/google/volteer/variants/boldar/memory/dram_id.generated.txt +++ /dev/null @@ -1,2 +0,0 @@ -DRAM Part Name ID to assign -EMPTY 0 (0000) diff --git a/src/mainboard/google/volteer/variants/boldar/memory/mem_list_variant.txt b/src/mainboard/google/volteer/variants/boldar/memory/mem_list_variant.txt deleted file mode 100644 index 7f7204cf5f..0000000000 --- a/src/mainboard/google/volteer/variants/boldar/memory/mem_list_variant.txt +++ /dev/null @@ -1 +0,0 @@ -EMPTY diff --git a/src/mainboard/google/volteer/variants/boldar/overridetree.cb b/src/mainboard/google/volteer/variants/boldar/overridetree.cb deleted file mode 100644 index 32204c58e7..0000000000 --- a/src/mainboard/google/volteer/variants/boldar/overridetree.cb +++ /dev/null @@ -1,6 +0,0 @@ -chip soc/intel/tigerlake - - device domain 0 on - end - -end -- cgit v1.2.3