summaryrefslogtreecommitdiff
path: root/src/mainboard/google/zork/variants/woomax
diff options
context:
space:
mode:
authorReka Norman <rekanorman@google.com>2021-09-17 20:25:37 +1000
committerFurquan Shaikh <furquan@google.com>2021-09-23 06:51:50 +0000
commitafedc210ffdb4fc54f9276c0512c61202bd7bdcb (patch)
tree902b31a0339e0ea70892aac475493e326cb0a439 /src/mainboard/google/zork/variants/woomax
parentffa61b0f60d8e988a72ea8d2777b9efa6c35d304 (diff)
mb/google/zork: Migrate zork to use SPD files under spd/
SPD files are being moved from the soc and mainboard directories to a centralised spd/ directory. This change migrates all zork variants to use this new location. The contents of the new SPDs are identical, only their file paths have changed. The variant Makefile.inc and dram_id.generated.txt files were generated using the part_id_gen tool. E.g. for dalboz: util/spd_tools/bin/part_id_gen \ PCO \ ddr4 \ src/mainboard/google/zork/variants/dalboz/spd \ src/mainboard/google/zork/variants/dalboz/spd/mem_parts_used.txt BUG=b:191776301 TEST=Check that each variant's coreboot.rom is the same with and without this change. Built using: abuild -p none -t google/zork -a -x --timeless Signed-off-by: Reka Norman <rekanorman@google.com> Change-Id: I305a24f9345bab28ff35e317b6e7fd7efba22413 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57772 Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/zork/variants/woomax')
-rw-r--r--src/mainboard/google/zork/variants/woomax/Makefile.inc2
-rw-r--r--src/mainboard/google/zork/variants/woomax/spd/Makefile.inc30
-rw-r--r--src/mainboard/google/zork/variants/woomax/spd/dram_id.generated.txt5
3 files changed, 21 insertions, 16 deletions
diff --git a/src/mainboard/google/zork/variants/woomax/Makefile.inc b/src/mainboard/google/zork/variants/woomax/Makefile.inc
index 57e7136ddc..3b259741f7 100644
--- a/src/mainboard/google/zork/variants/woomax/Makefile.inc
+++ b/src/mainboard/google/zork/variants/woomax/Makefile.inc
@@ -1,5 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-subdirs-y += ./spd
-
ramstage-y += gpio.c
diff --git a/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc b/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc
index 91ef5e5bae..2da8dc53a3 100644
--- a/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc
+++ b/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc
@@ -1,16 +1,18 @@
-## SPDX-License-Identifier: GPL-2.0-or-later
-## This is an auto-generated file. Do not edit!!
+# SPDX-License-Identifier: GPL-2.0-or-later
+# This is an auto-generated file. Do not edit!!
+# Generated by:
+# util/spd_tools/bin/part_id_gen PCO ddr4 src/mainboard/google/zork/variants/woomax/spd src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt
SPD_SOURCES =
-SPD_SOURCES += ddr4-spd-1.hex # ID = 0(0b0000) Parts = MT40A512M16TB-062E:J
-SPD_SOURCES += ddr4-spd-1.hex # ID = 1(0b0001) Parts = H5AN8G6NCJR-XNC
-SPD_SOURCES += ddr4-spd-empty.hex # ID = 2(0b0010)
-SPD_SOURCES += ddr4-spd-empty.hex # ID = 3(0b0011)
-SPD_SOURCES += ddr4-spd-empty.hex # ID = 4(0b0100)
-SPD_SOURCES += ddr4-spd-empty.hex # ID = 5(0b0101)
-SPD_SOURCES += ddr4-spd-empty.hex # ID = 6(0b0110)
-SPD_SOURCES += ddr4-spd-empty.hex # ID = 7(0b0111)
-SPD_SOURCES += ddr4-spd-1.hex # ID = 8(0b1000) Parts = MT40A512M16TB-062E:J
-SPD_SOURCES += ddr4-spd-1.hex # ID = 9(0b1001) Parts = H5AN8G6NCJR-XNC
-SPD_SOURCES += ddr4-spd-7.hex # ID = 10(0b1010) Parts = MT40A1G16KD-062E:E
-SPD_SOURCES += ddr4-spd-7.hex # ID = 11(0b1011) Parts = K4AAG165WA-BCWE
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex # ID = 0(0b0000) Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex # ID = 1(0b0001) Parts = H5AN8G6NCJR-XNC
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 2(0b0010)
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 3(0b0011)
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 4(0b0100)
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 5(0b0101)
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 6(0b0110)
+SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 7(0b0111)
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex # ID = 8(0b1000) Parts = MT40A512M16TB-062E:J
+SPD_SOURCES += spd/ddr4/set-0/spd-1.hex # ID = 9(0b1001) Parts = H5AN8G6NCJR-XNC
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex # ID = 10(0b1010) Parts = MT40A1G16KD-062E:E
+SPD_SOURCES += spd/ddr4/set-0/spd-7.hex # ID = 11(0b1011) Parts = K4AAG165WA-BCWE
diff --git a/src/mainboard/google/zork/variants/woomax/spd/dram_id.generated.txt b/src/mainboard/google/zork/variants/woomax/spd/dram_id.generated.txt
index c0583f495a..19039621ba 100644
--- a/src/mainboard/google/zork/variants/woomax/spd/dram_id.generated.txt
+++ b/src/mainboard/google/zork/variants/woomax/spd/dram_id.generated.txt
@@ -1,3 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# This is an auto-generated file. Do not edit!!
+# Generated by:
+# util/spd_tools/bin/part_id_gen PCO ddr4 src/mainboard/google/zork/variants/woomax/spd src/mainboard/google/zork/variants/woomax/spd/mem_parts_used.txt
+
DRAM Part Name ID to assign
MT40A512M16TB-062E:J 0 (0000)
H5AN8G6NCJR-XNC 1 (0001)