From da3c9bb3c5c3b1f2e6e67a3695ce39b17bf68d5b Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 4 Sep 2023 02:36:41 +0100 Subject: merge config/ and resources/ Signed-off-by: Leah Rowe --- .../patches/0001-fix-crossgcc-build-error.patch | 55 ++++++++++++++++++++++ ...ing-for-coreboot-images-built-without-a-p.patch | 38 +++++++++++++++ ...CK-Disable-coreboot-related-BL31-features.patch | 28 +++++++++++ ...ssgcc-cros-also-fix-acpica-downloads-here.patch | 31 ++++++++++++ config/coreboot/cros/target.cfg | 4 ++ 5 files changed, 156 insertions(+) create mode 100644 config/coreboot/cros/patches/0001-fix-crossgcc-build-error.patch create mode 100644 config/coreboot/cros/patches/0002-Remove-warning-for-coreboot-images-built-without-a-p.patch create mode 100644 config/coreboot/cros/patches/0003-HACK-Disable-coreboot-related-BL31-features.patch create mode 100644 config/coreboot/cros/patches/0004-crossgcc-cros-also-fix-acpica-downloads-here.patch create mode 100644 config/coreboot/cros/target.cfg (limited to 'config/coreboot/cros') diff --git a/config/coreboot/cros/patches/0001-fix-crossgcc-build-error.patch b/config/coreboot/cros/patches/0001-fix-crossgcc-build-error.patch new file mode 100644 index 00000000..34a60be0 --- /dev/null +++ b/config/coreboot/cros/patches/0001-fix-crossgcc-build-error.patch @@ -0,0 +1,55 @@ +From 0d5a5f3ee1ee5d6f757d5877b7adbe9839487ccf Mon Sep 17 00:00:00 2001 +From: Leah Rowe +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 new file mode 100644 index 00000000..547c6392 --- /dev/null +++ b/config/coreboot/cros/patches/0002-Remove-warning-for-coreboot-images-built-without-a-p.patch @@ -0,0 +1,38 @@ +From 1ce4f118b024a6367382b46016781f30fe622e3e Mon Sep 17 00:00:00 2001 +From: Nicholas Chin +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/0003-HACK-Disable-coreboot-related-BL31-features.patch b/config/coreboot/cros/patches/0003-HACK-Disable-coreboot-related-BL31-features.patch new file mode 100644 index 00000000..d179a05a --- /dev/null +++ b/config/coreboot/cros/patches/0003-HACK-Disable-coreboot-related-BL31-features.patch @@ -0,0 +1,28 @@ +From 9f52555eac217623ad2edc72492f9ded6a5b538d Mon Sep 17 00:00:00 2001 +From: Alper Nebi Yasak +Date: Thu, 22 Jun 2023 16:44:27 +0300 +Subject: [PATCH] HACK: Disable coreboot related BL31 features + +I don't know why, but removing this BL31 make argument lets gru-kevin +power off properly when shut down from Linux. Needs investigation. +--- + src/arch/arm64/Makefile.inc | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc +index 6b49743633c3..e1982d92cc5c 100644 +--- a/src/arch/arm64/Makefile.inc ++++ b/src/arch/arm64/Makefile.inc +@@ -158,9 +158,6 @@ BL31_MAKEARGS += LOG_LEVEL=40 + # Always enable crash reporting, even on a release build + BL31_MAKEARGS += CRASH_REPORTING=1 + +-# Enable coreboot-specific features like CBMEM console support +-BL31_MAKEARGS += COREBOOT=1 +- + # Avoid build/release|build/debug distinction by overriding BUILD_PLAT directly + BL31_MAKEARGS += BUILD_PLAT="$(BL31_BUILD)" + +-- +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 new file mode 100644 index 00000000..9f78f31f --- /dev/null +++ b/config/coreboot/cros/patches/0004-crossgcc-cros-also-fix-acpica-downloads-here.patch @@ -0,0 +1,31 @@ +From a7fb02b80bc4ddae00ce7578054eb35d5c06b57b Mon Sep 17 00:00:00 2001 +From: Leah Rowe +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 +--- + 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 new file mode 100644 index 00000000..a595ce7e --- /dev/null +++ b/config/coreboot/cros/target.cfg @@ -0,0 +1,4 @@ +tree="cros" +arch="spaghettimonster" +rev="8da4bfe5b573f395057fbfb5a9d99b376e25c2a4" # 4.17 +romtype="normal" -- cgit v1.2.1