diff --git a/embedded-a/corstone1000/shim/0001-arm-bsp-u-boot-corstone1000-Skip-the-shim-by-booting.patch b/embedded-a/corstone1000/shim/0001-arm-bsp-u-boot-corstone1000-Skip-the-shim-by-booting.patch new file mode 100644 index 0000000000000000000000000000000000000000..a4a9d6eb3014ce8720009e59c92f5c9bf7ff75dc --- /dev/null +++ b/embedded-a/corstone1000/shim/0001-arm-bsp-u-boot-corstone1000-Skip-the-shim-by-booting.patch @@ -0,0 +1,82 @@ +From 9205074077cd7968f6889bbcf06b98a8f2c894b4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1s=20Gonz=C3=A1lez?= + +Date: Fri, 23 Jun 2023 16:35:03 +0100 +Subject: [PATCH] arm-bsp/u-boot: corstone1000: Skip the shim by booting into + grubaa64.efi +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add Skip the shim patch. + +Signed-off-by: Tomás González +--- + ...otcmd-Skip-the-shim-by-booting-into-.patch | 42 +++++++++++++++++++ + .../recipes-bsp/u-boot/u-boot_%.bbappend | 1 + + 2 files changed, 43 insertions(+) + create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0044-config_distro_bootcmd-Skip-the-shim-by-booting-into-.patch + +diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0044-config_distro_bootcmd-Skip-the-shim-by-booting-into-.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0044-config_distro_bootcmd-Skip-the-shim-by-booting-into-.patch +new file mode 100644 +index 00000000..e19a2e25 +--- /dev/null ++++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0044-config_distro_bootcmd-Skip-the-shim-by-booting-into-.patch +@@ -0,0 +1,42 @@ ++From 0da5481e63df46cec0c12300849ad33433bd36f1 Mon Sep 17 00:00:00 2001 ++From: Tomás González ++Date: Tue, 13 Jun 2023 15:49:57 +0100 ++Subject: [PATCH] config_distro_bootcmd: Skip the shim by booting into ++ grubaa64.efi ++MIME-Version: 1.0 ++Content-Type: text/plain; charset=UTF-8 ++Content-Transfer-Encoding: 8bit ++ ++Debian has a known issue in the Shim where the system crashes in the ++case where it runs out of resources for creating certain EFI ++variables. This should not be fatal, but the print function that ++informs of this situation has a bug that makes it fatal. ++ ++While this gets fixed upstream, skip the Shim by booting directly ++into grubaa64.efi. This is useful for trying to install and boot ++Debian. ++ ++Debian version: 12.0.0 ++u-boot version: 2023.01 ++ ++Signed-off-by: Tomás González ++--- ++ include/config_distro_bootcmd.h | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h ++index 9d2a225e7e..b51bcfb009 100644 ++--- a/include/config_distro_bootcmd.h +++++ b/include/config_distro_bootcmd.h ++@@ -99,7 +99,7 @@ ++ ++ #ifdef CONFIG_EFI_LOADER ++ #if defined(CONFIG_ARM64) ++-#define BOOTEFI_NAME "bootaa64.efi" +++#define BOOTEFI_NAME "grubaa64.efi" ++ #elif defined(CONFIG_ARM) ++ #define BOOTEFI_NAME "bootarm.efi" ++ #elif defined(CONFIG_X86_RUN_32BIT) ++-- ++2.17.1 ++ +diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +index e7521126..6de5e640 100644 +--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend ++++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +@@ -61,6 +61,7 @@ SRC_URI:append:corstone1000 = " \ + file://0041-corstone1000-enable-PSCI-reset.patch \ + file://0042-Enable-EFI-set-get-time-services.patch \ + file://0043-corstone1000-fix-compilation-warnings-in-fwu_plat_get_bootidx.patch \ ++ file://0044-config_distro_bootcmd-Skip-the-shim-by-booting-into-.patch \ + " + + # +-- +2.25.1 + diff --git a/embedded-a/corstone1000/shim/0001-config_distro_bootcmd-Skip-the-shim-by-booting-into-.patch b/embedded-a/corstone1000/shim/0001-config_distro_bootcmd-Skip-the-shim-by-booting-into-.patch deleted file mode 100644 index e19a2e259482bc38f8ed15a8c2ab2f6debb6e180..0000000000000000000000000000000000000000 --- a/embedded-a/corstone1000/shim/0001-config_distro_bootcmd-Skip-the-shim-by-booting-into-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0da5481e63df46cec0c12300849ad33433bd36f1 Mon Sep 17 00:00:00 2001 -From: Tomás González -Date: Tue, 13 Jun 2023 15:49:57 +0100 -Subject: [PATCH] config_distro_bootcmd: Skip the shim by booting into - grubaa64.efi -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Debian has a known issue in the Shim where the system crashes in the -case where it runs out of resources for creating certain EFI -variables. This should not be fatal, but the print function that -informs of this situation has a bug that makes it fatal. - -While this gets fixed upstream, skip the Shim by booting directly -into grubaa64.efi. This is useful for trying to install and boot -Debian. - -Debian version: 12.0.0 -u-boot version: 2023.01 - -Signed-off-by: Tomás González ---- - include/config_distro_bootcmd.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index 9d2a225e7e..b51bcfb009 100644 ---- a/include/config_distro_bootcmd.h -+++ b/include/config_distro_bootcmd.h -@@ -99,7 +99,7 @@ - - #ifdef CONFIG_EFI_LOADER - #if defined(CONFIG_ARM64) --#define BOOTEFI_NAME "bootaa64.efi" -+#define BOOTEFI_NAME "grubaa64.efi" - #elif defined(CONFIG_ARM) - #define BOOTEFI_NAME "bootarm.efi" - #elif defined(CONFIG_X86_RUN_32BIT) --- -2.17.1 -