Attention is currently required from: Eric Lai, Kapil Porwal, Nick Vaccaro, Subrata Banik.
SH Kim has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80326?usp=email )
Change subject: mb/google/brya/var/xol: Update memory configuration ......................................................................
mb/google/brya/var/xol: Update memory configuration
Update memory configuration following proto schematics and add supported memory parts.
- K3KL6L60GM-MGCT - K3KL8L80CM-MGCT
BUG=b:319506033 BRANCH=firmware-brya-14505.B TEST=FW_NAME=xol emerge-brya coreboot chromeos-bootimage Proto board can boot to ChromeOS.
Change-Id: I59aabe0870317092f59701bdf88b53bf9731377a Signed-off-by: Seunghwan Kim sh_.kim@samsung.corp-partner.google.com --- M src/mainboard/google/brya/variants/xol/Makefile.mk A src/mainboard/google/brya/variants/xol/memory.c D src/mainboard/google/brya/variants/xol/memory/Makefile.inc A src/mainboard/google/brya/variants/xol/memory/Makefile.mk M src/mainboard/google/brya/variants/xol/memory/dram_id.generated.txt M src/mainboard/google/brya/variants/xol/memory/mem_parts_used.txt 6 files changed, 93 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/80326/1
diff --git a/src/mainboard/google/brya/variants/xol/Makefile.mk b/src/mainboard/google/brya/variants/xol/Makefile.mk index 91f031e..4c33dad 100644 --- a/src/mainboard/google/brya/variants/xol/Makefile.mk +++ b/src/mainboard/google/brya/variants/xol/Makefile.mk @@ -2,4 +2,5 @@
bootblock-y += gpio.c romstage-y += gpio.c +romstage-y += memory.c ramstage-y += gpio.c diff --git a/src/mainboard/google/brya/variants/xol/memory.c b/src/mainboard/google/brya/variants/xol/memory.c new file mode 100644 index 0000000..b195aca --- /dev/null +++ b/src/mainboard/google/brya/variants/xol/memory.c @@ -0,0 +1,75 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <baseboard/variants.h> +#include <soc/romstage.h> + +static const struct mb_cfg variant_memcfg = { + .type = MEM_TYPE_LP5X, + + .rcomp = { + /* Baseboard uses only 100ohm Rcomp resistors */ + .resistor = 100, + }, + + /* DQ byte map */ + .lpx_dq_map = { + .ddr0 = { + .dq0 = { 11, 10, 9, 8, 15, 14, 13, 12 }, + .dq1 = { 7, 5, 4, 6, 1, 2, 0, 3 }, + }, + .ddr1 = { + .dq0 = { 1, 4, 0, 2, 5, 3, 6, 7 }, + .dq1 = { 14, 13, 12, 15, 11, 10, 9, 8 }, + }, + .ddr2 = { + .dq0 = { 11, 10, 9, 8, 13, 15, 12, 14 }, + .dq1 = { 4, 6, 7, 5, 0, 1, 2, 3 }, + }, + .ddr3 = { + .dq0 = { 4, 5, 1, 0, 7, 2, 6, 3 }, + .dq1 = { 15, 11, 10, 14, 9, 8, 13, 12 }, + }, + .ddr4 = { + .dq0 = { 10, 9, 8, 11, 13, 15, 14, 12 }, + .dq1 = { 5, 4, 3, 6, 2, 1, 0, 7 }, + }, + .ddr5 = { + .dq0 = { 0, 5, 1, 4, 6, 3, 7, 2 }, + .dq1 = { 10, 11, 13, 15, 14, 9, 12, 8 }, + }, + .ddr6 = { + .dq0 = { 9, 10, 11, 8, 14, 12, 13, 15 }, + .dq1 = { 5, 7, 6, 4, 1, 2, 3, 0 }, + }, + .ddr7 = { + .dq0 = { 3, 1, 2, 0, 7, 6, 5, 4 }, + .dq1 = { 10, 9, 15, 13, 11, 12, 14, 8 }, + }, + }, + + /* DQS CPU<>DRAM map */ + .lpx_dqs_map = { + .ddr0 = { .dqs0 = 1, .dqs1 = 0 }, + .ddr1 = { .dqs0 = 0, .dqs1 = 1 }, + .ddr2 = { .dqs0 = 1, .dqs1 = 0 }, + .ddr3 = { .dqs0 = 0, .dqs1 = 1 }, + .ddr4 = { .dqs0 = 1, .dqs1 = 0 }, + .ddr5 = { .dqs0 = 0, .dqs1 = 1 }, + .ddr6 = { .dqs0 = 1, .dqs1 = 0 }, + .ddr7 = { .dqs0 = 0, .dqs1 = 1 }, + }, + + .lp5x_config = { + .ccc_config = 0xff, + }, + + .ect = 1, /* Early Command Training */ + + .UserBd = BOARD_TYPE_MOBILE, +}; + +const struct mb_cfg *variant_memory_params(void) +{ + return &variant_memcfg; +} + diff --git a/src/mainboard/google/brya/variants/xol/memory/Makefile.inc b/src/mainboard/google/brya/variants/xol/memory/Makefile.inc deleted file mode 100644 index eace2e4..0000000 --- a/src/mainboard/google/brya/variants/xol/memory/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# This is an auto-generated file. Do not edit!! -# Add memory parts in mem_parts_used.txt and run spd_tools to regenerate. - -SPD_SOURCES = placeholder diff --git a/src/mainboard/google/brya/variants/xol/memory/Makefile.mk b/src/mainboard/google/brya/variants/xol/memory/Makefile.mk new file mode 100644 index 0000000..f07fb67 --- /dev/null +++ b/src/mainboard/google/brya/variants/xol/memory/Makefile.mk @@ -0,0 +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 ADL lp5 src/mainboard/google/brya/variants/xol/memory/ src/mainboard/google/brya/variants/xol/memory/mem_parts_used.txt + +SPD_SOURCES = +SPD_SOURCES += spd/lp5/set-0/spd-9.hex # ID = 0(0b0000) Parts = K3KL6L60GM-MGCT +SPD_SOURCES += spd/lp5/set-0/spd-7.hex # ID = 1(0b0001) Parts = K3KL8L80CM-MGCT diff --git a/src/mainboard/google/brya/variants/xol/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/xol/memory/dram_id.generated.txt index fa24790..e36906a 100644 --- a/src/mainboard/google/brya/variants/xol/memory/dram_id.generated.txt +++ b/src/mainboard/google/brya/variants/xol/memory/dram_id.generated.txt @@ -1 +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 ADL lp5 src/mainboard/google/brya/variants/xol/memory/ src/mainboard/google/brya/variants/xol/memory/mem_parts_used.txt + DRAM Part Name ID to assign +K3KL6L60GM-MGCT 0 (0000) +K3KL8L80CM-MGCT 1 (0001) diff --git a/src/mainboard/google/brya/variants/xol/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/xol/memory/mem_parts_used.txt index 9621137..0bf5d58 100644 --- a/src/mainboard/google/brya/variants/xol/memory/mem_parts_used.txt +++ b/src/mainboard/google/brya/variants/xol/memory/mem_parts_used.txt @@ -1,11 +1,2 @@ -# This is a CSV file containing a list of memory parts used by this variant. -# One part per line with an optional fixed ID in column 2. -# Only include a fixed ID if it is required for legacy reasons! -# Generated IDs are dependent on the order of parts in this file, -# so new parts must always be added at the end of the file! -# -# Generate an updated Makefile.inc and dram_id.generated.txt by running the -# part_id_gen tool from util/spd_tools. -# See util/spd_tools/README.md for more details and instructions. - -# Part Name +K3KL6L60GM-MGCT +K3KL8L80CM-MGCT
-
SH Kim (Code Review)