From 293a3e03dc99a7239504df8f9296d1d2a2ac2181 Mon Sep 17 00:00:00 2001 From: Reka Norman Date: Fri, 17 Sep 2021 15:51:02 +1000 Subject: [PATCH] util/spd_tools: Remove PLK platform Currently spd_tools treats PCO and PLK as separate platforms. This is unnecessary since they have the same SPD requirements. Remove PLK, and use PCO as the platform for all zork variants. BUG=b:191776301 TEST=None Signed-off-by: Reka Norman Change-Id: I7eeeab53fb3e0d92c3675fb80b4747297d4257ab Reviewed-on: https://review.coreboot.org/c/coreboot/+/57771 Tested-by: build bot (Jenkins) Reviewed-by: Karthik Ramasubramanian --- spd/ddr4/platforms_manifest.generated.txt | 1 - util/spd_tools/src/part_id_gen/part_id_gen.go | 1 - util/spd_tools/src/spd_gen/ddr4.go | 2 +- util/spd_tools/src/spd_gen/spd_gen.go | 2 -- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/spd/ddr4/platforms_manifest.generated.txt b/spd/ddr4/platforms_manifest.generated.txt index 804aaabdc8..eedc5062c3 100644 --- a/spd/ddr4/platforms_manifest.generated.txt +++ b/spd/ddr4/platforms_manifest.generated.txt @@ -3,4 +3,3 @@ TGL,set-0 PCO,set-0 -PLK,set-0 diff --git a/util/spd_tools/src/part_id_gen/part_id_gen.go b/util/spd_tools/src/part_id_gen/part_id_gen.go index 781c244cd4..c67f1273ee 100644 --- a/util/spd_tools/src/part_id_gen/part_id_gen.go +++ b/util/spd_tools/src/part_id_gen/part_id_gen.go @@ -39,7 +39,6 @@ var supportedPlatforms = [...]string{ "ADL", "JSL", "PCO", - "PLK", "CZN", } diff --git a/util/spd_tools/src/spd_gen/ddr4.go b/util/spd_tools/src/spd_gen/ddr4.go index ce60038b77..0a2a347528 100644 --- a/util/spd_tools/src/spd_gen/ddr4.go +++ b/util/spd_tools/src/spd_gen/ddr4.go @@ -241,7 +241,7 @@ const ( /* ------------------------------------------------------------------------------------------ */ var DDR4PlatformSetMap = map[int][]int{ - 0: {PlatformTGL, PlatformPCO, PlatformPLK}, + 0: {PlatformTGL, PlatformPCO}, } var DDR4PartAttributeMap = map[string]DDR4MemAttributes{} diff --git a/util/spd_tools/src/spd_gen/spd_gen.go b/util/spd_tools/src/spd_gen/spd_gen.go index 38d706d309..eb37751172 100644 --- a/util/spd_tools/src/spd_gen/spd_gen.go +++ b/util/spd_tools/src/spd_gen/spd_gen.go @@ -43,7 +43,6 @@ const ( PlatformADL PlatformJSL PlatformPCO - PlatformPLK PlatformCZN PlatformMax ) @@ -62,7 +61,6 @@ var platformNames = map[int]string{ PlatformADL: "ADL", PlatformJSL: "JSL", PlatformPCO: "PCO", - PlatformPLK: "PLK", PlatformCZN: "CZN", }