From 4d9567a7561df6eeb0dd81f2faf522c8526163b0 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Sat, 14 Oct 2023 17:08:59 +0300 Subject: coreboot: gru: Use default coreboot tree We don't really need a custom coreboot tree for Chromebooks. I had added one, because at a cursory glance to the available config/coreboot/board subdirectories I had the impression that I should. But upstreams have one tree for every board and I think we should move towards that too. Move the one important BL31 makefile patch into the default coreboot patches, update the gru boards' configs by running savedefconfig in the cros tree and then running olddefconfig in the default tree. Signed-off-by: Alper Nebi Yasak --- ...CK-Disable-coreboot-related-BL31-features.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 config/coreboot/default/patches/0023-HACK-Disable-coreboot-related-BL31-features.patch (limited to 'config/coreboot/default/patches') diff --git a/config/coreboot/default/patches/0023-HACK-Disable-coreboot-related-BL31-features.patch b/config/coreboot/default/patches/0023-HACK-Disable-coreboot-related-BL31-features.patch new file mode 100644 index 00000000..d179a05a --- /dev/null +++ b/config/coreboot/default/patches/0023-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 + -- cgit v1.2.1