summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorRob Barnes <robbarnes@google.com>2020-08-14 15:34:24 -0600
committerAaron Durbin <adurbin@chromium.org>2020-08-28 15:58:34 +0000
commit55ccd5b873eca356a4f20163aa0231320508e0f7 (patch)
treec08118264c1d94ef683993af81a8e86e7b4887dd /src/soc
parent8da998c2b084235181b9b2cd2d4a7ac15a92c4a1 (diff)
mb/google/zork: Switch zork to use spd_tools
Switch all zork boards to use generated generic SPDs from spd_tools. HMAA1GS6CMR6N-VK is unused by Ezkinil, and all other boards, so it was removed. picasso/Makefile.inc was updated to populate the 2nd APCB channel based on APCB_POPULATE_2ND_CHANNEL. This removes the need to suffix spd entires with _x1/_x2. Command to generate files: $ find src/mainboard/google/zork/variants/ -maxdepth 1 -type d | grep -v '/$' | while read b; do n=$(basename ${b}); if [ "${n}" = "baseboard" ]; then continue fi go run util/spd_tools/ddr4/gen_part_id.go src/mainboard/google/zork/spd \ src/mainboard/google/zork/variants/${n}/spd \ src/mainboard/google/zork/variants/${n}/spd/mem_parts_used.txt done BUG=b:162939176 TEST=Boot ezkinil and dalboz check dmidecod -t17 Signed-off-by: Rob Barnes <robbarnes@google.com> Change-Id: I0553858f83d3d1e90cf35bece108768f004a29a5 Reviewed-on: https://review.coreboot.org/c/coreboot/+/44480 Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/amd/picasso/Makefile.inc29
1 files changed, 3 insertions, 26 deletions
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index c12b1af5d0..970ff337c8 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -198,7 +198,7 @@ endif
#
# type = 0x60
-PSP_APCB_FILES=$(foreach f, $(APCB_SOURCES), $(obj)/APCB_$(f).bin)
+PSP_APCB_FILES=$(foreach f, $(basename $(SPD_SOURCES)), $(obj)/APCB_$(f).bin)
# type = 0x61
PSP_APOB_BASE=$(CONFIG_PSP_APOB_DRAM_ADDRESS)
@@ -390,30 +390,7 @@ $(obj)/APCB_%.bin: $(MAINBOARD_BLOBS_DIR)/APCB_%.bin
# APCB binary with magic numbers to be replaced by apcb_edit tool
APCB_MAGIC_BLOB:=$(FIRMWARE_LOCATE)/APCB_magic.bin
-$(obj)/APCB_empty.bin: $(APCB_MAGIC_BLOB) $(APCB_EDIT_TOOL)
- $(APCB_EDIT_TOOL) \
- $(APCB_MAGIC_BLOB) \
- $@ \
- --board_id_gpio0 $(APCB_BOARD_ID_GPIO0) \
- --board_id_gpio1 $(APCB_BOARD_ID_GPIO1) \
- --board_id_gpio2 $(APCB_BOARD_ID_GPIO2) \
- --board_id_gpio3 $(APCB_BOARD_ID_GPIO3)
-
-$(obj)/APCB_%_x1.bin: $$(SPD_SOURCES_DIR)/%.spd.hex \
- $(APCB_EDIT_TOOL) \
- $(APCB_MAGIC_BLOB)
- $(APCB_EDIT_TOOL) \
- $(APCB_MAGIC_BLOB) \
- $@ \
- --hex \
- --strip_manufacturer_information \
- --spd_0_0 $< \
- --board_id_gpio0 $(APCB_BOARD_ID_GPIO0) \
- --board_id_gpio1 $(APCB_BOARD_ID_GPIO1) \
- --board_id_gpio2 $(APCB_BOARD_ID_GPIO2) \
- --board_id_gpio3 $(APCB_BOARD_ID_GPIO3)
-
-$(obj)/APCB_%_x2.bin: $$(SPD_SOURCES_DIR)/%.spd.hex \
+$(obj)/APCB_%.bin: $$(SPD_SOURCES_DIR)/%.hex \
$(APCB_EDIT_TOOL) \
$(APCB_MAGIC_BLOB)
$(APCB_EDIT_TOOL) \
@@ -422,7 +399,7 @@ $(obj)/APCB_%_x2.bin: $$(SPD_SOURCES_DIR)/%.spd.hex \
--hex \
--strip_manufacturer_information \
--spd_0_0 $< \
- --spd_1_0 $< \
+ $(if $(APCB_POPULATE_2ND_CHANNEL), --spd_1_0 $<, ) \
--board_id_gpio0 $(APCB_BOARD_ID_GPIO0) \
--board_id_gpio1 $(APCB_BOARD_ID_GPIO1) \
--board_id_gpio2 $(APCB_BOARD_ID_GPIO2) \