Revert "mb/google/skyrim: Create whiterun variant"

For simplicity, OEM devices are given a single codename per build variant. Winterhold was intended to be the lead device and was chosen as the code name for this OEM.  Unfortunately, Winterhold was cancelled.  We attempted to rename Winterhold to Whiterun to avoid future confusion. Again, unfortunately, since some devices were already built, changing the name requires a manual change to force the firmware to be taken by the DUT. This was not a reasonable path forward, so we're abandoning the naming to Whiterun.

This reverts commit af69de494e2c32140ce5e00a1562c2845345b1bf.

Signed-off-by: Jon Murphy <jpmurphy@google.com>
Change-Id: Idef95f0f4f369b235937e1806ce57c427e441f21
Reviewed-on: https://review.coreboot.org/c/coreboot/+/73583
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Reviewed-by: Tim Van Patten <timvp@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>

1 files changed, 0 insertions, 261 deletions

diff --git a/src/mainboard/google/skyrim/variants/whiterun/overridetree.cb b/src/mainboard/google/skyrim/variants/whiterun/overridetree.cb
deleted file mode 100644
index 65c3231c96..0000000000
--- a/src/mainboard/google/skyrim/variants/whiterun/overridetree.cb
+++ /dev/null
@@ -1,261 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-fw_config
-	field FP 0
-		option FP_ABSENT 0
-		option FP_PRESENT 1
-	end
-end
-
-chip soc/amd/mendocino
-
-	# Set DPTC multi-profile common parameters
-
-	# Refer the spec "FT6 Infrastructure Roadmap"#57316
-	# Set system_configuration to 4 for 15W
-	register "system_configuration" = "4"
-	register "thermctl_limit_degreeC" = "97"
-
-	register "stt_control" = "1"
-	register "stt_pcb_sensor_count" = "2"
-	register "stt_alpha_apu" = "0x199A"
-	register "stt_error_coeff" = "0x21"
-	register "stt_error_rate_coefficient" = "0xCCD"
-
-	# These registers are defined in AMD DevHub document #57316.
-	# Normal
-	register "vrm_current_limit_mA"                  = "28000"
-	register "vrm_maximum_current_limit_mA"          = "50000"
-	register "vrm_soc_current_limit_mA"              = "10000"
-	# Throttle (e.g., Low/No Battery)
-	register "vrm_current_limit_throttle_mA"         = "20000"
-	register "vrm_maximum_current_limit_throttle_mA" = "20000"
-	register "vrm_soc_current_limit_throttle_mA"     = "10000"
-
-	# Set Dynamic DPTC thermal profile Table A (Default)
-	register "fast_ppt_limit_mW" = "30000"
-	register "slow_ppt_limit_mW" = "18000"
-	register "slow_ppt_time_constant_s" = "7"
-
-	register "stt_min_limit" = "7000"
-	register "stt_m1" = "0x148"
-	register "stt_m2" = "0x38F"
-	register "stt_c_apu" = "0xDF9A"
-	register "stt_skin_temp_apu" = "0x3200"
-
-	# Set Dynamic DPTC thermal profile confiuration. Table B
-	register "fast_ppt_limit_mW_B" = "20000"
-	register "slow_ppt_limit_mW_B" = "13000"
-	register "slow_ppt_time_constant_s_B" = "5"
-
-	register "stt_min_limit_B" = "5000"
-	register "stt_m1_B" = "0x11F"
-	register "stt_m2_B" = "0x3AE"
-	register "stt_c_apu_B" = "0xE19A"
-	register "stt_skin_temp_apu_B" = "0x3400"
-
-	# Set Dynamic DPTC thermal profile confiuration. Table C
-	register "fast_ppt_limit_mW_C" = "30000"
-	register "slow_ppt_limit_mW_C" = "22000"
-	register "slow_ppt_time_constant_s_C" = "10"
-
-	register "stt_min_limit_C" = "10000"
-	register "stt_m1_C" = "0x1A4"
-	register "stt_m2_C" = "0x2E1"
-	register "stt_c_apu_C" = "0xDACD"
-	register "stt_skin_temp_apu_C" = "0x3600"
-
-	# Set Dynamic DPTC thermal profile confiuration. Table D
-	register "fast_ppt_limit_mW_D" = "25000"
-	register "slow_ppt_limit_mW_D" = "15000"
-	register "slow_ppt_time_constant_s_D" = "8"
-
-	register "stt_min_limit_D" = "8000"
-	register "stt_m1_D" = "0x1C3"
-	register "stt_m2_D" = "0x2BB"
-	register "stt_c_apu_D" = "0xDE00"
-	register "stt_skin_temp_apu_D" = "0x3800"
-
-	# Set Dynamic DPTC thermal profile confiuration. Table E
-	register "fast_ppt_limit_mW_E" = "22000"
-	register "slow_ppt_limit_mW_E" = "15000"
-	register "slow_ppt_time_constant_s_E" = "4"
-
-	register "stt_min_limit_E" = "7000"
-	register "stt_m1_E" = "0x114"
-	register "stt_m2_E" = "0x371"
-	register "stt_c_apu_E" = "0xE333"
-	register "stt_skin_temp_apu_E" = "0x3000"
-
-
-	# Set Dynamic DPTC thermal profile confiuration. Table F
-	register "fast_ppt_limit_mW_F" = "18000"
-	register "slow_ppt_limit_mW_F" = "12000"
-	register "slow_ppt_time_constant_s_F" = "2"
-
-	register "stt_min_limit_F" = "5000"
-	register "stt_m1_F" = "0x15C"
-	register "stt_m2_F" = "0x33D"
-	register "stt_c_apu_F" = "0xE866"
-	register "stt_skin_temp_apu_F" = "0x3200"
-
-	register "i2c[0]" = "{
-		.speed = I2C_SPEED_FAST,
-		.speed_config[0] = {
-			.speed = I2C_SPEED_FAST,
-			.scl_hcnt = 107,
-			.scl_lcnt = 230,
-			.sda_hold = 100
-		}
-	}"
-
-	device domain 0 on
-
-		register "dxio_tx_vboost_enable" = "1"
-
-		device ref gpp_bridge_1 on
-			# Required so the NVMe gets placed into D3 when entering S0i3.
-			chip drivers/pcie/rtd3/device
-				register "name" = ""NVME""
-				device pci 00.0 on end
-			end
-		end # eMMC
-		device ref gpp_bridge_2 on
-			# Required so the NVMe gets placed into D3 when entering S0i3.
-			chip drivers/pcie/rtd3/device
-				register "name" = ""NVME""
-				device pci 00.0 on end
-			end
-		end # NVMe
-
-		device ref gpp_bridge_a on  # Internal GPP Bridge 0 to Bus A
-			device ref xhci_1 on # XHCI1 controller
-				chip drivers/usb/acpi
-					device ref xhci_1_root_hub on # XHCI1 root hub
-						chip drivers/usb/acpi
-							device ref usb3_port3 on # USB 3.1 port3
-								chip drivers/usb/acpi
-									register "desc" = ""USB3 Type-A Port A0 (MLB)""
-									register "type" = "UPC_TYPE_USB3_A"
-									register "use_custom_pld" = "true"
-									register "custom_pld" = "ACPI_PLD_TYPE_A(LEFT, LEFT, ACPI_PLD_GROUP(3, 1))"
-									device usb 3.2 on end
-								end
-							end # USB 3.1 port3
-						end
-						chip drivers/usb/acpi
-							device ref usb2_port3 on # USB 2 port3
-								chip drivers/usb/acpi
-									register "desc" = ""USB2 Type-A Port A0 (MLB)""
-									register "type" = "UPC_TYPE_USB3_A"
-									register "use_custom_pld" = "true"
-									register "custom_pld" = "ACPI_PLD_TYPE_A(LEFT, LEFT, ACPI_PLD_GROUP(3, 1))"
-									device usb 2.2 on end
-								end
-							end # USB 2 port3
-						end
-					end # XHCI1 root hub
-				end
-			end # XHCI1 controller
-		end # Internal GPP Bridge 0 to Bus A
-	end # domain
-
-	device ref i2c_0 on
-		chip drivers/i2c/generic
-			register "hid" = ""ELAN0000""
-			register "desc" = ""ELAN Touchpad""
-			register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_40)"
-			register "wake" = "GEVENT_20"
-			register "detect" = "1"
-			device i2c 15 on end
-		end
-		chip drivers/i2c/hid
-			register "generic.hid" = ""GXTP7863""
-			register "generic.desc" = ""Goodix Touchpad""
-			register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_40)"
-			register "generic.wake" = "GEVENT_20"
-			register "generic.detect" = "1"
-			register "hid_desc_reg_offset" = "0x20"
-			device i2c 2c on end
-		end
-	end # I2C0
-	device ref i2c_1 on
-		chip drivers/i2c/hid
-			register "generic.hid" = ""ELAN900C""
-			register "generic.desc" = ""ELAN Touchscreen""
-			register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_29)"
-			register "generic.detect" = "1"
-			register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_131)"
-			register "generic.enable_delay_ms" = "10"
-			register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPIO_136)"
-			register "generic.reset_off_delay_ms" = "1"
-			register "generic.reset_delay_ms" = "10"
-			register "generic.stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPIO_76)"
-			register "generic.stop_delay_ms" = "180"
-			register "generic.stop_off_delay_ms" = "1"
-			register "generic.has_power_resource" = "1"
-			register "hid_desc_reg_offset" = "0x01"
-			device i2c 10 on end
-		end
-		chip drivers/i2c/generic
-			register "hid" = ""MLFS0000""
-			register "desc" = ""Melfas Touchscreen""
-			register "detect" = "1"
-			register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_29)"
-			register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_131)"
-			register "enable_delay_ms" = "1"
-			register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPIO_136)"
-			register "reset_delay_ms" = "20"
-			register "reset_off_delay_ms" = "2"
-			register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPIO_76)"
-			register "stop_off_delay_ms" = "2"
-			register "has_power_resource" = "1"
-			device i2c 34 on end
-		end
-	end # I2C1
-	device ref i2c_2 on
-		chip drivers/i2c/generic
-			register "hid" = ""RTL5682""
-			register "name" = ""RT58""
-			register "desc" = ""Realtek RT5682""
-			register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPIO_90)"
-			register "property_count" = "1"
-			register "property_list[0].type" = "ACPI_DP_TYPE_INTEGER"
-			register "property_list[0].name" = ""realtek,jd-src""
-			register "property_list[0].integer" = "1"
-			device i2c 1a on end
-		end
-		chip drivers/i2c/generic
-			register "hid" = ""10EC1019""
-			register "desc" = ""Realtek SPK AMP R""
-			register "uid" = "1"
-			device i2c 29 on end
-		end
-		chip drivers/i2c/generic
-			register "hid" = ""10EC1019""
-			register "desc" = ""Realtek SPK AMP L""
-			register "uid" = "2"
-			register "probed" = "1"
-			device i2c 2a on end
-		end
-	end # I2C2
-
-	device ref uart_1 on
-		chip drivers/uart/acpi
-			register "name" = ""CRFP""
-			register "desc" = ""Fingerprint Reader""
-			register "hid" = "ACPI_DT_NAMESPACE_HID"
-			register "compat_string" = ""google,cros-ec-uart""
-			register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_24)"
-			register "wake" = "GEVENT_15"
-			register "uart" = "ACPI_UART_RAW_DEVICE(3000000, 64)"
-			register "has_power_resource" = "1"
-			register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPIO_12)"
-			register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_4)"
-			register "enable_delay_ms" = "3"
-			device generic 0 alias fpmcu on
-				probe FP FP_PRESENT
-			end
-		end
-	end # UART1
-
-end	# chip soc/amd/mendocino