From 1722747dc0f468aeef5469f658f2b8ec7c469329 Mon Sep 17 00:00:00 2001 From: Delane Brandy Date: Wed, 18 Oct 2023 14:04:49 +0100 Subject: [PATCH] embedded-a/corstone1000: Skip the shim in Debian patch in meta-arm update Skip the shim patch port for 2023.07 release, removing numbering so that it can be applied when the meta-arm patch set is changed. Signed-off-by: Delane Brandy --- ...orstone1000-Skip-the-shim-by-booting.patch | 70 ++++++++++--------- 1 file changed, 36 insertions(+), 34 deletions(-) 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 index a4a9d6e..416f675 100644 --- 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 @@ -1,29 +1,44 @@ -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 +From 168bb978b787e699cdf828fed9b89ab9f5c79678 Mon Sep 17 00:00:00 2001 +From: Delane Brandy +Date: Tue, 14 Nov 2023 11:05:57 +0000 +Subject: [PATCH] Update the Skip the shim patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Add Skip the shim patch. +Skip the shim patch port for 2023.07 release, removing numbering +so that it can be applied when the meta-arm patch set is changed. +Signed-off-by: Delane Brandy 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 + .../u-boot/u-boot-corstone1000.inc | 4 ++ + .../u-boot/corstone1000/Skip-the-shim.patch | 41 +++++++++++++++++++ + 2 files changed, 45 insertions(+) + create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/Skip-the-shim.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 +diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc +index 01a8683c..c451475a 100644 +--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc ++++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc +@@ -7,6 +7,10 @@ EXTRA_OEMAKE:append = ' DEVICE_TREE=${CORSTONE1000_DEVICE_TREE}' + + SYSROOT_DIRS:append = " /boot" + ++SRC_URI:append = " \ ++ file://Skip-the-shim.patch \ ++ " ++ + SRC_URI:append = " \ + file://0001-FF-A-v15-arm64-smccc-add-support-for-SMCCCv1.2-x0-x1.patch \ + file://0002-FF-A-v15-lib-uuid-introduce-uuid_str_to_le_bin-funct.patch \ +diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/Skip-the-shim.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/Skip-the-shim.patch new file mode 100644 -index 00000000..e19a2e25 +index 00000000..447c114f --- /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 ++++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/Skip-the-shim.patch +@@ -0,0 +1,41 @@ ++From -1da5481e63df46cec0c12300849ad33433bd36f1 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 @@ -41,8 +56,8 @@ index 00000000..e19a2e25 +into grubaa64.efi. This is useful for trying to install and boot +Debian. + -+Debian version: 12.0.0 -+u-boot version: 2023.01 ++Debian version: 12.1.0 ++u-boot version: 2023.07 + +Signed-off-by: Tomás González +--- @@ -54,7 +69,7 @@ index 00000000..e19a2e25 +--- 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" @@ -62,21 +77,8 @@ index 00000000..e19a2e25 + #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 +2.34.1 -- GitLab