UPSTREAM: mb/google/volteer: Drop boldar variant
This variant never really got used and can be deprecated.
BUG=none
BRANCH=none
TEST=none
Change-Id: Ie8aad85a62e7c7e3cdc7ae99314a55c6abaf020d
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 2d852cffb9918c8eff536108d8f44079ee863aef
Original-Change-Id: I5d59460c90266ba5f9c3bdb951f53a37ffae9e03
Original-Signed-off-by: Furquan Shaikh <furquan@google.com>
Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/50095
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2663286
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
Commit-Queue: Patrick Georgi <pgeorgi@chromium.org>
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 6665135..3217d07 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -105,7 +105,6 @@
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
@@ -147,7 +146,6 @@
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 b7c69ab..5bb1794 100644
--- a/src/mainboard/google/volteer/Kconfig.name
+++ b/src/mainboard/google/volteer/Kconfig.name
@@ -65,11 +65,6 @@
bool "-> Voxel"
select BOARD_GOOGLE_BASEBOARD_VOLTEER
-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 7a2a6ff..0000000
--- 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 <baseboard/ec.h>
-
-#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 b5fa8c5..0000000
--- 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 <baseboard/gpio.h>
-
-/* 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 ed894fe..0000000
--- 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 2e3fcbc..0000000
--- 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 7f7204c..0000000
--- 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 32204c5..0000000
--- 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
