diff options
6 files changed, 45 insertions, 18 deletions
diff --git a/src/ec/intel/board_id.c b/src/ec/intel/board_id.c index 72d74c51f0d8..028c4e103e72 100644 --- a/src/ec/intel/board_id.c +++ b/src/ec/intel/board_id.c @@ -2,32 +2,47 @@ #include <boardid.h> #include "board_id.h" +#include <console/console.h> #include <ec/acpi/ec.h> #include <ec/google/chromeec/ec.h> #include <types.h> -static uint32_t get_board_id_via_ext_ec(void) +static int intel_ec_get_board_version(uint32_t *id) { - uint32_t id = BOARD_ID_INIT; + if (send_ec_command(EC_FAB_ID_CMD)) + return -1; - if (google_chromeec_get_board_version(&id)) - id = BOARD_ID_UNKNOWN; - - return id; + *id = recv_ec_data() << 8 | recv_ec_data(); + return 0; } -/* Get Board ID via EC I/O port write/read */ +/* Read Board ID from EC */ int get_rvp_board_id(void) { - static int id = BOARD_ID_UNKNOWN; - - if (CONFIG(EC_GOOGLE_CHROMEEC)) { /* CHROME_EC */ - id = get_board_id_via_ext_ec(); - } else { /* WINDOWS_EC */ - if (send_ec_command(EC_FAB_ID_CMD) == 0) { - id = recv_ec_data() << 8; - id |= recv_ec_data(); - } + static uint32_t id = BOARD_ID_INIT; + const char *ec_type; + int ret; + + /* If already initialized, return the cached board ID. */ + if (id != BOARD_ID_INIT) + return id; + + /* Reading board ID. */ + if (CONFIG(EC_GOOGLE_CHROMEEC)) { /* Chrome EC */ + ec_type = "ChromeEC"; + ret = google_chromeec_get_board_version(&id); + } else { /* Intel EC */ + ec_type = "IntelEC"; + ret = intel_ec_get_board_version(&id); } - return (id & BOARD_ID_MASK); + + if (ret == -1) { + id = BOARD_ID_UNKNOWN; + printk(BIOS_INFO, "[%s] board id: unknown\n", ec_type); + } else { + id &= BOARD_ID_MASK; + printk(BIOS_INFO, "[%s] board id: 0x%x\n", ec_type, id); + } + + return id; } diff --git a/src/mainboard/google/bluey/Kconfig b/src/mainboard/google/bluey/Kconfig index 0746970bc5af..5c74c81ac41f 100644 --- a/src/mainboard/google/bluey/Kconfig +++ b/src/mainboard/google/bluey/Kconfig @@ -58,4 +58,12 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS hex default 0xb +config MAINBOARD_GPIO_PIN_FOR_GSC_AP_INTERRUPT + int + default 34 + help + This option specifies the GPIO pin number on the mainboard that is + used for the interrupt line from the Google Security Chip (GSC) to the + Application Processor (AP). + endif # BOARD_GOOGLE_BLUEY_COMMON diff --git a/src/mainboard/google/bluey/board.h b/src/mainboard/google/bluey/board.h index f7c4f23d91df..618eadce2a7b 100644 --- a/src/mainboard/google/bluey/board.h +++ b/src/mainboard/google/bluey/board.h @@ -7,7 +7,8 @@ #include <gpio.h> #define GPIO_AP_EC_INT GPIO(67) -#define GPIO_GSC_AP_INT GPIO(34) +#define GSC_AP_INT(x) GPIO(x) +#define GPIO_GSC_AP_INT GSC_AP_INT(CONFIG_MAINBOARD_GPIO_PIN_FOR_GSC_AP_INTERRUPT) void setup_chromeos_gpios(void); diff --git a/src/mainboard/google/dedede/variants/beadrix/memory/Makefile.mk b/src/mainboard/google/dedede/variants/beadrix/memory/Makefile.mk index d260b55866c0..74955edb8de5 100644 --- a/src/mainboard/google/dedede/variants/beadrix/memory/Makefile.mk +++ b/src/mainboard/google/dedede/variants/beadrix/memory/Makefile.mk @@ -6,3 +6,4 @@ SPD_SOURCES = SPD_SOURCES += spd/lp4x/set-1/spd-1.hex # ID = 0(0b0000) Parts = MT53E512M32D1NP-046 WT:B, K4U6E3S4AA-MGCR, H54G46CYRBX267 SPD_SOURCES += spd/lp4x/set-1/spd-11.hex # ID = 1(0b0001) Parts = CXDB4CBAM-ML-A +SPD_SOURCES += spd/lp4x/set-1/spd-5.hex # ID = 2(0b0010) Parts = SDVB8D8A34XGCL3N3T diff --git a/src/mainboard/google/dedede/variants/beadrix/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/beadrix/memory/dram_id.generated.txt index ddbed1a22d29..080e808939f5 100644 --- a/src/mainboard/google/dedede/variants/beadrix/memory/dram_id.generated.txt +++ b/src/mainboard/google/dedede/variants/beadrix/memory/dram_id.generated.txt @@ -8,3 +8,4 @@ MT53E512M32D1NP-046 WT:B 0 (0000) K4U6E3S4AA-MGCR 0 (0000) H54G46CYRBX267 0 (0000) CXDB4CBAM-ML-A 1 (0001) +SDVB8D8A34XGCL3N3T 2 (0010) diff --git a/src/mainboard/google/dedede/variants/beadrix/memory/mem_parts_used.txt b/src/mainboard/google/dedede/variants/beadrix/memory/mem_parts_used.txt index 56e9d6e249e0..d95fdb6cd531 100644 --- a/src/mainboard/google/dedede/variants/beadrix/memory/mem_parts_used.txt +++ b/src/mainboard/google/dedede/variants/beadrix/memory/mem_parts_used.txt @@ -13,3 +13,4 @@ MT53E512M32D1NP-046 WT:B K4U6E3S4AA-MGCR H54G46CYRBX267 CXDB4CBAM-ML-A +SDVB8D8A34XGCL3N3T |