From 70daaf4be02e5c62c0193e1348a23504995d58f6 Mon Sep 17 00:00:00 2001 From: Jon Murphy Date: Wed, 21 Sep 2022 00:34:45 -0600 Subject: [PATCH] src/mb/skyrim: Rename Sabrina to Mendocino 'Mendocino' was an embargoed name and could previously not be used. Update references for consistency with the correct naming convention. BUG=b:245727030 TEST=builds and boots to kernel Cq-Depend: chrome-internal:4878294 Cq-Depend: chromium:3763392 Signed-off-by: Jon Murphy Change-Id: Ic0248a872dfc92486658aa9bd92bed755dbf59d4 Reviewed-on: https://review.coreboot.org/c/coreboot/+/67750 Reviewed-by: Karthik Ramasubramanian Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/mainboard/google/skyrim/Makefile.inc | 14 +++++++------- .../skyrim/variants/skyrim/memory/Makefile.inc | 2 +- .../variants/skyrim/memory/dram_id.generated.txt | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mainboard/google/skyrim/Makefile.inc b/src/mainboard/google/skyrim/Makefile.inc index fb194d8b03..869916ef15 100644 --- a/src/mainboard/google/skyrim/Makefile.inc +++ b/src/mainboard/google/skyrim/Makefile.inc @@ -16,21 +16,21 @@ subdirs-y += variants/$(VARIANT_DIR) CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include -ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_SBR_D5.bin),) +ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_MDN_D5.bin),) $(info APCB sources present.) ifneq ($(wildcard $(top)/$(SPD_SOURCES)),) LIB_SPD_DEPS = $(SPD_SOURCES) -APCB_SOURCES = $(obj)/APCB_SBR_D5.gen -APCB_SOURCES_RECOVERY = $(obj)/APCB_SBR_D5.gen +APCB_SOURCES = $(obj)/APCB_MDN_D5.gen +APCB_SOURCES_RECOVERY = $(obj)/APCB_MDN_D5.gen -$(obj)/APCB_SBR_D5.gen: $(SPD_SOURCES) \ +$(obj)/APCB_MDN_D5.gen: $(SPD_SOURCES) \ $(APCB_V3_EDIT_TOOL) \ - $(MAINBOARD_BLOBS_DIR)/APCB_SBR_D5.bin - $(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/APCB_SBR_D5.bin \ - $(obj)/APCB_SBR_D5.gen \ + $(MAINBOARD_BLOBS_DIR)/APCB_MDN_D5.bin + $(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/APCB_MDN_D5.bin \ + $(obj)/APCB_MDN_D5.gen \ --spd_sources $(SPD_SOURCES) \ --mem_type 'lp5' else diff --git a/src/mainboard/google/skyrim/variants/skyrim/memory/Makefile.inc b/src/mainboard/google/skyrim/variants/skyrim/memory/Makefile.inc index 0652bba6b0..407e965dba 100644 --- a/src/mainboard/google/skyrim/variants/skyrim/memory/Makefile.inc +++ b/src/mainboard/google/skyrim/variants/skyrim/memory/Makefile.inc @@ -1,7 +1,7 @@ # 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 SBR lp5 src/mainboard/google/skyrim/variants/skyrim/memory src/mainboard/google/skyrim/variants/skyrim/memory/mem_parts_used.txt +# util/spd_tools/bin/part_id_gen MDN lp5 src/mainboard/google/skyrim/variants/skyrim/memory src/mainboard/google/skyrim/variants/skyrim/memory/mem_parts_used.txt SPD_SOURCES = SPD_SOURCES += spd/lp5/set-1/spd-1.hex # ID = 0(0b0000) Parts = MT62F512M32D2DR-031 WT:B, H9JCNNNBK3MLYR-N6E diff --git a/src/mainboard/google/skyrim/variants/skyrim/memory/dram_id.generated.txt b/src/mainboard/google/skyrim/variants/skyrim/memory/dram_id.generated.txt index 2920c9a193..15229fe901 100644 --- a/src/mainboard/google/skyrim/variants/skyrim/memory/dram_id.generated.txt +++ b/src/mainboard/google/skyrim/variants/skyrim/memory/dram_id.generated.txt @@ -1,7 +1,7 @@ # 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 SBR lp5 src/mainboard/google/skyrim/variants/skyrim/memory src/mainboard/google/skyrim/variants/skyrim/memory/mem_parts_used.txt +# util/spd_tools/bin/part_id_gen MDN lp5 src/mainboard/google/skyrim/variants/skyrim/memory src/mainboard/google/skyrim/variants/skyrim/memory/mem_parts_used.txt DRAM Part Name ID to assign MT62F512M32D2DR-031 WT:B 0 (0000)