From 3696fea4e064ddeb301d33ec0086ac6646c7507c Mon Sep 17 00:00:00 2001 From: Nick Vaccaro Date: Wed, 11 Jun 2025 13:05:22 -0700 Subject: [PATCH] mb/google/ocelot: add BOARD_GOOGLE_OCELOTMCHP Ocelotmchp is the same as the ocelot variant except that it uses the Microchip EC. BUG=b:419857124 BRANCH=none TEST=`emerge-ocelot coreboot` and verify it builds without error. Change-Id: I9088a57289d9ef489a7773a8d828d5f945440757 Signed-off-by: Nick Vaccaro Reviewed-on: https://review.coreboot.org/c/coreboot/+/88060 Reviewed-by: Pranava Y N Tested-by: build bot (Jenkins) --- src/mainboard/google/ocelot/Kconfig | 7 ++++++- src/mainboard/google/ocelot/Kconfig.name | 3 +++ .../variants/baseboard/ocelot/include/baseboard/gpio.h | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/mainboard/google/ocelot/Kconfig b/src/mainboard/google/ocelot/Kconfig index e87eaaef00..582084ee83 100644 --- a/src/mainboard/google/ocelot/Kconfig +++ b/src/mainboard/google/ocelot/Kconfig @@ -70,6 +70,9 @@ config BOARD_GOOGLE_OCELOT config BOARD_GOOGLE_OCELOTITE select BOARD_GOOGLE_MODEL_OCELOT +config BOARD_GOOGLE_OCELOTMCHP + select BOARD_GOOGLE_MODEL_OCELOT + if BOARD_GOOGLE_OCELOT_COMMON config BASEBOARD_DIR @@ -118,6 +121,7 @@ config MAINBOARD_FAMILY config MAINBOARD_PART_NUMBER default "Ocelot" if BOARD_GOOGLE_OCELOT default "Ocelotite" if BOARD_GOOGLE_OCELOTITE + default "Ocelotmchp" if BOARD_GOOGLE_OCELOTMCHP config MEMORY_SOLDERDOWN def_bool n @@ -139,7 +143,8 @@ config VARIANT_DIR string default "ocelot" if \ BOARD_GOOGLE_OCELOT || \ - BOARD_GOOGLE_OCELOTITE + BOARD_GOOGLE_OCELOTITE || \ + BOARD_GOOGLE_OCELOTMCHP config OVERRIDE_DEVICETREE default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" diff --git a/src/mainboard/google/ocelot/Kconfig.name b/src/mainboard/google/ocelot/Kconfig.name index 8c025619fe..3be6f46017 100644 --- a/src/mainboard/google/ocelot/Kconfig.name +++ b/src/mainboard/google/ocelot/Kconfig.name @@ -7,3 +7,6 @@ config BOARD_GOOGLE_OCELOT config BOARD_GOOGLE_OCELOTITE bool "-> Ocelotite" + +config BOARD_GOOGLE_OCELOTMCHP + bool "-> Ocelotmchp" diff --git a/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h b/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h index 126b2a764d..6a43d70708 100644 --- a/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h +++ b/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h @@ -13,7 +13,9 @@ * GPIO_PCH_WP - WP signal to PCH */ //TODO for Nuvo: #define EC_SYNC_IRQ GPP_E07_IRQ -#if CONFIG(BOARD_GOOGLE_OCELOT) || CONFIG(BOARD_GOOGLE_OCELOTITE) +#if CONFIG(BOARD_GOOGLE_OCELOT) || \ + CONFIG(BOARD_GOOGLE_OCELOTITE) || \ + CONFIG(BOARD_GOOGLE_OCELOTMCHP) #define EC_SYNC_IRQ 0 /* Not Connected */ #endif #define GPIO_PCH_WP GPP_D02