From 4c79aa5412cf1d0d11c7595c879bff9ffd5709ba Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Mon, 27 Sep 2021 16:53:57 -0600 Subject: [PATCH] mb/google/dedede: Remove cappy variant support Cappy variant is cancelled. Hence delete the cappy variant support. BUG=b:192256341 TEST=None Signed-off-by: Karthikeyan Ramasubramanian Change-Id: If43188a3e6bf4f4449c7e2d08be7609efe58dca1 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57997 Tested-by: build bot (Jenkins) Reviewed-by: Evan Green --- src/mainboard/google/dedede/Kconfig | 2 - src/mainboard/google/dedede/Kconfig.name | 5 --- .../variants/cappy/include/variant/ec.h | 8 ---- .../variants/cappy/include/variant/gpio.h | 8 ---- .../dedede/variants/cappy/memory/Makefile.inc | 5 --- .../cappy/memory/dram_id.generated.txt | 1 - .../variants/cappy/memory/mem_parts_used.txt | 11 ----- .../dedede/variants/cappy/overridetree.cb | 42 ------------------- 8 files changed, 82 deletions(-) delete mode 100644 src/mainboard/google/dedede/variants/cappy/include/variant/ec.h delete mode 100644 src/mainboard/google/dedede/variants/cappy/include/variant/gpio.h delete mode 100644 src/mainboard/google/dedede/variants/cappy/memory/Makefile.inc delete mode 100644 src/mainboard/google/dedede/variants/cappy/memory/dram_id.generated.txt delete mode 100644 src/mainboard/google/dedede/variants/cappy/memory/mem_parts_used.txt delete mode 100644 src/mainboard/google/dedede/variants/cappy/overridetree.cb diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 980fe701cf..87cf3ef8df 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -109,7 +109,6 @@ config MAINBOARD_PART_NUMBER default "Cret" if BOARD_GOOGLE_CRET default "Pirika" if BOARD_GOOGLE_PIRIKA default "Haboki" if BOARD_GOOGLE_HABOKI - default "Cappy" if BOARD_GOOGLE_CAPPY default "Cappy2" if BOARD_GOOGLE_CAPPY2 default "Bugzzy" if BOARD_GOOGLE_BUGZZY default "Corori" if BOARD_GOOGLE_CORORI @@ -150,7 +149,6 @@ config VARIANT_DIR default "cret" if BOARD_GOOGLE_CRET default "pirika" if BOARD_GOOGLE_PIRIKA default "haboki" if BOARD_GOOGLE_HABOKI - default "cappy" if BOARD_GOOGLE_CAPPY default "cappy2" if BOARD_GOOGLE_CAPPY2 default "bugzzy" if BOARD_GOOGLE_BUGZZY default "corori" if BOARD_GOOGLE_CORORI diff --git a/src/mainboard/google/dedede/Kconfig.name b/src/mainboard/google/dedede/Kconfig.name index b7a84eb5c3..7620304dec 100644 --- a/src/mainboard/google/dedede/Kconfig.name +++ b/src/mainboard/google/dedede/Kconfig.name @@ -153,11 +153,6 @@ config BOARD_GOOGLE_PIRIKA select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50 select BASEBOARD_DEDEDE_LAPTOP -config BOARD_GOOGLE_CAPPY - bool "-> Cappy" - select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50 - select BASEBOARD_DEDEDE_LAPTOP - config BOARD_GOOGLE_CAPPY2 bool "-> Cappy2" select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2 diff --git a/src/mainboard/google/dedede/variants/cappy/include/variant/ec.h b/src/mainboard/google/dedede/variants/cappy/include/variant/ec.h deleted file mode 100644 index 08870e0627..0000000000 --- a/src/mainboard/google/dedede/variants/cappy/include/variant/ec.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#ifndef MAINBOARD_EC_H -#define MAINBOARD_EC_H - -#include - -#endif diff --git a/src/mainboard/google/dedede/variants/cappy/include/variant/gpio.h b/src/mainboard/google/dedede/variants/cappy/include/variant/gpio.h deleted file mode 100644 index 9078664608..0000000000 --- a/src/mainboard/google/dedede/variants/cappy/include/variant/gpio.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#ifndef MAINBOARD_GPIO_H -#define MAINBOARD_GPIO_H - -#include - -#endif /* MAINBOARD_GPIO_H */ diff --git a/src/mainboard/google/dedede/variants/cappy/memory/Makefile.inc b/src/mainboard/google/dedede/variants/cappy/memory/Makefile.inc deleted file mode 100644 index 6751a4283f..0000000000 --- a/src/mainboard/google/dedede/variants/cappy/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!! -## Add memory parts in mem_parts_used.txt and run spd_tools to regenerate. - -SPD_SOURCES = placeholder diff --git a/src/mainboard/google/dedede/variants/cappy/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/cappy/memory/dram_id.generated.txt deleted file mode 100644 index fa247902ee..0000000000 --- a/src/mainboard/google/dedede/variants/cappy/memory/dram_id.generated.txt +++ /dev/null @@ -1 +0,0 @@ -DRAM Part Name ID to assign diff --git a/src/mainboard/google/dedede/variants/cappy/memory/mem_parts_used.txt b/src/mainboard/google/dedede/variants/cappy/memory/mem_parts_used.txt deleted file mode 100644 index 96211370d9..0000000000 --- a/src/mainboard/google/dedede/variants/cappy/memory/mem_parts_used.txt +++ /dev/null @@ -1,11 +0,0 @@ -# This is a CSV file containing a list of memory parts used by this variant. -# One part per line with an optional fixed ID in column 2. -# Only include a fixed ID if it is required for legacy reasons! -# Generated IDs are dependent on the order of parts in this file, -# so new parts must always be added at the end of the file! -# -# Generate an updated Makefile.inc and dram_id.generated.txt by running the -# part_id_gen tool from util/spd_tools. -# See util/spd_tools/README.md for more details and instructions. - -# Part Name diff --git a/src/mainboard/google/dedede/variants/cappy/overridetree.cb b/src/mainboard/google/dedede/variants/cappy/overridetree.cb deleted file mode 100644 index 404024b1d6..0000000000 --- a/src/mainboard/google/dedede/variants/cappy/overridetree.cb +++ /dev/null @@ -1,42 +0,0 @@ -chip soc/intel/jasperlake - - # Intel Common SoC Config - #+-------------------+---------------------------+ - #| Field | Value | - #+-------------------+---------------------------+ - #| GSPI0 | cr50 TPM. Early init is | - #| | required to set up a BAR | - #| | for TPM communication | - #| | before memory is up | - #| I2C0 | Trackpad | - #| I2C1 | Digitizer | - #| I2C2 | Touchscreen | - #| I2C3 | Camera | - #| I2C4 | Audio | - #+-------------------+---------------------------+ - register "common_soc_config" = "{ - .gspi[0] = { - .speed_mhz = 1, - .early_init = 1, - }, - .i2c[0] = { - .speed = I2C_SPEED_FAST, - }, - .i2c[1] = { - .speed = I2C_SPEED_FAST, - }, - .i2c[2] = { - .speed = I2C_SPEED_FAST, - }, - .i2c[3] = { - .speed = I2C_SPEED_FAST, - }, - .i2c[4] = { - .speed = I2C_SPEED_FAST, - }, - }" - - device domain 0 on - device pci 15.0 on end - end -end