diff options
| -rw-r--r-- | config/coreboot/cros/patches/0001-fix-crossgcc-build-error.patch | 55 | ||||
| -rw-r--r-- | config/coreboot/cros/patches/0002-Remove-warning-for-coreboot-images-built-without-a-p.patch | 38 | ||||
| -rw-r--r-- | config/coreboot/cros/patches/0004-crossgcc-cros-also-fix-acpica-downloads-here.patch | 31 | ||||
| -rw-r--r-- | config/coreboot/cros/target.cfg | 4 | ||||
| -rw-r--r-- | config/coreboot/default/patches/0023-HACK-Disable-coreboot-related-BL31-features.patch (renamed from config/coreboot/cros/patches/0003-HACK-Disable-coreboot-related-BL31-features.patch) | 0 | ||||
| -rw-r--r-- | config/coreboot/gru_bob/config/libgfxinit_corebootfb | 205 | ||||
| -rw-r--r-- | config/coreboot/gru_bob/target.cfg | 2 | ||||
| -rw-r--r-- | config/coreboot/gru_kevin/config/libgfxinit_corebootfb | 201 | ||||
| -rw-r--r-- | config/coreboot/gru_kevin/target.cfg | 2 | ||||
| -rwxr-xr-x | script/update/project/trees | 4 | 
10 files changed, 280 insertions, 262 deletions
diff --git a/config/coreboot/cros/patches/0001-fix-crossgcc-build-error.patch b/config/coreboot/cros/patches/0001-fix-crossgcc-build-error.patch deleted file mode 100644 index 34a60be0..00000000 --- a/config/coreboot/cros/patches/0001-fix-crossgcc-build-error.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0d5a5f3ee1ee5d6f757d5877b7adbe9839487ccf Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Sat, 19 Nov 2022 14:55:01 +0000 -Subject: [PATCH 1/1] fix crossgcc build error - ---- - util/crossgcc/patches/gcc-11.2.0_gnat.patch | 32 ++++++++++++++++++++- - 1 file changed, 31 insertions(+), 1 deletion(-) - -diff --git a/util/crossgcc/patches/gcc-11.2.0_gnat.patch b/util/crossgcc/patches/gcc-11.2.0_gnat.patch -index 2d7cecee24..c22cec45d0 100644 ---- a/util/crossgcc/patches/gcc-11.2.0_gnat.patch -+++ b/util/crossgcc/patches/gcc-11.2.0_gnat.patch -@@ -5,7 +5,37 @@ -   -  # Extra flags to pass to recursive makes. - -COMMON_ADAFLAGS= -gnatpg --+COMMON_ADAFLAGS= -gnatpg -gnatwGUR -++COMMON_ADAFLAGS= -gnatpg -gnatwn -  ifeq ($(TREECHECKING),) -  CHECKING_ADAFLAGS= -  else -+diff -Nurp gcc-11.2.0/gcc/ada/gcc-interface/Make-lang.in gcc-11.2.0.new/gcc/ada/gcc-interface/Make-lang.in -+--- gcc-11.2.0/gcc/ada/gcc-interface/Make-lang.in	2022-06-03 00:31:57.993273717 +0200 -++++ gcc-11.2.0.new/gcc/ada/gcc-interface/Make-lang.in	2022-06-03 00:30:50.214166847 +0200 -+@@ -334,6 +334,7 @@ GNAT_ADA_OBJS =	\ -+  ada/hostparm.o	\ -+  ada/impunit.o	\ -+  ada/inline.o	\ -++ ada/libgnat/i-c.o	\ -+  ada/libgnat/interfac.o	\ -+  ada/itypes.o	\ -+  ada/krunch.o	\ -+@@ -364,7 +365,10 @@ GNAT_ADA_OBJS =	\ -+  ada/rtsfind.o	\ -+  ada/libgnat/s-addope.o	\ -+  ada/libgnat/s-addima.o \ -++ ada/libgnat/s-aotase.o	\ -+  ada/libgnat/s-assert.o	\ -++ ada/libgnat/s-atoope.o	\ -++ ada/libgnat/s-atopri.o	\ -+  ada/libgnat/s-bitops.o	\ -+  ada/libgnat/s-carun8.o	\ -+  ada/libgnat/s-casuti.o	\ -+@@ -548,6 +552,7 @@ GNATBIND_OBJS = \ -+  ada/hostparm.o   \ -+  ada/init.o       \ -+  ada/initialize.o \ -++ ada/libgnat/i-c.o        \ -+  ada/libgnat/interfac.o   \ -+  ada/krunch.o     \ -+  ada/lib.o        \ ---  -2.25.1 - diff --git a/config/coreboot/cros/patches/0002-Remove-warning-for-coreboot-images-built-without-a-p.patch b/config/coreboot/cros/patches/0002-Remove-warning-for-coreboot-images-built-without-a-p.patch deleted file mode 100644 index 547c6392..00000000 --- a/config/coreboot/cros/patches/0002-Remove-warning-for-coreboot-images-built-without-a-p.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1ce4f118b024a6367382b46016781f30fe622e3e Mon Sep 17 00:00:00 2001 -From: Nicholas Chin <nic.c3.14@gmail.com> -Date: Fri, 12 May 2023 19:55:15 -0600 -Subject: [PATCH] Remove warning for coreboot images built without a payload - -I added this in upstream to prevent people from accidentally flashing -roms without a payload resulting in a no boot situation, but in -libreboot lbmk handles the payload and thus this warning always comes -up. This has caused confusion and concern so just patch it out. ---- - payloads/Makefile.inc | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - -diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc -index e735443a76..4f1692a873 100644 ---- a/payloads/Makefile.inc -+++ b/payloads/Makefile.inc -@@ -49,16 +49,5 @@ distclean-payloads: - print-repo-info-payloads: - 	-$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; ) -  --ifeq ($(CONFIG_PAYLOAD_NONE),y) --files_added:: warn_no_payload --endif -- --warn_no_payload: --	printf "\n\t** WARNING **\n" --	printf "coreboot has been built without a payload. Writing\n" --	printf "a coreboot image without a payload to your board's\n" --	printf "flash chip will result in a non-booting system. You\n" --	printf "can use cbfstool to add a payload to the image.\n\n" -- - .PHONY: force-payload coreinfo nvramcui --.PHONY: clean-payloads distclean-payloads print-repo-info-payloads warn_no_payload -+.PHONY: clean-payloads distclean-payloads print-repo-info-payloads ---  -2.40.1 - diff --git a/config/coreboot/cros/patches/0004-crossgcc-cros-also-fix-acpica-downloads-here.patch b/config/coreboot/cros/patches/0004-crossgcc-cros-also-fix-acpica-downloads-here.patch deleted file mode 100644 index 9f78f31f..00000000 --- a/config/coreboot/cros/patches/0004-crossgcc-cros-also-fix-acpica-downloads-here.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a7fb02b80bc4ddae00ce7578054eb35d5c06b57b Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Sun, 16 Jul 2023 02:25:23 +0100 -Subject: [PATCH 1/1] crossgcc/cros: also fix acpica downloads here - -my last revision said in libreboot/gnuboot it was -only broken in fam15h boards, but the fix is needed -here too. i've already put the correct tarball on -libreboot rsync, for this purpose - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - util/crossgcc/buildgcc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc -index b25b260807..327297cea3 100755 ---- a/util/crossgcc/buildgcc -+++ b/util/crossgcc/buildgcc -@@ -52,7 +52,7 @@ MPFR_ARCHIVE="https://ftpmirror.gnu.org/mpfr/mpfr-${MPFR_VERSION}.tar.xz" - MPC_ARCHIVE="https://ftpmirror.gnu.org/mpc/mpc-${MPC_VERSION}.tar.gz" - GCC_ARCHIVE="https://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz" - BINUTILS_ARCHIVE="https://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}.tar.xz" --IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz" -+IASL_ARCHIVE="https://mirror.math.princeton.edu/pub/libreboot/misc/acpica/acpica-unix2-${IASL_VERSION}.tar.gz" - # CLANG toolchain archive locations - LLVM_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/llvm-${CLANG_VERSION}.src.tar.xz" - CLANG_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-${CLANG_VERSION}.src.tar.xz" ---  -2.40.1 - diff --git a/config/coreboot/cros/target.cfg b/config/coreboot/cros/target.cfg deleted file mode 100644 index a595ce7e..00000000 --- a/config/coreboot/cros/target.cfg +++ /dev/null @@ -1,4 +0,0 @@ -tree="cros" -arch="spaghettimonster" -rev="8da4bfe5b573f395057fbfb5a9d99b376e25c2a4" # 4.17 -romtype="normal" diff --git a/config/coreboot/cros/patches/0003-HACK-Disable-coreboot-related-BL31-features.patch b/config/coreboot/default/patches/0023-HACK-Disable-coreboot-related-BL31-features.patch index d179a05a..d179a05a 100644 --- a/config/coreboot/cros/patches/0003-HACK-Disable-coreboot-related-BL31-features.patch +++ b/config/coreboot/default/patches/0023-HACK-Disable-coreboot-related-BL31-features.patch diff --git a/config/coreboot/gru_bob/config/libgfxinit_corebootfb b/config/coreboot/gru_bob/config/libgfxinit_corebootfb index d6198c27..7990fb0c 100644 --- a/config/coreboot/gru_bob/config/libgfxinit_corebootfb +++ b/config/coreboot/gru_bob/config/libgfxinit_corebootfb @@ -13,10 +13,12 @@ CONFIG_COMPILER_GCC=y  # CONFIG_ALLOW_EXPERIMENTAL_CLANG is not set  # CONFIG_ANY_TOOLCHAIN is not set  # CONFIG_CCACHE is not set +# CONFIG_IWYU is not set  # CONFIG_FMD_GENPARSER is not set  # CONFIG_UTIL_GENPARSER is not set  CONFIG_OPTION_BACKEND_NONE=y -CONFIG_COMPRESS_RAMSTAGE=y +CONFIG_COMPRESS_RAMSTAGE_LZMA=y +# CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set  CONFIG_COMPRESS_PRERAM_STAGES=y  CONFIG_COMPRESS_BOOTBLOCK=y  CONFIG_INCLUDE_CONFIG_FILE=y @@ -30,6 +32,12 @@ CONFIG_NO_STAGE_CACHE=y  # CONFIG_UPDATE_IMAGE is not set  # CONFIG_BOOTSPLASH_IMAGE is not set  # CONFIG_FW_CONFIG is not set + +# +# Software Bill Of Materials (SBOM) +# +# CONFIG_SBOM is not set +# end of Software Bill Of Materials (SBOM)  # end of General setup  # @@ -47,30 +55,28 @@ CONFIG_NO_STAGE_CACHE=y  # CONFIG_VENDOR_APPLE is not set  # CONFIG_VENDOR_ASROCK is not set  # CONFIG_VENDOR_ASUS is not set -# CONFIG_VENDOR_BAP is not set  # CONFIG_VENDOR_BIOSTAR is not set  # CONFIG_VENDOR_BOSTENTECH is not set +# CONFIG_VENDOR_BYTEDANCE is not set  # CONFIG_VENDOR_CAVIUM is not set  # CONFIG_VENDOR_CLEVO is not set  # CONFIG_VENDOR_COMPULAB is not set  # CONFIG_VENDOR_DELL is not set -# CONFIG_VENDOR_ELMEX is not set  # CONFIG_VENDOR_EMULATION is not set  # CONFIG_VENDOR_EXAMPLE is not set  # CONFIG_VENDOR_FACEBOOK is not set  # CONFIG_VENDOR_FOXCONN is not set  # CONFIG_VENDOR_GETAC is not set  # CONFIG_VENDOR_GIGABYTE is not set -# CONFIG_VENDOR_GIZMOSPHERE is not set  CONFIG_VENDOR_GOOGLE=y  # CONFIG_VENDOR_HP is not set  # CONFIG_VENDOR_IBASE is not set +# CONFIG_VENDOR_IBM is not set  # CONFIG_VENDOR_INTEL is not set -# CONFIG_VENDOR_JETWAY is not set +# CONFIG_VENDOR_INVENTEC is not set  # CONFIG_VENDOR_KONTRON is not set  # CONFIG_VENDOR_LENOVO is not set  # CONFIG_VENDOR_LIBRETREND is not set -# CONFIG_VENDOR_LIPPERT is not set  # CONFIG_VENDOR_MSI is not set  # CONFIG_VENDOR_OCP is not set  # CONFIG_VENDOR_OPENCELLULAR is not set @@ -85,7 +91,6 @@ CONFIG_VENDOR_GOOGLE=y  # CONFIG_VENDOR_RODA is not set  # CONFIG_VENDOR_SAMSUNG is not set  # CONFIG_VENDOR_SAPPHIRE is not set -# CONFIG_VENDOR_SCALEWAY is not set  # CONFIG_VENDOR_SIEMENS is not set  # CONFIG_VENDOR_SIFIVE is not set  # CONFIG_VENDOR_STARLABS is not set @@ -106,14 +111,15 @@ CONFIG_CONSOLE_SERIAL=y  CONFIG_MAX_CPUS=1  CONFIG_POST_DEVICE=y  CONFIG_UART_FOR_CONSOLE=0 +CONFIG_DEVICETREE="devicetree.cb"  # CONFIG_VBOOT is not set  # CONFIG_CHROMEOS is not set -CONFIG_DEVICETREE="devicetree.cb"  CONFIG_OVERRIDE_DEVICETREE=""  CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=1  CONFIG_CONSOLE_SERIAL_UART_ADDRESS=0xFF1A0000  # CONFIG_CONSOLE_POST is not set  CONFIG_MEMLAYOUT_LD_FILE="src/soc/rockchip/rk3399/memlayout.ld" +CONFIG_MAX_ACPI_TABLE_SIZE_KB=144  CONFIG_SPI_FLASH_WINBOND=y  # @@ -148,33 +154,54 @@ CONFIG_SPI_FLASH_WINBOND=y  # CONFIG_BOARD_GOOGLE_AGAH is not set  # CONFIG_BOARD_GOOGLE_ANAHERA is not set  # CONFIG_BOARD_GOOGLE_ANAHERA4ES is not set +# CONFIG_BOARD_GOOGLE_AURASH is not set +# CONFIG_BOARD_GOOGLE_BANSHEE is not set  # CONFIG_BOARD_GOOGLE_BRASK is not set  # CONFIG_BOARD_GOOGLE_BRYA0 is not set -# CONFIG_BOARD_GOOGLE_BRYA4ES is not set +# CONFIG_BOARD_GOOGLE_CRAASK is not set +# CONFIG_BOARD_GOOGLE_CRAASKOV is not set +# CONFIG_BOARD_GOOGLE_CONSTITUTION is not set +# CONFIG_BOARD_GOOGLE_CROTA is not set  # CONFIG_BOARD_GOOGLE_FELWINTER is not set +# CONFIG_BOARD_GOOGLE_GAELIN is not set  # CONFIG_BOARD_GOOGLE_GIMBLE is not set  # CONFIG_BOARD_GOOGLE_GIMBLE4ES is not set +# CONFIG_BOARD_GOOGLE_GLADIOS is not set +# CONFIG_BOARD_GOOGLE_GOTHRAX is not set +# CONFIG_BOARD_GOOGLE_HADES is not set  # CONFIG_BOARD_GOOGLE_KANO is not set +# CONFIG_BOARD_GOOGLE_KINOX is not set +# CONFIG_BOARD_GOOGLE_KULDAX is not set +# CONFIG_BOARD_GOOGLE_JOXER is not set +# CONFIG_BOARD_GOOGLE_LISBON is not set +# CONFIG_BOARD_GOOGLE_MARASOV is not set +# CONFIG_BOARD_GOOGLE_MITHRAX is not set +# CONFIG_BOARD_GOOGLE_MOLI is not set  # CONFIG_BOARD_GOOGLE_NIVVIKS is not set  # CONFIG_BOARD_GOOGLE_NEREID is not set +# CONFIG_BOARD_GOOGLE_OMNIGUL is not set +# CONFIG_BOARD_GOOGLE_OSIRIS is not set +# CONFIG_BOARD_GOOGLE_PIRRHA is not set  # CONFIG_BOARD_GOOGLE_PRIMUS is not set  # CONFIG_BOARD_GOOGLE_PRIMUS4ES is not set +# CONFIG_BOARD_GOOGLE_PUJJO is not set +# CONFIG_BOARD_GOOGLE_QUANDISO is not set  # CONFIG_BOARD_GOOGLE_REDRIX is not set  # CONFIG_BOARD_GOOGLE_REDRIX4ES is not set +# CONFIG_BOARD_GOOGLE_SKOLAS is not set  # CONFIG_BOARD_GOOGLE_SKOLAS4ES is not set  # CONFIG_BOARD_GOOGLE_TAEKO is not set  # CONFIG_BOARD_GOOGLE_TAEKO4ES is not set  # CONFIG_BOARD_GOOGLE_TANIKS is not set +# CONFIG_BOARD_GOOGLE_ULDREN is not set  # CONFIG_BOARD_GOOGLE_VELL is not set  # CONFIG_BOARD_GOOGLE_VOLMAR is not set -# CONFIG_BOARD_GOOGLE_BANSHEE is not set -# CONFIG_BOARD_GOOGLE_CROTA is not set -# CONFIG_BOARD_GOOGLE_MOLI is not set -# CONFIG_BOARD_GOOGLE_KINOX is not set -# CONFIG_BOARD_GOOGLE_CRAASK is not set -# CONFIG_BOARD_GOOGLE_OSIRIS is not set -# CONFIG_BOARD_GOOGLE_MITHRAX is not set -# CONFIG_BOARD_GOOGLE_KULDAX is not set +# CONFIG_BOARD_GOOGLE_XIVU is not set +# CONFIG_BOARD_GOOGLE_YAVIKS is not set +# CONFIG_BOARD_GOOGLE_YAVILLA is not set +# CONFIG_BOARD_GOOGLE_ZYDRON is not set +# CONFIG_BOARD_GOOGLE_NOKRIS is not set +# CONFIG_BOARD_GOOGLE_DOCHI is not set  #  # Butterfly @@ -193,11 +220,20 @@ CONFIG_SPI_FLASH_WINBOND=y  #  # CONFIG_BOARD_GOOGLE_KINGLER is not set  # CONFIG_BOARD_GOOGLE_STEELIX is not set +# CONFIG_BOARD_GOOGLE_VOLTORB is not set +# CONFIG_BOARD_GOOGLE_PONYTA is not set  #  # Krabby  #  # CONFIG_BOARD_GOOGLE_KRABBY is not set +# CONFIG_BOARD_GOOGLE_TENTACRUEL is not set +# CONFIG_BOARD_GOOGLE_MAGIKARP is not set + +# +# Staryu +# +# CONFIG_BOARD_GOOGLE_STARMIE is not set  #  # Cyan @@ -223,6 +259,7 @@ CONFIG_SPI_FLASH_WINBOND=y  # Dedede  #  # CONFIG_BOARD_GOOGLE_BOTEN is not set +# CONFIG_BOARD_GOOGLE_DIBBI is not set  # CONFIG_BOARD_GOOGLE_DEDEDE is not set  # CONFIG_BOARD_GOOGLE_DRAWCIA is not set  # CONFIG_BOARD_GOOGLE_HABOKI is not set @@ -247,6 +284,10 @@ CONFIG_SPI_FLASH_WINBOND=y  # CONFIG_BOARD_GOOGLE_DRIBLEE is not set  # CONFIG_BOARD_GOOGLE_GOOEY is not set  # CONFIG_BOARD_GOOGLE_BEADRIX is not set +# CONFIG_BOARD_GOOGLE_SHOTZO is not set +# CONFIG_BOARD_GOOGLE_TARANZA is not set +# CONFIG_BOARD_GOOGLE_BOXY is not set +# CONFIG_BOARD_GOOGLE_DEXI is not set  #  # Drallion @@ -276,6 +317,11 @@ CONFIG_SPI_FLASH_WINBOND=y  # CONFIG_BOARD_GOOGLE_GALE is not set  # +# Geralt +# +# CONFIG_BOARD_GOOGLE_GERALT is not set + +#  # Glados  #  # CONFIG_BOARD_GOOGLE_ASUKA is not set @@ -307,29 +353,16 @@ CONFIG_BOARD_GOOGLE_BOB=y  # Hatch  #  # CONFIG_BOARD_GOOGLE_AKEMI is not set -# CONFIG_BOARD_GOOGLE_AMBASSADOR is not set -# CONFIG_BOARD_GOOGLE_DOOLY is not set  # CONFIG_BOARD_GOOGLE_DRATINI is not set -# CONFIG_BOARD_GOOGLE_DUFFY_LEGACY is not set -# CONFIG_BOARD_GOOGLE_DUFFY is not set -# CONFIG_BOARD_GOOGLE_FAFFY is not set -# CONFIG_BOARD_GOOGLE_GENESIS is not set  # CONFIG_BOARD_GOOGLE_HATCH is not set  # CONFIG_BOARD_GOOGLE_HELIOS is not set  # CONFIG_BOARD_GOOGLE_HELIOS_DISKSWAP is not set  # CONFIG_BOARD_GOOGLE_JINLON is not set -# CONFIG_BOARD_GOOGLE_KAISA_LEGACY is not set -# CONFIG_BOARD_GOOGLE_KAISA is not set  # CONFIG_BOARD_GOOGLE_KINDRED is not set  # CONFIG_BOARD_GOOGLE_KOHAKU is not set -# CONFIG_BOARD_GOOGLE_MOONBUGGY is not set  # CONFIG_BOARD_GOOGLE_MUSHU is not set  # CONFIG_BOARD_GOOGLE_NIGHTFURY is not set -# CONFIG_BOARD_GOOGLE_NOIBAT is not set  # CONFIG_BOARD_GOOGLE_PALKIA is not set -# CONFIG_BOARD_GOOGLE_PUFF is not set -# CONFIG_BOARD_GOOGLE_SCOUT is not set -# CONFIG_BOARD_GOOGLE_WYVERN is not set  #  # Herobrine @@ -396,6 +429,11 @@ CONFIG_BOARD_GOOGLE_BOB=y  # CONFIG_BOARD_GOOGLE_MISTRAL is not set  # +# Myst +# +# CONFIG_BOARD_GOOGLE_MYST is not set + +#  # Nyan  #  # CONFIG_BOARD_GOOGLE_NYAN is not set @@ -456,12 +494,30 @@ CONFIG_BOARD_GOOGLE_BOB=y  # CONFIG_BOARD_GOOGLE_SORAKA is not set  # +# Puff +# +# CONFIG_BOARD_GOOGLE_AMBASSADOR is not set +# CONFIG_BOARD_GOOGLE_DOOLY is not set +# CONFIG_BOARD_GOOGLE_DUFFY_LEGACY is not set +# CONFIG_BOARD_GOOGLE_DUFFY is not set +# CONFIG_BOARD_GOOGLE_FAFFY is not set +# CONFIG_BOARD_GOOGLE_GENESIS is not set +# CONFIG_BOARD_GOOGLE_KAISA_LEGACY is not set +# CONFIG_BOARD_GOOGLE_KAISA is not set +# CONFIG_BOARD_GOOGLE_MOONBUGGY is not set +# CONFIG_BOARD_GOOGLE_NOIBAT is not set +# CONFIG_BOARD_GOOGLE_PUFF is not set +# CONFIG_BOARD_GOOGLE_SCOUT is not set +# CONFIG_BOARD_GOOGLE_WYVERN is not set + +#  # Rambi  #  # CONFIG_BOARD_GOOGLE_BANJO is not set  # CONFIG_BOARD_GOOGLE_CANDY is not set  # CONFIG_BOARD_GOOGLE_CLAPPER is not set  # CONFIG_BOARD_GOOGLE_ENGUARDE is not set +# CONFIG_BOARD_GOOGLE_EXPRESSO is not set  # CONFIG_BOARD_GOOGLE_GLIMMER is not set  # CONFIG_BOARD_GOOGLE_GNAWTY is not set  # CONFIG_BOARD_GOOGLE_HELI is not set @@ -485,6 +541,20 @@ CONFIG_BOARD_GOOGLE_BOB=y  # CONFIG_BOARD_GOOGLE_CORAL is not set  # +# Rex +# +# CONFIG_BOARD_GOOGLE_REX0 is not set +# CONFIG_BOARD_GOOGLE_SCREEBO is not set +# CONFIG_BOARD_GOOGLE_SCREEBO4ES is not set +# CONFIG_BOARD_GOOGLE_KARIS is not set +# CONFIG_BOARD_GOOGLE_KARIS4ES is not set +# CONFIG_BOARD_GOOGLE_REX_EC_ISH is not set +# CONFIG_BOARD_GOOGLE_OVIS is not set +# CONFIG_BOARD_GOOGLE_OVIS4ES is not set +# CONFIG_BOARD_GOOGLE_REX4ES is not set +# CONFIG_BOARD_GOOGLE_REX4ES_EC_ISH is not set + +#  # Sarien  #  # CONFIG_BOARD_GOOGLE_ARCADA is not set @@ -494,6 +564,10 @@ CONFIG_BOARD_GOOGLE_BOB=y  # Skyrim  #  # CONFIG_BOARD_GOOGLE_SKYRIM is not set +# CONFIG_BOARD_GOOGLE_WINTERHOLD is not set +# CONFIG_BOARD_GOOGLE_FROSTFLOW is not set +# CONFIG_BOARD_GOOGLE_CRYSTALDRIFT is not set +# CONFIG_BOARD_GOOGLE_MARKARTH is not set  #  # Slippy @@ -548,25 +622,25 @@ CONFIG_BOARD_GOOGLE_BOB=y  #  # Volteer  # +# CONFIG_BOARD_GOOGLE_CHRONICLER is not set +# CONFIG_BOARD_GOOGLE_COLLIS is not set +# CONFIG_BOARD_GOOGLE_COPANO is not set  # CONFIG_BOARD_GOOGLE_DELBIN is not set +# CONFIG_BOARD_GOOGLE_DROBIT is not set  # CONFIG_BOARD_GOOGLE_ELDRID is not set +# CONFIG_BOARD_GOOGLE_ELEMI is not set  # CONFIG_BOARD_GOOGLE_HALVOR is not set  # CONFIG_BOARD_GOOGLE_LINDAR is not set  # CONFIG_BOARD_GOOGLE_MALEFOR is not set  # CONFIG_BOARD_GOOGLE_TERRADOR is not set  # CONFIG_BOARD_GOOGLE_TODOR is not set  # CONFIG_BOARD_GOOGLE_TRONDO is not set +# CONFIG_BOARD_GOOGLE_VOEMA is not set +# CONFIG_BOARD_GOOGLE_VOLET is not set  # CONFIG_BOARD_GOOGLE_VOLTEER is not set  # CONFIG_BOARD_GOOGLE_VOLTEER2 is not set  # CONFIG_BOARD_GOOGLE_VOLTEER2_TI50 is not set  # CONFIG_BOARD_GOOGLE_VOXEL is not set -# CONFIG_BOARD_GOOGLE_ELEMI is not set -# CONFIG_BOARD_GOOGLE_VOEMA is not set -# CONFIG_BOARD_GOOGLE_DROBIT is not set -# CONFIG_BOARD_GOOGLE_COPANO is not set -# CONFIG_BOARD_GOOGLE_COLLIS is not set -# CONFIG_BOARD_GOOGLE_VOLET is not set -# CONFIG_BOARD_GOOGLE_CHRONICLER is not set  #  # Zork @@ -586,18 +660,24 @@ CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS=0x5  CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000  CONFIG_DRIVER_TPM_I2C_BUS=0x0  CONFIG_DRIVER_TPM_I2C_ADDR=0x20 +CONFIG_VBT_DATA_SIZE_KB=8  CONFIG_PMIC_BUS=-1  CONFIG_BOARD_GOOGLE_GRU_COMMON=y  CONFIG_GRU_HAS_TPM2=y  CONFIG_GRU_HAS_CENTERLOG_PWM=y  CONFIG_GRU_HAS_WLAN_RESET=y  CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME="" +CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y +CONFIG_SPI_FLASH_GIGADEVICE=y  CONFIG_EC_GOOGLE_CHROMEEC_SPI_WAKEUP_DELAY_US=0  CONFIG_PS2K_EISAID="PNP0303"  CONFIG_PS2M_EISAID="PNP0F13" -CONFIG_HEAP_SIZE=0x100000 -CONFIG_DRIVER_TPM_SPI_CHIP=0 +CONFIG_TTYS0_BAUD=115200 +CONFIG_D3COLD_SUPPORT=y +CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72  CONFIG_EC_GPE_SCI=0x50 +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  # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set @@ -624,21 +704,17 @@ CONFIG_ROM_SIZE=0x00800000  # SoC  #  CONFIG_CHIPSET_DEVICETREE="" -CONFIG_CBFS_CACHE_ALIGN=8  CONFIG_ARM64_BL31_EXTERNAL_FILE=""  CONFIG_ARCH_ARMV8_EXTENSION=0  CONFIG_STACK_SIZE=0x0 -CONFIG_VBT_DATA_SIZE_KB=8  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_TTYS0_BASE=0x3f8 -CONFIG_TTYS0_LCS=3 -CONFIG_UART_PCI_ADDR=0x0  CONFIG_GENERIC_UDELAY=y  CONFIG_SOC_ROCKCHIP_RK3399=y  CONFIG_RK3399_SPREAD_SPECTRUM_DDR=y +CONFIG_CBFS_CACHE_ALIGN=8  #  # CPU @@ -695,6 +771,7 @@ CONFIG_HAVE_LINEAR_FRAMEBUFFER=y  CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y  CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y  CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y +CONFIG_NO_EARLY_GFX_INIT=y  #  # Display @@ -704,9 +781,11 @@ CONFIG_LINEAR_FRAMEBUFFER=y  # CONFIG_BOOTSPLASH is not set  # end of Display +CONFIG_FIRMWARE_CONNECTION_MANAGER=y +# CONFIG_SOFTWARE_CONNECTION_MANAGER is not set  # CONFIG_SOFTWARE_I2C is not set  CONFIG_I2C_TRANSFER_TIMEOUT_US=500000 -CONFIG_RESOURCE_ALLOCATOR_V4=y +CONFIG_RESOURCE_ALLOCATION_TOP_DOWN=y  # end of Devices  # @@ -716,9 +795,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000  # CONFIG_ELOG is not set  CONFIG_COMMON_CBFS_SPI_WRAPPER=y  CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y  # CONFIG_SPI_FLASH_NO_FAST_READ is not set -CONFIG_SPI_FLASH_GIGADEVICE=y  CONFIG_TPM_INIT_RAMSTAGE=y  CONFIG_DRIVERS_UART=y  CONFIG_UART_OVERRIDE_REFCLK=y @@ -726,10 +803,12 @@ CONFIG_DRIVERS_UART_8250MEM=y  CONFIG_DRIVERS_UART_8250MEM_32=y  # CONFIG_VPD is not set  # CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set +# CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set  # CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set  # CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set  # CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set -CONFIG_INTEL_GMA_OPREGION_2_0=y +# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set +CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70  CONFIG_SPI_TPM=y  # end of Generic Drivers @@ -751,6 +830,8 @@ CONFIG_SPI_TPM=y  CONFIG_TPM_GOOGLE=y  CONFIG_TPM_GOOGLE_CR50=y  CONFIG_TPM_GOOGLE_IMMEDIATELY_COMMIT_FW_SECDATA=y +CONFIG_GOOGLE_TPM_IRQ_TIMEOUT_MS=10 +CONFIG_CR50_RESET_CLEAR_EC_AP_IDLE_FLAG=y  #  # Trusted Platform Module @@ -760,9 +841,14 @@ CONFIG_TPM2=y  CONFIG_TPM=y  CONFIG_MAINBOARD_HAS_TPM2=y  # CONFIG_DEBUG_TPM is not set -# CONFIG_TPM_MEASURED_BOOT is not set +CONFIG_PCR_BOOT_MODE=1 +CONFIG_PCR_HWID=1 +CONFIG_PCR_SRTM=2 +CONFIG_PCR_RUNTIME_DATA=3  # end of Trusted Platform Module +CONFIG_TPM_SETUP_HIBERNATE_ON_ERR=y +  #  # Memory initialization  # @@ -774,9 +860,11 @@ CONFIG_BOOTMEDIA_LOCK_NONE=y  # end of Security  CONFIG_ACPI_HAVE_PCAT_8259=y +CONFIG_ACPI_CUSTOM_MADT=y  CONFIG_BOOT_DEVICE_SPI_FLASH=y  CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y  CONFIG_RTC=y +CONFIG_HEAP_SIZE=0x100000  #  # Console @@ -786,6 +874,7 @@ CONFIG_BOOTBLOCK_CONSOLE=y  #  # memory mapped, 8250-compatible  # +CONFIG_TTYS0_BASE=0x3f8  # CONFIG_CONSOLE_SERIAL_921600 is not set  # CONFIG_CONSOLE_SERIAL_460800 is not set  # CONFIG_CONSOLE_SERIAL_230400 is not set @@ -794,7 +883,7 @@ CONFIG_CONSOLE_SERIAL_115200=y  # CONFIG_CONSOLE_SERIAL_38400 is not set  # CONFIG_CONSOLE_SERIAL_19200 is not set  # CONFIG_CONSOLE_SERIAL_9600 is not set -CONFIG_TTYS0_BAUD=115200 +CONFIG_TTYS0_LCS=3  CONFIG_CONSOLE_CBMEM=y  # CONFIG_CONSOLE_SPI_FLASH is not set  # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set @@ -824,20 +913,6 @@ CONFIG_HAVE_MONOTONIC_TIMER=y  # Payload  #  CONFIG_PAYLOAD_NONE=y -# CONFIG_PAYLOAD_ELF is not set -# CONFIG_PAYLOAD_FIT is not set -# CONFIG_PAYLOAD_BOOTBOOT is not set -# CONFIG_PAYLOAD_LINUXBOOT is not set -# CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_OPTIONS="" -CONFIG_PAYLOAD_FIT_SUPPORT=y -CONFIG_COMPRESS_SECONDARY_PAYLOAD=y - -# -# Secondary Payloads -# -# CONFIG_GRUB2_SECONDARY_PAYLOAD is not set -# end of Secondary Payloads  # end of Payload  # @@ -865,7 +940,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y  # CONFIG_DEBUG_ADA_CODE is not set  # end of Debugging -CONFIG_FLATTENED_DEVICE_TREE=y +CONFIG_DECOMPRESS_OFAST=y  CONFIG_WARNINGS_ARE_ERRORS=y  CONFIG_MAX_REBOOT_CNT=3  CONFIG_NO_XIP_EARLY_STAGES=y diff --git a/config/coreboot/gru_bob/target.cfg b/config/coreboot/gru_bob/target.cfg index 94e71d96..928029cb 100644 --- a/config/coreboot/gru_bob/target.cfg +++ b/config/coreboot/gru_bob/target.cfg @@ -1,4 +1,4 @@ -tree="cros" +tree="default"  romtype="normal"  arch="AArch64"  payload_uboot="y" diff --git a/config/coreboot/gru_kevin/config/libgfxinit_corebootfb b/config/coreboot/gru_kevin/config/libgfxinit_corebootfb index ef0022d5..61835e76 100644 --- a/config/coreboot/gru_kevin/config/libgfxinit_corebootfb +++ b/config/coreboot/gru_kevin/config/libgfxinit_corebootfb @@ -13,10 +13,12 @@ CONFIG_COMPILER_GCC=y  # CONFIG_ALLOW_EXPERIMENTAL_CLANG is not set  # CONFIG_ANY_TOOLCHAIN is not set  # CONFIG_CCACHE is not set +# CONFIG_IWYU is not set  # CONFIG_FMD_GENPARSER is not set  # CONFIG_UTIL_GENPARSER is not set  CONFIG_OPTION_BACKEND_NONE=y -CONFIG_COMPRESS_RAMSTAGE=y +CONFIG_COMPRESS_RAMSTAGE_LZMA=y +# CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set  CONFIG_COMPRESS_PRERAM_STAGES=y  CONFIG_COMPRESS_BOOTBLOCK=y  CONFIG_INCLUDE_CONFIG_FILE=y @@ -30,6 +32,12 @@ CONFIG_NO_STAGE_CACHE=y  # CONFIG_UPDATE_IMAGE is not set  # CONFIG_BOOTSPLASH_IMAGE is not set  # CONFIG_FW_CONFIG is not set + +# +# Software Bill Of Materials (SBOM) +# +# CONFIG_SBOM is not set +# end of Software Bill Of Materials (SBOM)  # end of General setup  # @@ -47,30 +55,28 @@ CONFIG_NO_STAGE_CACHE=y  # CONFIG_VENDOR_APPLE is not set  # CONFIG_VENDOR_ASROCK is not set  # CONFIG_VENDOR_ASUS is not set -# CONFIG_VENDOR_BAP is not set  # CONFIG_VENDOR_BIOSTAR is not set  # CONFIG_VENDOR_BOSTENTECH is not set +# CONFIG_VENDOR_BYTEDANCE is not set  # CONFIG_VENDOR_CAVIUM is not set  # CONFIG_VENDOR_CLEVO is not set  # CONFIG_VENDOR_COMPULAB is not set  # CONFIG_VENDOR_DELL is not set -# CONFIG_VENDOR_ELMEX is not set  # CONFIG_VENDOR_EMULATION is not set  # CONFIG_VENDOR_EXAMPLE is not set  # CONFIG_VENDOR_FACEBOOK is not set  # CONFIG_VENDOR_FOXCONN is not set  # CONFIG_VENDOR_GETAC is not set  # CONFIG_VENDOR_GIGABYTE is not set -# CONFIG_VENDOR_GIZMOSPHERE is not set  CONFIG_VENDOR_GOOGLE=y  # CONFIG_VENDOR_HP is not set  # CONFIG_VENDOR_IBASE is not set +# CONFIG_VENDOR_IBM is not set  # CONFIG_VENDOR_INTEL is not set -# CONFIG_VENDOR_JETWAY is not set +# CONFIG_VENDOR_INVENTEC is not set  # CONFIG_VENDOR_KONTRON is not set  # CONFIG_VENDOR_LENOVO is not set  # CONFIG_VENDOR_LIBRETREND is not set -# CONFIG_VENDOR_LIPPERT is not set  # CONFIG_VENDOR_MSI is not set  # CONFIG_VENDOR_OCP is not set  # CONFIG_VENDOR_OPENCELLULAR is not set @@ -85,7 +91,6 @@ CONFIG_VENDOR_GOOGLE=y  # CONFIG_VENDOR_RODA is not set  # CONFIG_VENDOR_SAMSUNG is not set  # CONFIG_VENDOR_SAPPHIRE is not set -# CONFIG_VENDOR_SCALEWAY is not set  # CONFIG_VENDOR_SIEMENS is not set  # CONFIG_VENDOR_SIFIVE is not set  # CONFIG_VENDOR_STARLABS is not set @@ -106,14 +111,15 @@ CONFIG_CONSOLE_SERIAL=y  CONFIG_MAX_CPUS=1  CONFIG_POST_DEVICE=y  CONFIG_UART_FOR_CONSOLE=0 +CONFIG_DEVICETREE="devicetree.cb"  # CONFIG_VBOOT is not set  # CONFIG_CHROMEOS is not set -CONFIG_DEVICETREE="devicetree.cb"  CONFIG_OVERRIDE_DEVICETREE=""  CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=1  CONFIG_CONSOLE_SERIAL_UART_ADDRESS=0xFF1A0000  # CONFIG_CONSOLE_POST is not set  CONFIG_MEMLAYOUT_LD_FILE="src/soc/rockchip/rk3399/memlayout.ld" +CONFIG_MAX_ACPI_TABLE_SIZE_KB=144  CONFIG_SPI_FLASH_WINBOND=y  # @@ -148,33 +154,54 @@ CONFIG_SPI_FLASH_WINBOND=y  # CONFIG_BOARD_GOOGLE_AGAH is not set  # CONFIG_BOARD_GOOGLE_ANAHERA is not set  # CONFIG_BOARD_GOOGLE_ANAHERA4ES is not set +# CONFIG_BOARD_GOOGLE_AURASH is not set +# CONFIG_BOARD_GOOGLE_BANSHEE is not set  # CONFIG_BOARD_GOOGLE_BRASK is not set  # CONFIG_BOARD_GOOGLE_BRYA0 is not set -# CONFIG_BOARD_GOOGLE_BRYA4ES is not set +# CONFIG_BOARD_GOOGLE_CRAASK is not set +# CONFIG_BOARD_GOOGLE_CRAASKOV is not set +# CONFIG_BOARD_GOOGLE_CONSTITUTION is not set +# CONFIG_BOARD_GOOGLE_CROTA is not set  # CONFIG_BOARD_GOOGLE_FELWINTER is not set +# CONFIG_BOARD_GOOGLE_GAELIN is not set  # CONFIG_BOARD_GOOGLE_GIMBLE is not set  # CONFIG_BOARD_GOOGLE_GIMBLE4ES is not set +# CONFIG_BOARD_GOOGLE_GLADIOS is not set +# CONFIG_BOARD_GOOGLE_GOTHRAX is not set +# CONFIG_BOARD_GOOGLE_HADES is not set  # CONFIG_BOARD_GOOGLE_KANO is not set +# CONFIG_BOARD_GOOGLE_KINOX is not set +# CONFIG_BOARD_GOOGLE_KULDAX is not set +# CONFIG_BOARD_GOOGLE_JOXER is not set +# CONFIG_BOARD_GOOGLE_LISBON is not set +# CONFIG_BOARD_GOOGLE_MARASOV is not set +# CONFIG_BOARD_GOOGLE_MITHRAX is not set +# CONFIG_BOARD_GOOGLE_MOLI is not set  # CONFIG_BOARD_GOOGLE_NIVVIKS is not set  # CONFIG_BOARD_GOOGLE_NEREID is not set +# CONFIG_BOARD_GOOGLE_OMNIGUL is not set +# CONFIG_BOARD_GOOGLE_OSIRIS is not set +# CONFIG_BOARD_GOOGLE_PIRRHA is not set  # CONFIG_BOARD_GOOGLE_PRIMUS is not set  # CONFIG_BOARD_GOOGLE_PRIMUS4ES is not set +# CONFIG_BOARD_GOOGLE_PUJJO is not set +# CONFIG_BOARD_GOOGLE_QUANDISO is not set  # CONFIG_BOARD_GOOGLE_REDRIX is not set  # CONFIG_BOARD_GOOGLE_REDRIX4ES is not set +# CONFIG_BOARD_GOOGLE_SKOLAS is not set  # CONFIG_BOARD_GOOGLE_SKOLAS4ES is not set  # CONFIG_BOARD_GOOGLE_TAEKO is not set  # CONFIG_BOARD_GOOGLE_TAEKO4ES is not set  # CONFIG_BOARD_GOOGLE_TANIKS is not set +# CONFIG_BOARD_GOOGLE_ULDREN is not set  # CONFIG_BOARD_GOOGLE_VELL is not set  # CONFIG_BOARD_GOOGLE_VOLMAR is not set -# CONFIG_BOARD_GOOGLE_BANSHEE is not set -# CONFIG_BOARD_GOOGLE_CROTA is not set -# CONFIG_BOARD_GOOGLE_MOLI is not set -# CONFIG_BOARD_GOOGLE_KINOX is not set -# CONFIG_BOARD_GOOGLE_CRAASK is not set -# CONFIG_BOARD_GOOGLE_OSIRIS is not set -# CONFIG_BOARD_GOOGLE_MITHRAX is not set -# CONFIG_BOARD_GOOGLE_KULDAX is not set +# CONFIG_BOARD_GOOGLE_XIVU is not set +# CONFIG_BOARD_GOOGLE_YAVIKS is not set +# CONFIG_BOARD_GOOGLE_YAVILLA is not set +# CONFIG_BOARD_GOOGLE_ZYDRON is not set +# CONFIG_BOARD_GOOGLE_NOKRIS is not set +# CONFIG_BOARD_GOOGLE_DOCHI is not set  #  # Butterfly @@ -193,11 +220,20 @@ CONFIG_SPI_FLASH_WINBOND=y  #  # CONFIG_BOARD_GOOGLE_KINGLER is not set  # CONFIG_BOARD_GOOGLE_STEELIX is not set +# CONFIG_BOARD_GOOGLE_VOLTORB is not set +# CONFIG_BOARD_GOOGLE_PONYTA is not set  #  # Krabby  #  # CONFIG_BOARD_GOOGLE_KRABBY is not set +# CONFIG_BOARD_GOOGLE_TENTACRUEL is not set +# CONFIG_BOARD_GOOGLE_MAGIKARP is not set + +# +# Staryu +# +# CONFIG_BOARD_GOOGLE_STARMIE is not set  #  # Cyan @@ -223,6 +259,7 @@ CONFIG_SPI_FLASH_WINBOND=y  # Dedede  #  # CONFIG_BOARD_GOOGLE_BOTEN is not set +# CONFIG_BOARD_GOOGLE_DIBBI is not set  # CONFIG_BOARD_GOOGLE_DEDEDE is not set  # CONFIG_BOARD_GOOGLE_DRAWCIA is not set  # CONFIG_BOARD_GOOGLE_HABOKI is not set @@ -247,6 +284,10 @@ CONFIG_SPI_FLASH_WINBOND=y  # CONFIG_BOARD_GOOGLE_DRIBLEE is not set  # CONFIG_BOARD_GOOGLE_GOOEY is not set  # CONFIG_BOARD_GOOGLE_BEADRIX is not set +# CONFIG_BOARD_GOOGLE_SHOTZO is not set +# CONFIG_BOARD_GOOGLE_TARANZA is not set +# CONFIG_BOARD_GOOGLE_BOXY is not set +# CONFIG_BOARD_GOOGLE_DEXI is not set  #  # Drallion @@ -276,6 +317,11 @@ CONFIG_SPI_FLASH_WINBOND=y  # CONFIG_BOARD_GOOGLE_GALE is not set  # +# Geralt +# +# CONFIG_BOARD_GOOGLE_GERALT is not set + +#  # Glados  #  # CONFIG_BOARD_GOOGLE_ASUKA is not set @@ -307,29 +353,16 @@ CONFIG_BOARD_GOOGLE_KEVIN=y  # Hatch  #  # CONFIG_BOARD_GOOGLE_AKEMI is not set -# CONFIG_BOARD_GOOGLE_AMBASSADOR is not set -# CONFIG_BOARD_GOOGLE_DOOLY is not set  # CONFIG_BOARD_GOOGLE_DRATINI is not set -# CONFIG_BOARD_GOOGLE_DUFFY_LEGACY is not set -# CONFIG_BOARD_GOOGLE_DUFFY is not set -# CONFIG_BOARD_GOOGLE_FAFFY is not set -# CONFIG_BOARD_GOOGLE_GENESIS is not set  # CONFIG_BOARD_GOOGLE_HATCH is not set  # CONFIG_BOARD_GOOGLE_HELIOS is not set  # CONFIG_BOARD_GOOGLE_HELIOS_DISKSWAP is not set  # CONFIG_BOARD_GOOGLE_JINLON is not set -# CONFIG_BOARD_GOOGLE_KAISA_LEGACY is not set -# CONFIG_BOARD_GOOGLE_KAISA is not set  # CONFIG_BOARD_GOOGLE_KINDRED is not set  # CONFIG_BOARD_GOOGLE_KOHAKU is not set -# CONFIG_BOARD_GOOGLE_MOONBUGGY is not set  # CONFIG_BOARD_GOOGLE_MUSHU is not set  # CONFIG_BOARD_GOOGLE_NIGHTFURY is not set -# CONFIG_BOARD_GOOGLE_NOIBAT is not set  # CONFIG_BOARD_GOOGLE_PALKIA is not set -# CONFIG_BOARD_GOOGLE_PUFF is not set -# CONFIG_BOARD_GOOGLE_SCOUT is not set -# CONFIG_BOARD_GOOGLE_WYVERN is not set  #  # Herobrine @@ -396,6 +429,11 @@ CONFIG_BOARD_GOOGLE_KEVIN=y  # CONFIG_BOARD_GOOGLE_MISTRAL is not set  # +# Myst +# +# CONFIG_BOARD_GOOGLE_MYST is not set + +#  # Nyan  #  # CONFIG_BOARD_GOOGLE_NYAN is not set @@ -456,12 +494,30 @@ CONFIG_BOARD_GOOGLE_KEVIN=y  # CONFIG_BOARD_GOOGLE_SORAKA is not set  # +# Puff +# +# CONFIG_BOARD_GOOGLE_AMBASSADOR is not set +# CONFIG_BOARD_GOOGLE_DOOLY is not set +# CONFIG_BOARD_GOOGLE_DUFFY_LEGACY is not set +# CONFIG_BOARD_GOOGLE_DUFFY is not set +# CONFIG_BOARD_GOOGLE_FAFFY is not set +# CONFIG_BOARD_GOOGLE_GENESIS is not set +# CONFIG_BOARD_GOOGLE_KAISA_LEGACY is not set +# CONFIG_BOARD_GOOGLE_KAISA is not set +# CONFIG_BOARD_GOOGLE_MOONBUGGY is not set +# CONFIG_BOARD_GOOGLE_NOIBAT is not set +# CONFIG_BOARD_GOOGLE_PUFF is not set +# CONFIG_BOARD_GOOGLE_SCOUT is not set +# CONFIG_BOARD_GOOGLE_WYVERN is not set + +#  # Rambi  #  # CONFIG_BOARD_GOOGLE_BANJO is not set  # CONFIG_BOARD_GOOGLE_CANDY is not set  # CONFIG_BOARD_GOOGLE_CLAPPER is not set  # CONFIG_BOARD_GOOGLE_ENGUARDE is not set +# CONFIG_BOARD_GOOGLE_EXPRESSO is not set  # CONFIG_BOARD_GOOGLE_GLIMMER is not set  # CONFIG_BOARD_GOOGLE_GNAWTY is not set  # CONFIG_BOARD_GOOGLE_HELI is not set @@ -485,6 +541,20 @@ CONFIG_BOARD_GOOGLE_KEVIN=y  # CONFIG_BOARD_GOOGLE_CORAL is not set  # +# Rex +# +# CONFIG_BOARD_GOOGLE_REX0 is not set +# CONFIG_BOARD_GOOGLE_SCREEBO is not set +# CONFIG_BOARD_GOOGLE_SCREEBO4ES is not set +# CONFIG_BOARD_GOOGLE_KARIS is not set +# CONFIG_BOARD_GOOGLE_KARIS4ES is not set +# CONFIG_BOARD_GOOGLE_REX_EC_ISH is not set +# CONFIG_BOARD_GOOGLE_OVIS is not set +# CONFIG_BOARD_GOOGLE_OVIS4ES is not set +# CONFIG_BOARD_GOOGLE_REX4ES is not set +# CONFIG_BOARD_GOOGLE_REX4ES_EC_ISH is not set + +#  # Sarien  #  # CONFIG_BOARD_GOOGLE_ARCADA is not set @@ -494,6 +564,10 @@ CONFIG_BOARD_GOOGLE_KEVIN=y  # Skyrim  #  # CONFIG_BOARD_GOOGLE_SKYRIM is not set +# CONFIG_BOARD_GOOGLE_WINTERHOLD is not set +# CONFIG_BOARD_GOOGLE_FROSTFLOW is not set +# CONFIG_BOARD_GOOGLE_CRYSTALDRIFT is not set +# CONFIG_BOARD_GOOGLE_MARKARTH is not set  #  # Slippy @@ -548,25 +622,25 @@ CONFIG_BOARD_GOOGLE_KEVIN=y  #  # Volteer  # +# CONFIG_BOARD_GOOGLE_CHRONICLER is not set +# CONFIG_BOARD_GOOGLE_COLLIS is not set +# CONFIG_BOARD_GOOGLE_COPANO is not set  # CONFIG_BOARD_GOOGLE_DELBIN is not set +# CONFIG_BOARD_GOOGLE_DROBIT is not set  # CONFIG_BOARD_GOOGLE_ELDRID is not set +# CONFIG_BOARD_GOOGLE_ELEMI is not set  # CONFIG_BOARD_GOOGLE_HALVOR is not set  # CONFIG_BOARD_GOOGLE_LINDAR is not set  # CONFIG_BOARD_GOOGLE_MALEFOR is not set  # CONFIG_BOARD_GOOGLE_TERRADOR is not set  # CONFIG_BOARD_GOOGLE_TODOR is not set  # CONFIG_BOARD_GOOGLE_TRONDO is not set +# CONFIG_BOARD_GOOGLE_VOEMA is not set +# CONFIG_BOARD_GOOGLE_VOLET is not set  # CONFIG_BOARD_GOOGLE_VOLTEER is not set  # CONFIG_BOARD_GOOGLE_VOLTEER2 is not set  # CONFIG_BOARD_GOOGLE_VOLTEER2_TI50 is not set  # CONFIG_BOARD_GOOGLE_VOXEL is not set -# CONFIG_BOARD_GOOGLE_ELEMI is not set -# CONFIG_BOARD_GOOGLE_VOEMA is not set -# CONFIG_BOARD_GOOGLE_DROBIT is not set -# CONFIG_BOARD_GOOGLE_COPANO is not set -# CONFIG_BOARD_GOOGLE_COLLIS is not set -# CONFIG_BOARD_GOOGLE_VOLET is not set -# CONFIG_BOARD_GOOGLE_CHRONICLER is not set  #  # Zork @@ -586,17 +660,23 @@ CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS=0x5  CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000  CONFIG_DRIVER_TPM_I2C_BUS=0x0  CONFIG_DRIVER_TPM_I2C_ADDR=0x20 +CONFIG_VBT_DATA_SIZE_KB=8  CONFIG_PMIC_BUS=-1  CONFIG_BOARD_GOOGLE_GRU_COMMON=y  # CONFIG_GRU_HAS_TPM2 is not set  CONFIG_GRU_HAS_CENTERLOG_PWM=y  CONFIG_GRU_HAS_WLAN_RESET=y  CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME="" +CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y +CONFIG_SPI_FLASH_GIGADEVICE=y  CONFIG_EC_GOOGLE_CHROMEEC_SPI_WAKEUP_DELAY_US=0  CONFIG_PS2K_EISAID="PNP0303"  CONFIG_PS2M_EISAID="PNP0F13" -CONFIG_HEAP_SIZE=0x100000 +CONFIG_TTYS0_BAUD=115200 +CONFIG_D3COLD_SUPPORT=y +CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72  CONFIG_EC_GPE_SCI=0x50 +# CONFIG_TPM_MEASURED_BOOT is not set  CONFIG_BOARD_ROMSIZE_KB_8192=y  # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set  # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set @@ -623,21 +703,17 @@ CONFIG_ROM_SIZE=0x00800000  # SoC  #  CONFIG_CHIPSET_DEVICETREE="" -CONFIG_CBFS_CACHE_ALIGN=8  CONFIG_ARM64_BL31_EXTERNAL_FILE=""  CONFIG_ARCH_ARMV8_EXTENSION=0  CONFIG_STACK_SIZE=0x0 -CONFIG_VBT_DATA_SIZE_KB=8  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_TTYS0_BASE=0x3f8 -CONFIG_TTYS0_LCS=3 -CONFIG_UART_PCI_ADDR=0x0  CONFIG_GENERIC_UDELAY=y  CONFIG_SOC_ROCKCHIP_RK3399=y  # CONFIG_RK3399_SPREAD_SPECTRUM_DDR is not set +CONFIG_CBFS_CACHE_ALIGN=8  #  # CPU @@ -694,6 +770,7 @@ CONFIG_HAVE_LINEAR_FRAMEBUFFER=y  CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y  CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y  CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y +CONFIG_NO_EARLY_GFX_INIT=y  #  # Display @@ -703,9 +780,11 @@ CONFIG_LINEAR_FRAMEBUFFER=y  # CONFIG_BOOTSPLASH is not set  # end of Display +CONFIG_FIRMWARE_CONNECTION_MANAGER=y +# CONFIG_SOFTWARE_CONNECTION_MANAGER is not set  # CONFIG_SOFTWARE_I2C is not set  CONFIG_I2C_TRANSFER_TIMEOUT_US=500000 -CONFIG_RESOURCE_ALLOCATOR_V4=y +CONFIG_RESOURCE_ALLOCATION_TOP_DOWN=y  # end of Devices  # @@ -715,9 +794,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000  # CONFIG_ELOG is not set  CONFIG_COMMON_CBFS_SPI_WRAPPER=y  CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y  # CONFIG_SPI_FLASH_NO_FAST_READ is not set -CONFIG_SPI_FLASH_GIGADEVICE=y  CONFIG_TPM_INIT_RAMSTAGE=y  CONFIG_DRIVERS_UART=y  CONFIG_UART_OVERRIDE_REFCLK=y @@ -725,6 +802,7 @@ CONFIG_DRIVERS_UART_8250MEM=y  CONFIG_DRIVERS_UART_8250MEM_32=y  # CONFIG_VPD is not set  # CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set +# CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set  # CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set  # CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set  # CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set @@ -732,7 +810,8 @@ CONFIG_I2C_TPM=y  CONFIG_DRIVER_TIS_DEFAULT=y  # CONFIG_DRIVER_I2C_TPM_ACPI is not set  # CONFIG_DRIVER_TPM_DISPLAY_TIS_BYTES is not set -CONFIG_INTEL_GMA_OPREGION_2_0=y +# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set +CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70  # end of Generic Drivers  # @@ -759,9 +838,14 @@ CONFIG_TPM=y  CONFIG_MAINBOARD_HAS_TPM1=y  # CONFIG_TPM_DEACTIVATE is not set  # CONFIG_DEBUG_TPM is not set -# CONFIG_TPM_MEASURED_BOOT is not set +CONFIG_PCR_BOOT_MODE=1 +CONFIG_PCR_HWID=1 +CONFIG_PCR_SRTM=2 +CONFIG_PCR_RUNTIME_DATA=3  # end of Trusted Platform Module +CONFIG_TPM_SETUP_HIBERNATE_ON_ERR=y +  #  # Memory initialization  # @@ -773,9 +857,11 @@ CONFIG_BOOTMEDIA_LOCK_NONE=y  # end of Security  CONFIG_ACPI_HAVE_PCAT_8259=y +CONFIG_ACPI_CUSTOM_MADT=y  CONFIG_BOOT_DEVICE_SPI_FLASH=y  CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y  CONFIG_RTC=y +CONFIG_HEAP_SIZE=0x100000  #  # Console @@ -785,6 +871,7 @@ CONFIG_BOOTBLOCK_CONSOLE=y  #  # memory mapped, 8250-compatible  # +CONFIG_TTYS0_BASE=0x3f8  # CONFIG_CONSOLE_SERIAL_921600 is not set  # CONFIG_CONSOLE_SERIAL_460800 is not set  # CONFIG_CONSOLE_SERIAL_230400 is not set @@ -793,7 +880,7 @@ CONFIG_CONSOLE_SERIAL_115200=y  # CONFIG_CONSOLE_SERIAL_38400 is not set  # CONFIG_CONSOLE_SERIAL_19200 is not set  # CONFIG_CONSOLE_SERIAL_9600 is not set -CONFIG_TTYS0_BAUD=115200 +CONFIG_TTYS0_LCS=3  CONFIG_CONSOLE_CBMEM=y  # CONFIG_CONSOLE_SPI_FLASH is not set  # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set @@ -823,20 +910,6 @@ CONFIG_HAVE_MONOTONIC_TIMER=y  # Payload  #  CONFIG_PAYLOAD_NONE=y -# CONFIG_PAYLOAD_ELF is not set -# CONFIG_PAYLOAD_FIT is not set -# CONFIG_PAYLOAD_BOOTBOOT is not set -# CONFIG_PAYLOAD_LINUXBOOT is not set -# CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_OPTIONS="" -CONFIG_PAYLOAD_FIT_SUPPORT=y -CONFIG_COMPRESS_SECONDARY_PAYLOAD=y - -# -# Secondary Payloads -# -# CONFIG_GRUB2_SECONDARY_PAYLOAD is not set -# end of Secondary Payloads  # end of Payload  # @@ -864,7 +937,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y  # CONFIG_DEBUG_ADA_CODE is not set  # end of Debugging -CONFIG_FLATTENED_DEVICE_TREE=y +CONFIG_DECOMPRESS_OFAST=y  CONFIG_WARNINGS_ARE_ERRORS=y  CONFIG_MAX_REBOOT_CNT=3  CONFIG_NO_XIP_EARLY_STAGES=y diff --git a/config/coreboot/gru_kevin/target.cfg b/config/coreboot/gru_kevin/target.cfg index 94e71d96..928029cb 100644 --- a/config/coreboot/gru_kevin/target.cfg +++ b/config/coreboot/gru_kevin/target.cfg @@ -1,4 +1,4 @@ -tree="cros" +tree="default"  romtype="normal"  arch="AArch64"  payload_uboot="y" diff --git a/script/update/project/trees b/script/update/project/trees index 9e6803cf..bb0899f0 100755 --- a/script/update/project/trees +++ b/script/update/project/trees @@ -196,9 +196,7 @@ check_cross_compiler()  	cbdir="src/coreboot/${tree}"  	[ "${project}" != "coreboot" ] && \ -		cbdir="src/coreboot/default" # not u-boot (e.g. linux) -	[ "${project}" = "u-boot" ] && \ -		cbdir="src/coreboot/cros" # u-boot only used on coreboot/cros +		cbdir="src/coreboot/default"  	# only true if not building coreboot:  	ctarget="${cbdir#src/coreboot/}"  | 
