diff options
Diffstat (limited to 'src/mainboard/google/samus/spd')
| -rw-r--r-- | src/mainboard/google/samus/spd/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/google/samus/spd/hynix_8Gb.spd.hex | 8 | ||||
| -rw-r--r-- | src/mainboard/google/samus/spd/spd.c | 30 | ||||
| -rw-r--r-- | src/mainboard/google/samus/spd/spd.h | 5 |
4 files changed, 30 insertions, 15 deletions
diff --git a/src/mainboard/google/samus/spd/Makefile.inc b/src/mainboard/google/samus/spd/Makefile.inc index ccce912226..774ea57266 100644 --- a/src/mainboard/google/samus/spd/Makefile.inc +++ b/src/mainboard/google/samus/spd/Makefile.inc @@ -21,7 +21,7 @@ romstage-y += spd.c SPD_BIN = $(obj)/spd.bin -# { GPIO66, GPIO69, GPIO68, GPIO67 } +# { GPIO65, GPIO67, GPIO68, GPIO69 } SPD_SOURCES = empty # 0b0000 SPD_SOURCES += empty # 0b0001 SPD_SOURCES += empty # 0b0010 diff --git a/src/mainboard/google/samus/spd/hynix_8Gb.spd.hex b/src/mainboard/google/samus/spd/hynix_8Gb.spd.hex index 14002c1790..b065b91950 100644 --- a/src/mainboard/google/samus/spd/hynix_8Gb.spd.hex +++ b/src/mainboard/google/samus/spd/hynix_8Gb.spd.hex @@ -1,6 +1,6 @@ -# Hynix H9CCNNN8JTMLAR-NTM LPDDR3-S8B 16Gb(x32, 2CS) -# banks 8, ranks 2, rows 15, columns 10, density 8192 Mb, x32 -92 11 F1 03 05 19 02 0B 03 11 01 08 0A 00 FE 00 +# Hynix H9CCNNNBLTMLAR-NTM LPDDR3 +# banks 8, ranks 2, rows 14, columns 11, density 4096 Mb, x16 +92 11 F1 03 04 12 02 0A 03 11 01 08 0A 00 FE 00 69 78 69 3C 69 11 18 81 20 08 3C 3C 01 40 83 05 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0F 01 02 00 @@ -8,7 +8,7 @@ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 80 AD 00 00 00 00 00 00 00 00 00 -48 39 43 43 4E 4E 4E 38 4A 54 4D 4C 41 52 2D 4E +48 39 43 43 4E 4E 4E 42 4C 54 4D 4C 41 52 2D 4E 54 4D 00 00 80 AD 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 diff --git a/src/mainboard/google/samus/spd/spd.c b/src/mainboard/google/samus/spd/spd.c index 0409302fb0..00e694e9d2 100644 --- a/src/mainboard/google/samus/spd/spd.c +++ b/src/mainboard/google/samus/spd/spd.c @@ -24,6 +24,8 @@ #include <broadwell/gpio.h> #include <broadwell/pei_data.h> #include <broadwell/romstage.h> +#include <ec/google/chromeec/ec.h> +#include <mainboard/google/samus/ec.h> #include <mainboard/google/samus/gpio.h> #include <mainboard/google/samus/spd/spd.h> @@ -80,25 +82,33 @@ static void mainboard_print_spd_info(uint8_t spd[]) /* Copy SPD data for on-board memory */ void mainboard_fill_spd_data(struct pei_data *pei_data) { + int spd_bits[4] = { + SPD_GPIO_BIT0, + SPD_GPIO_BIT1, + SPD_GPIO_BIT2, + SPD_GPIO_BIT3 + }; int spd_gpio[4]; int spd_index; int spd_file_len; struct cbfs_file *spd_file; - spd_gpio[0] = get_gpio(SPD_GPIO_BIT0); - spd_gpio[1] = get_gpio(SPD_GPIO_BIT1); - spd_gpio[2] = get_gpio(SPD_GPIO_BIT2); - spd_gpio[3] = get_gpio(SPD_GPIO_BIT3); + /* Proto2B boards use a different GPIO for SPD index bit 3 */ + if (google_chromeec_get_board_version() <= SAMUS_EC_BOARD_PROTO2_A) + spd_bits[3] = SPD_GPIO_BIT3_OLD; + + spd_gpio[0] = get_gpio(spd_bits[0]); + spd_gpio[1] = get_gpio(spd_bits[1]); + spd_gpio[2] = get_gpio(spd_bits[2]); + spd_gpio[3] = get_gpio(spd_bits[3]); spd_index = (spd_gpio[3] << 3) | (spd_gpio[2] << 2) | (spd_gpio[1] << 1) | spd_gpio[0]; printk(BIOS_DEBUG, "SPD: index %d (GPIO%d=%d GPIO%d=%d " "GPIO%d=%d GPIO%d=%d)\n", spd_index, - SPD_GPIO_BIT3, spd_gpio[3], - SPD_GPIO_BIT2, spd_gpio[2], - SPD_GPIO_BIT1, spd_gpio[1], - SPD_GPIO_BIT0, spd_gpio[0]); + spd_bits[3], spd_gpio[3], spd_bits[2], spd_gpio[2], + spd_bits[1], spd_gpio[1], spd_bits[0], spd_gpio[0]); spd_file = cbfs_get_file(CBFS_DEFAULT_MEDIA, "spd.bin"); if (!spd_file) @@ -120,5 +130,9 @@ void mainboard_fill_spd_data(struct pei_data *pei_data) memcpy(pei_data->spd_data[1][0], ((char*)CBFS_SUBHEADER(spd_file)) + spd_index, SPD_LEN); + /* Make sure a valid SPD was found */ + if (pei_data->spd_data[0][0][0] == 0) + die("Invalid SPD data."); + mainboard_print_spd_info(pei_data->spd_data[0][0]); } diff --git a/src/mainboard/google/samus/spd/spd.h b/src/mainboard/google/samus/spd/spd.h index 82e4f8d8a2..4b2f3aab52 100644 --- a/src/mainboard/google/samus/spd/spd.h +++ b/src/mainboard/google/samus/spd/spd.h @@ -33,10 +33,11 @@ #define SPD_PART_LEN 18 /* Samus board memory configuration GPIOs */ -#define SPD_GPIO_BIT0 67 +#define SPD_GPIO_BIT0 69 #define SPD_GPIO_BIT1 68 -#define SPD_GPIO_BIT2 69 +#define SPD_GPIO_BIT2 67 #define SPD_GPIO_BIT3 65 +#define SPD_GPIO_BIT3_OLD 66 struct pei_data; void mainboard_fill_spd_data(struct pei_data *pei_data); |