erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mb/google/ocelot: convert variants for use with ES silicon

Browse source 
The Ocelot variants must support ES silicon as well as QS silicon.  This
CL changes ocelot to ocelot4es, changes ocelotite to ocelotite4es, and
changes ocelotmchp to ocelotmchp4es.

BUG=b:425397790
TEST=`emerge-ocelot` and verify it builds without errors.

Change-Id: Iac0700688e7f616477bf462c5734a70110f9d6d7
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/88134
Reviewed-by: Avi Uday <aviuday@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nick Vaccaro 2025-06-17 14:35:59 -07:00
commit 056405a10d
3 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/mainboard/google/ocelot/Kconfig
View file

@ -73,6 +73,15 @@ config BOARD_GOOGLE_OCELOTITE
config BOARD_GOOGLE_OCELOTMCHP
select BOARD_GOOGLE_MODEL_OCELOT
config BOARD_GOOGLE_OCELOT4ES
select BOARD_GOOGLE_MODEL_OCELOT
config BOARD_GOOGLE_OCELOTITE4ES
select BOARD_GOOGLE_MODEL_OCELOT
config BOARD_GOOGLE_OCELOTMCHP4ES
select BOARD_GOOGLE_MODEL_OCELOT
if BOARD_GOOGLE_OCELOT_COMMON
config BASEBOARD_DIR
@ -120,6 +129,9 @@ config MAINBOARD_FAMILY
config MAINBOARD_PART_NUMBER
default "Ocelot" if BOARD_GOOGLE_OCELOT
default "Ocelot4ES" if BOARD_GOOGLE_OCELOT4ES
default "Ocelotite4ES" if BOARD_GOOGLE_OCELOTITE4ES
default "Ocelotmchp4ES" if BOARD_GOOGLE_OCELOTMCHP4ES
default "Ocelotite" if BOARD_GOOGLE_OCELOTITE
default "Ocelotmchp" if BOARD_GOOGLE_OCELOTMCHP
@ -141,10 +153,7 @@ config USE_PM_ACPI_TIMER
config VARIANT_DIR
string
default "ocelot" if \
BOARD_GOOGLE_OCELOT || \
BOARD_GOOGLE_OCELOTITE || \
BOARD_GOOGLE_OCELOTMCHP
default "ocelot" if BOARD_GOOGLE_MODEL_OCELOT
config OVERRIDE_DEVICETREE
default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"

9
src/mainboard/google/ocelot/Kconfig.name
View file

@ -10,3 +10,12 @@ config BOARD_GOOGLE_OCELOTITE
config BOARD_GOOGLE_OCELOTMCHP
bool "-> Ocelotmchp"
config BOARD_GOOGLE_OCELOT4ES
bool "-> Ocelot4ES"
config BOARD_GOOGLE_OCELOTITE4ES
bool "-> Ocelotite4ES"
config BOARD_GOOGLE_OCELOTMCHP4ES
bool "-> Ocelotmchp4ES"

4
src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h
View file

@ -13,9 +13,7 @@
* 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) || \
CONFIG(BOARD_GOOGLE_OCELOTMCHP)
#if CONFIG(BOARD_GOOGLE_MODEL_OCELOT)
#define EC_SYNC_IRQ 0 /* Not Connected */
#endif
#define GPIO_PCH_WP GPP_D02