2 files changed, 52 insertions, 5 deletions
diff --git a/config/coreboot/gru_bob/config/libgfxinit_corebootfb b/config/coreboot/gru_bob/config/libgfxinit_corebootfb
index fe3976b4..7e60316c 100644
--- a/config/coreboot/gru_bob/config/libgfxinit_corebootfb
+++ b/config/coreboot/gru_bob/config/libgfxinit_corebootfb
@@ -164,11 +164,22 @@ CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_BOARD_GOOGLE_ZAKO is not set
 
 #
+# Bluey
+#
+# CONFIG_BOARD_GOOGLE_BLUEY is not set
+# CONFIG_BOARD_GOOGLE_QUENBI is not set
+# CONFIG_BOARD_GOOGLE_BLUEYH is not set
+# CONFIG_BOARD_GOOGLE_QUENBIH is not set
+# CONFIG_BOARD_GOOGLE_QUARTZ is not set
+
+#
 # Brox
 #
 # CONFIG_BOARD_GOOGLE_BROX is not set
+# CONFIG_BOARD_GOOGLE_BROX_RTK_EC is not set
 # CONFIG_BOARD_GOOGLE_BROX_EC_ISH is not set
 # CONFIG_BOARD_GOOGLE_BROX_TI_PDC is not set
+# CONFIG_BOARD_GOOGLE_CABOC is not set
 # CONFIG_BOARD_GOOGLE_GREENBAYUPOC is not set
 # CONFIG_BOARD_GOOGLE_JUBILANT is not set
 # CONFIG_BOARD_GOOGLE_LOTSO is not set
@@ -201,6 +212,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_BOARD_GOOGLE_GUREN is not set
 # CONFIG_BOARD_GOOGLE_HADES is not set
 # CONFIG_BOARD_GOOGLE_KANO is not set
+# CONFIG_BOARD_GOOGLE_KALADIN is not set
 # CONFIG_BOARD_GOOGLE_KINOX is not set
 # CONFIG_BOARD_GOOGLE_KULDAX is not set
 # CONFIG_BOARD_GOOGLE_JOXER is not set
@@ -248,9 +260,12 @@ CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_BOARD_GOOGLE_SUNDANCE is not set
 # CONFIG_BOARD_GOOGLE_PUJJOGA is not set
 # CONFIG_BOARD_GOOGLE_PUJJOGATWIN is not set
+# CONFIG_BOARD_GOOGLE_PUJJOLO is not set
 # CONFIG_BOARD_GOOGLE_ORISA is not set
 # CONFIG_BOARD_GOOGLE_TELITH is not set
 # CONFIG_BOARD_GOOGLE_MELIKS is not set
+# CONFIG_BOARD_GOOGLE_EPIC is not set
+# CONFIG_BOARD_GOOGLE_PUJJOCENTO is not set
 
 #
 # Butterfly
@@ -361,12 +376,20 @@ CONFIG_SPI_FLASH_WINBOND=y
 # Fatcat
 #
 # CONFIG_BOARD_GOOGLE_FATCAT is not set
+# CONFIG_BOARD_GOOGLE_FATCAT4ES is not set
 # CONFIG_BOARD_GOOGLE_FATCATISH is not set
 # CONFIG_BOARD_GOOGLE_FATCATITE is not set
+# CONFIG_BOARD_GOOGLE_FATCATITE4ES is not set
 # CONFIG_BOARD_GOOGLE_FATCATNUVO is not set
+# CONFIG_BOARD_GOOGLE_FATCATNUVO4ES is not set
 # CONFIG_BOARD_GOOGLE_FELINO is not set
+# CONFIG_BOARD_GOOGLE_FELINO4ES is not set
 # CONFIG_BOARD_GOOGLE_FRANCKA is not set
+# CONFIG_BOARD_GOOGLE_KINMEN4ES is not set
 # CONFIG_BOARD_GOOGLE_KINMEN is not set
+# CONFIG_BOARD_GOOGLE_LAPIS is not set
+# CONFIG_BOARD_GOOGLE_MOONSTONE is not set
+# CONFIG_BOARD_GOOGLE_RUBY is not set
 
 #
 # Fizz
@@ -533,7 +556,16 @@ CONFIG_BOARD_GOOGLE_BOB=y
 #
 # Ocelot
 #
+# CONFIG_BOARD_GOOGLE_KODKOD is not set
+# CONFIG_BOARD_GOOGLE_MATSU is not set
 # CONFIG_BOARD_GOOGLE_OCELOT is not set
+# CONFIG_BOARD_GOOGLE_OCELOTITE is not set
+# CONFIG_BOARD_GOOGLE_OCELOTMCHP is not set
+# CONFIG_BOARD_GOOGLE_OJAL is not set
+# CONFIG_BOARD_GOOGLE_OCELOT4ES is not set
+# CONFIG_BOARD_GOOGLE_OCELOTITE4ES is not set
+# CONFIG_BOARD_GOOGLE_OCELOTMCHP4ES is not set
+# CONFIG_BOARD_GOOGLE_OCICAT is not set
 
 #
 # Octopus
@@ -617,6 +649,7 @@ CONFIG_BOARD_GOOGLE_BOB=y
 # CONFIG_BOARD_GOOGLE_HYLIA is not set
 # CONFIG_BOARD_GOOGLE_NAVI is not set
 # CONFIG_BOARD_GOOGLE_RAURU is not set
+# CONFIG_BOARD_GOOGLE_SAPPHIRE is not set
 
 #
 # Reef
@@ -663,7 +696,15 @@ CONFIG_BOARD_GOOGLE_BOB=y
 #
 # Skywalker
 #
+# CONFIG_BOARD_GOOGLE_ANAKIN is not set
+# CONFIG_BOARD_GOOGLE_BAZE is not set
+# CONFIG_BOARD_GOOGLE_DOOKU is not set
+# CONFIG_BOARD_GOOGLE_GROGU is not set
+# CONFIG_BOARD_GOOGLE_OBIWAN is not set
+# CONFIG_BOARD_GOOGLE_PADME is not set
 # CONFIG_BOARD_GOOGLE_SKYWALKER is not set
+# CONFIG_BOARD_GOOGLE_TARKIN is not set
+# CONFIG_BOARD_GOOGLE_YODA is not set
 
 #
 # Slippy
@@ -779,11 +820,10 @@ CONFIG_TTYS0_BAUD=115200
 CONFIG_D3COLD_SUPPORT=y
 CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
 CONFIG_HEAP_SIZE=0x100000
-CONFIG_EC_GPE_SCI=0x50
+CONFIG_EC_GPE_SCI=0x6e
 CONFIG_EC_STARLABS_BATTERY_MODEL="Unknown"
 CONFIG_EC_STARLABS_BATTERY_TYPE="LION"
 CONFIG_EC_STARLABS_BATTERY_OEM="Unknown"
-CONFIG_DRIVER_TPM_SPI_CHIP=0
 # CONFIG_TPM_MEASURED_BOOT is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -819,11 +859,12 @@ CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
 CONFIG_INTEL_GMA_BCLV_WIDTH=16
 CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 CONFIG_INTEL_GMA_BCLM_WIDTH=16
+CONFIG_CBFS_CACHE_ALIGN=8
 CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION=y
 CONFIG_GENERIC_UDELAY=y
+CONFIG_UART_BITBANG_TX_DELAY_MS=5
 CONFIG_SOC_ROCKCHIP_RK3399=y
 CONFIG_RK3399_SPREAD_SPECTRUM_DDR=y
-CONFIG_CBFS_CACHE_ALIGN=8
 
 #
 # CPU
@@ -854,6 +895,9 @@ CONFIG_EC_GOOGLE_CHROMEEC_RTC=y
 # CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL is not set
 # CONFIG_EC_GOOGLE_CHROMEEC_AUTO_FAN_CTRL is not set
 CONFIG_EC_GOOGLE_CHROMEEC_READ_BATTERY_LONG_STRING=y
+CONFIG_EC_GOOGLE_CHROMEEC_LPC_GENERIC_MEMORY_BASE=0xfe0b0000
+CONFIG_EC_GOOGLE_CHROMEEC_LPC_GENERIC_MEMORY_SIZE=0x10000
+# CONFIG_EC_STARLABS_MERLIN is not set
 CONFIG_MAINBOARD_HAS_CHROMEOS=y
 
 #
@@ -862,7 +906,6 @@ CONFIG_MAINBOARD_HAS_CHROMEOS=y
 # end of ChromeOS
 
 CONFIG_ACPI_FNKEY_GEN_SCANCODE=0
-# CONFIG_GOOGLE_PVMFW_CBMEM is not set
 CONFIG_ARCH_ARM64=y
 CONFIG_ARCH_BOOTBLOCK_ARM64=y
 CONFIG_ARCH_VERSTAGE_ARM64=y
@@ -903,7 +946,10 @@ CONFIG_RESOURCE_ALLOCATION_TOP_DOWN=y
 # Generic Drivers
 #
 CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
+# CONFIG_DRIVERS_EFI_VARIABLE_STORE is not set
+# CONFIG_DRIVERS_EFI_FW_INFO is not set
 # CONFIG_ELOG is not set
+# CONFIG_DRIVERS_HWID_DMI is not set
 # CONFIG_DRIVERS_OPTION_CFR is not set
 CONFIG_COMMON_CBFS_SPI_WRAPPER=y
 CONFIG_SPI_FLASH=y
@@ -923,6 +969,7 @@ CONFIG_DRIVERS_UART_8250MEM_32=y
 # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
 CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
 CONFIG_SPI_TPM=y
+CONFIG_DRIVER_TPM_SPI_CHIP=0
 # end of Generic Drivers
 
 #
diff --git a/config/coreboot/gru_bob/target.cfg b/config/coreboot/gru_bob/target.cfg
index e5866cb7..dda11b5f 100644
--- a/config/coreboot/gru_bob/target.cfg
+++ b/config/coreboot/gru_bob/target.cfg
@@ -2,5 +2,5 @@
 
 tree="default"
 xarch="aarch64-elf arm-eabi"
-payload_uboot="y"
+payload_uboot="arm64"
 build_depend="u-boot/gru_bob"