Skip to content

Commit a5f6065

Browse files
jackpot51crawfxrd
authored andcommitted
lemp14: use correct SPDs
1 parent 4b8ce72 commit a5f6065

7 files changed

Lines changed: 90 additions & 16 deletions

File tree

src/mainboard/system76/ptl/Makefile.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ ramstage-y += variants/$(VARIANT_DIR)/gpio.c
1313
ramstage-y += variants/$(VARIANT_DIR)/ramstage.c
1414
ramstage-$(CONFIG_DRIVERS_I2C_TAS5825M) += variants/$(VARIANT_DIR)/tas5825m.c
1515

16-
SPD_SOURCES = samsung-K3KL8L80DM-MGCU samsung-K3KL9L90EM-MGCU
16+
SPD_SOURCES = Foresee-16GB-FX5P2004G-60 Foresee-32GB-FX5P4008G-60 Micron-16GB-MT62F1G32D2DS-023 Micron-32GB-MT62F2G32D4DS-023

src/mainboard/system76/ptl/spd/samsung-K3KL8L80DM-MGCU.spd.hex renamed to src/mainboard/system76/ptl/spd/Foresee-16GB-FX5P2004G-60.spd.hex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
# Samsung K3KL8L80DM-MGCU
1+
# Foresee-16GB-FX5P2004G-60
22
23 10 15 0e 86 22 95 08 00 40 00 00 02 01 00 00
3-
48 00 08 ff 92 55 05 00 aa 00 90 a8 90 c0 08 60
3+
48 00 09 ff 92 55 05 00 aa 00 90 a8 90 c0 08 60
44
04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
55
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
66
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
77
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
88
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
9-
00 00 00 00 00 00 00 00 00 00 00 00 7f c1 89 20
9+
00 00 00 00 00 00 00 00 00 00 00 00 7f c6 00 00
10+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
11+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
1012
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
1113
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
1214
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
@@ -19,8 +21,6 @@
1921
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
2022
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
2123
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
22-
00 00 00 00 00 00 00 00 00 4b 33 4b 4c 38 4c 38
23-
30 44 4d 2d 4d 47 43 55 00 00 00 00 00 00 80 ce
2424
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
2525
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
2626
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Foresee-32GB-FX5P4008G-60
2+
23 10 15 0e 86 22 b5 08 00 40 00 00 0a 01 00 00
3+
48 00 09 ff 92 55 05 00 aa 00 90 a8 90 c0 08 60
4+
04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
5+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
6+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
7+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
8+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
9+
00 00 00 00 00 00 00 00 00 00 00 00 7f c6 00 00
10+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
11+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
12+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
13+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
14+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
15+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
16+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
17+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
18+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
19+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
20+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
21+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
22+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
23+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
24+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
25+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
26+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
27+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
28+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
29+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
30+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
31+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
32+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
33+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Micron-16GB-MT62F1G32D2DS-023
2+
23 10 13 0e 16 22 95 08 00 40 00 00 02 01 00 00
3+
48 00 0a ff 92 55 05 00 aa 00 90 a8 90 c0 08 60
4+
04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
5+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
6+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
7+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
8+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
9+
00 00 00 00 00 00 00 00 00 00 00 00 7f 00 00 00
10+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
11+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
12+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
13+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
14+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
15+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
16+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
17+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
18+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
19+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
20+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
21+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
22+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
23+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
24+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
25+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
26+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
27+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
28+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
29+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
30+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
31+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
32+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
33+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

src/mainboard/system76/ptl/spd/samsung-K3KL9L90EM-MGCU.spd.hex renamed to src/mainboard/system76/ptl/spd/Micron-32GB-MT62F2G32D4DS-023.spd.hex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
# Samsung K3KL9L90EM-MGCU
1+
# Micron-32GB-MT62F2G32D4DS-023
22
23 10 15 0e 86 22 b5 08 00 40 00 00 0a 01 00 00
33
48 00 08 ff 92 55 05 00 aa 00 90 a8 90 c0 08 60
44
04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
55
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
66
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
77
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
88
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
9-
00 00 00 00 00 00 00 00 00 00 00 00 7f c1 c5 78
9+
00 00 00 00 00 00 00 00 00 00 00 00 7f c2 00 00
10+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
11+
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
1012
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
1113
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
1214
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
@@ -19,8 +21,6 @@
1921
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
2022
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
2123
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
22-
00 00 00 00 00 00 00 00 00 4b 33 4b 4c 39 4c 39
23-
30 44 4d 2d 4d 47 43 55 00 00 00 00 00 00 80 ce
2424
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
2525
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
2626
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

src/mainboard/system76/ptl/variants/lemp14/gpio_early.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
static const struct pad_config early_gpio_table[] = {
77
PAD_CFG_GPI(GPP_E11, NONE, DEEP), // BOARD_ID1
8+
PAD_CFG_GPI(GPP_E15, NONE, DEEP), // BOARD_ID3
89
PAD_CFG_NF(GPP_H08, NONE, DEEP, NF1), // UART0_RX
910
PAD_CFG_NF(GPP_H09, NONE, DEEP, NF1), // UART0_TX
1011
};

src/mainboard/system76/ptl/variants/lemp14/romstage.c

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,20 @@ static const struct mb_cfg board_cfg = {
6767

6868
static size_t get_spd_index(void)
6969
{
70-
if (gpio_get(GPP_E11)) {
71-
// If BOARD_ID1 is high, the system has 16 GB of RAM using 4x32Gb modules
72-
return 0;
73-
} else {
74-
// If BOARD_ID1 is low, the system has 32 GB of RAM using 4x64Gb modules
75-
return 1;
70+
// 0: Foresee 16 GiB
71+
// 1: Foresee 32 GiB
72+
// 2: Micron 16 GiB
73+
// 3: Micron 32 GiB
74+
size_t index = 0;
75+
if (gpio_get(GPP_E15)) {
76+
// If BOARD_ID3 is high, the system uses Micron memory
77+
index += 2;
78+
}
79+
if (!gpio_get(GPP_E11)) {
80+
// If BOARD_ID1 is low, the system has 32 GB of RAM
81+
index += 1;
7682
}
83+
return index;
7784
}
7885

7986
void mainboard_memory_init_params(FSPM_UPD *mupd)

0 commit comments

Comments
 (0)