From 1158f712dc99c8fe4dc4c70009cad0c3fdb7c80d Mon Sep 17 00:00:00 2001 From: Philip Chen Date: Thu, 15 Jul 2021 15:31:51 -0700 Subject: mb/google/herobrine: Retrieve SKU ID from EC BUG=b:186264627 BRANCH=none TEST=build herobrine Signed-off-by: Philip Chen Change-Id: Id3faf7af64c0129ec646a01085adc43b561225d2 Reviewed-on: https://review.coreboot.org/c/coreboot/+/56354 Tested-by: build bot (Jenkins) Reviewed-by: Shelley Chen --- src/mainboard/google/herobrine/Kconfig | 1 + src/mainboard/google/herobrine/Makefile.inc | 2 +- src/mainboard/google/herobrine/boardid.c | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/google/herobrine/Kconfig b/src/mainboard/google/herobrine/Kconfig index 7f88b94f5cc5..38bb3287534a 100644 --- a/src/mainboard/google/herobrine/Kconfig +++ b/src/mainboard/google/herobrine/Kconfig @@ -9,6 +9,7 @@ config BOARD_SPECIFIC_OPTIONS select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC if !BOARD_GOOGLE_SENOR select EC_GOOGLE_CHROMEEC_RTC if !BOARD_GOOGLE_SENOR + select EC_GOOGLE_CHROMEEC_SKUID if !BOARD_GOOGLE_SENOR select EC_GOOGLE_CHROMEEC_SPI if !BOARD_GOOGLE_SENOR select RTC if !BOARD_GOOGLE_SENOR select MISSING_BOARD_RESET if BOARD_GOOGLE_SENOR diff --git a/src/mainboard/google/herobrine/Makefile.inc b/src/mainboard/google/herobrine/Makefile.inc index 11a396ff0493..a80779946d54 100644 --- a/src/mainboard/google/herobrine/Makefile.inc +++ b/src/mainboard/google/herobrine/Makefile.inc @@ -1,8 +1,8 @@ ## SPDX-License-Identifier: GPL-2.0-only -all-y += boardid.c all-y += chromeos.c ifneq ($(CONFIG_BOARD_GOOGLE_SENOR),y) +all-y += boardid.c all-y += reset.c endif bootblock-y += bootblock.c diff --git a/src/mainboard/google/herobrine/boardid.c b/src/mainboard/google/herobrine/boardid.c index eecbeab087ec..6368d25157c3 100644 --- a/src/mainboard/google/herobrine/boardid.c +++ b/src/mainboard/google/herobrine/boardid.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include +#include #include uint32_t board_id(void) @@ -19,7 +20,5 @@ uint32_t ram_code(void) uint32_t sku_id(void) { - static uint32_t id = UNDEFINED_STRAPPING_ID; - - return id; + return google_chromeec_get_board_sku(); } -- cgit v1.2.3