From 8dfd7c2a3fbb06503d13ccdcab0a4d2a1acd7da8 Mon Sep 17 00:00:00 2001 From: Shawn Nematbakhsh Date: Wed, 26 Jun 2013 18:11:23 -0700 Subject: [PATCH] peppy: RAM_ID + storage changes for next build. - Update RAM_ID table. - Add DEVSLP0 signal to NGFF SATA port. Note: After this change, old Micron 2GB boards will no longer boot. BUG=chrome-os-partner:20295, chrome-os-partner:20308. TEST=None. BRANCH=None. Signed-off-by: Shawn Nematbakhsh Change-Id: Id68a1d6ace2702cca9c37305726cd55a0bde5005 Reviewed-on: https://gerrit.chromium.org/gerrit/60167 Tested-by: Shawn Nematbakhsh Reviewed-by: Dave Parker Commit-Queue: Dave Parker --- src/mainboard/google/peppy/gpio.h | 2 +- src/mainboard/google/peppy/romstage.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mainboard/google/peppy/gpio.h b/src/mainboard/google/peppy/gpio.h index dd186f8cc2..296acd5062 100644 --- a/src/mainboard/google/peppy/gpio.h +++ b/src/mainboard/google/peppy/gpio.h @@ -56,7 +56,7 @@ const struct pch_lp_gpio_map mainboard_gpio_map[] = { LP_GPIO_NATIVE, /* 30: NATIVE: PCH_SUSWARN_L */ LP_GPIO_NATIVE, /* 31: NATIVE: ACPRESENT */ LP_GPIO_NATIVE, /* 32: NATIVE: LPC_CLKRUN_L */ - LP_GPIO_UNUSED, /* 33: UNUSED */ + LP_GPIO_NATIVE, /* 33: NATIVE: DEVSLP0 */ LP_GPIO_ACPI_SMI, /* 34: EC_SMI_L */ LP_GPIO_ACPI_SMI, /* 35: PCH_NMI_DBG_L (route in NMI_EN) */ LP_GPIO_ACPI_SCI, /* 36: EC_SCI_L */ diff --git a/src/mainboard/google/peppy/romstage.c b/src/mainboard/google/peppy/romstage.c index 080bf5434f..73ad516a25 100644 --- a/src/mainboard/google/peppy/romstage.c +++ b/src/mainboard/google/peppy/romstage.c @@ -92,10 +92,9 @@ static void copy_spd(struct pei_data *peid) if (spd_file->len < sizeof(peid->spd_data[0])) die("Missing SPD data."); - /* Index 0 is 2GB config with CH0 only. This is suject to change. - * TODO(shawnn): Check the decoding before next build. - */ - if (spd_index == 0) + /* Index 0-2 are 4GB config with both CH0 and CH1 + * Index 4-6 are 2GB config with CH0 only */ + if (spd_index > 3) peid->dimm_channel1_disabled = 3; memcpy(peid->spd_data[0],