mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-30 12:30:14 +00:00
Code Issues Projects Releases Wiki Activity

arm-bsp/corstone1000: rebase u-boot patches on top v2022.07

Browse Source 
Rebase the u-boot patches on top of current u-boot supported
version in poky, needed some adjustments at efi loader.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Rui Miguel Silva
2022-08-09 19:26:07 +01:00
committed by Jon Mason
parent df1461b7d5
commit dfe6d2f1eb
25 changed files with 196 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/conf/machine/include/corstone1000.inc
+1 -1
View File
@@ -22,7 +22,7 @@ TFM_SIGN_PRIVATE_KEY = "${S}/bl2/ext/mcuboot/root-RSA-3072_1.pem"
RE_IMAGE_OFFSET = "0x1000" RE_IMAGE_OFFSET = "0x1000"
# u-boot # u-boot
PREFERRED_VERSION_u-boot ?= "2022.04" PREFERRED_VERSION_u-boot ?= "2022.07"
EXTRA_IMAGEDEPENDS += "u-boot" EXTRA_IMAGEDEPENDS += "u-boot"
UBOOT_CONFIG ??= "EFI" UBOOT_CONFIG ??= "EFI"
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0001-cmd-load-add-load-command-for-memory-mapped.patch
+13 -13
View File
@@ -1,7 +1,7 @@
From c047b15fba9da36616bc9a346d9fe4d76e7ca4b2 Mon Sep 17 00:00:00 2001 From 7a1a84ea74fdd06a7f5f239f4c5f4b727d6cd232 Mon Sep 17 00:00:00 2001
From: Rui Miguel Silva <rui.silva@linaro.org> From: Rui Miguel Silva <rui.silva@linaro.org>
Date: Thu, 24 Jun 2021 09:25:00 +0100 Date: Thu, 24 Jun 2021 09:25:00 +0100
Subject: [PATCH 01/27] cmd: load: add load command for memory mapped Subject: [PATCH 01/24] cmd: load: add load command for memory mapped
cp.b is used a lot as a way to load binaries to memory and execute cp.b is used a lot as a way to load binaries to memory and execute
them, however we may need to integrate this with the efi subsystem to them, however we may need to integrate this with the efi subsystem to
@@ -26,10 +26,10 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
6 files changed, 78 insertions(+) 6 files changed, 78 insertions(+)
diff --git a/README b/README diff --git a/README b/README
index f51f392111f9..049bcd108980 100644 index b7ab6e50708d..cd76f95e74c1 100644
--- a/README --- a/README
+++ b/README +++ b/README
@@ -2760,6 +2760,7 @@ rarpboot- boot image via network using RARP/TFTP protocol @@ -2578,6 +2578,7 @@ rarpboot- boot image via network using RARP/TFTP protocol
diskboot- boot from IDE devicebootd - boot default, i.e., run 'bootcmd' diskboot- boot from IDE devicebootd - boot default, i.e., run 'bootcmd'
loads - load S-Record file over serial line loads - load S-Record file over serial line
loadb - load binary file over serial line (kermit mode) loadb - load binary file over serial line (kermit mode)
@@ -38,10 +38,10 @@ index f51f392111f9..049bcd108980 100644
mm - memory modify (auto-incrementing) mm - memory modify (auto-incrementing)
nm - memory modify (constant address) nm - memory modify (constant address)
diff --git a/cmd/Kconfig b/cmd/Kconfig diff --git a/cmd/Kconfig b/cmd/Kconfig
index 5e25e45fd288..ff50102a89c7 100644 index 09193b61b95f..ba2f321ae989 100644
--- a/cmd/Kconfig --- a/cmd/Kconfig
+++ b/cmd/Kconfig +++ b/cmd/Kconfig
@@ -1076,6 +1076,12 @@ config CMD_LOADB @@ -1143,6 +1143,12 @@ config CMD_LOADB
help help
Load a binary file over serial line. Load a binary file over serial line.
@@ -55,7 +55,7 @@ index 5e25e45fd288..ff50102a89c7 100644
bool "loads" bool "loads"
default y default y
diff --git a/cmd/bootefi.c b/cmd/bootefi.c diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 53d9f0e0dcca..8d492ea9e70c 100644 index 827fcd97dfd8..37ce659fa123 100644
--- a/cmd/bootefi.c --- a/cmd/bootefi.c
+++ b/cmd/bootefi.c +++ b/cmd/bootefi.c
@@ -34,6 +34,18 @@ static struct efi_device_path *bootefi_device_path; @@ -34,6 +34,18 @@ static struct efi_device_path *bootefi_device_path;
@@ -141,10 +141,10 @@ index 7e4a552d90ef..1224a7f85bb3 100644
+); +);
+#endif /* CONFIG_CMD_LOADM */ +#endif /* CONFIG_CMD_LOADM */
diff --git a/include/efi_loader.h b/include/efi_loader.h diff --git a/include/efi_loader.h b/include/efi_loader.h
index af36639ec6a7..126db279dd3e 100644 index 11930fbea838..5b41985244e2 100644
--- a/include/efi_loader.h --- a/include/efi_loader.h
+++ b/include/efi_loader.h +++ b/include/efi_loader.h
@@ -585,6 +585,8 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, @@ -591,6 +591,8 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle,
void efi_save_gd(void); void efi_save_gd(void);
/* Call this to relocate the runtime section to an address space */ /* Call this to relocate the runtime section to an address space */
void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map); void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map);
@@ -154,10 +154,10 @@ index af36639ec6a7..126db279dd3e 100644
void efi_add_handle(efi_handle_t obj); void efi_add_handle(efi_handle_t obj);
/* Create handle */ /* Create handle */
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index 0542aaae16c7..d8dc59b2c95c 100644 index 171661b89727..2493d7432613 100644
--- a/lib/efi_loader/efi_device_path.c --- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c
@@ -1138,6 +1138,8 @@ efi_status_t efi_dp_from_name(const char *dev, const char *devnr, @@ -1158,6 +1158,8 @@ efi_status_t efi_dp_from_name(const char *dev, const char *devnr,
{ {
struct blk_desc *desc = NULL; struct blk_desc *desc = NULL;
struct disk_partition fs_partition; struct disk_partition fs_partition;
@@ -166,7 +166,7 @@ index 0542aaae16c7..d8dc59b2c95c 100644
int part = 0; int part = 0;
char *filename; char *filename;
char *s; char *s;
@@ -1153,6 +1155,13 @@ efi_status_t efi_dp_from_name(const char *dev, const char *devnr, @@ -1173,6 +1175,13 @@ efi_status_t efi_dp_from_name(const char *dev, const char *devnr,
} else if (!strcmp(dev, "Uart")) { } else if (!strcmp(dev, "Uart")) {
if (device) if (device)
*device = efi_dp_from_uart(); *device = efi_dp_from_uart();
@@ -181,5 +181,5 @@ index 0542aaae16c7..d8dc59b2c95c 100644
part = blk_get_device_part_str(dev, devnr, &desc, &fs_partition, part = blk_get_device_part_str(dev, devnr, &desc, &fs_partition,
1); 1);
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0002-arm-add-support-to-corstone1000-platform.patch
+18 -14
View File
@@ -1,7 +1,7 @@
From 5cc889db3279ef4944ab64e36db3dbab1bf9ffa5 Mon Sep 17 00:00:00 2001 From c9a9a467bb335047812004dd022dcadf9514101f Mon Sep 17 00:00:00 2001
From: Rui Miguel Silva <rui.silva@linaro.org> From: Rui Miguel Silva <rui.silva@linaro.org>
Date: Tue, 15 Feb 2022 09:44:10 +0000 Date: Tue, 15 Feb 2022 09:44:10 +0000
Subject: [PATCH 02/27] arm: add support to corstone1000 platform Subject: [PATCH 02/24] arm: add support to corstone1000 platform
Corstone1000 is a platform from arm, which includes pre Corstone1000 is a platform from arm, which includes pre
verified Corstone SSE710 sub-system that combines Cortex-A and verified Corstone SSE710 sub-system that combines Cortex-A and
@@ -27,10 +27,10 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
board/armltd/corstone1000/Kconfig | 12 ++ board/armltd/corstone1000/Kconfig | 12 ++
board/armltd/corstone1000/MAINTAINERS | 7 + board/armltd/corstone1000/MAINTAINERS | 7 +
board/armltd/corstone1000/Makefile | 7 + board/armltd/corstone1000/Makefile | 7 +
board/armltd/corstone1000/corstone1000.c | 121 ++++++++++++++++ board/armltd/corstone1000/corstone1000.c | 125 +++++++++++++++++
configs/corstone1000_defconfig | 80 +++++++++++ configs/corstone1000_defconfig | 80 +++++++++++
include/configs/corstone1000.h | 86 ++++++++++++ include/configs/corstone1000.h | 86 ++++++++++++
11 files changed, 548 insertions(+) 11 files changed, 552 insertions(+)
create mode 100644 arch/arm/dts/corstone1000-fvp.dts create mode 100644 arch/arm/dts/corstone1000-fvp.dts
create mode 100644 arch/arm/dts/corstone1000-mps3.dts create mode 100644 arch/arm/dts/corstone1000-mps3.dts
create mode 100644 arch/arm/dts/corstone1000.dtsi create mode 100644 arch/arm/dts/corstone1000.dtsi
@@ -42,12 +42,12 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
create mode 100644 include/configs/corstone1000.h create mode 100644 include/configs/corstone1000.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4567c183fb84..d64051b533a7 100644 index 9898c7d68e1b..2fc2b7d20f12 100644
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1266,6 +1266,12 @@ config TARGET_VEXPRESS64_JUNO @@ -1347,6 +1347,12 @@ config ARCH_VEXPRESS64
select USB select ENV_IS_IN_FLASH if MTD
imply OF_HAS_PRIOR_STAGE imply DISTRO_DEFAULTS
+config TARGET_CORSTONE1000 +config TARGET_CORSTONE1000
+ bool "Support Corstone1000 Platform" + bool "Support Corstone1000 Platform"
@@ -58,7 +58,7 @@ index 4567c183fb84..d64051b533a7 100644
config TARGET_TOTAL_COMPUTE config TARGET_TOTAL_COMPUTE
bool "Support Total Compute Platform" bool "Support Total Compute Platform"
select ARM64 select ARM64
@@ -2198,6 +2204,8 @@ source "arch/arm/mach-nexell/Kconfig" @@ -2295,6 +2301,8 @@ source "arch/arm/mach-npcm/Kconfig"
source "board/armltd/total_compute/Kconfig" source "board/armltd/total_compute/Kconfig"
@@ -68,10 +68,10 @@ index 4567c183fb84..d64051b533a7 100644
source "board/bosch/guardian/Kconfig" source "board/bosch/guardian/Kconfig"
source "board/Marvell/octeontx/Kconfig" source "board/Marvell/octeontx/Kconfig"
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 644ba961a223..7de25d09c9fe 100644 index a7e0d9f6c0e8..8c8f15b6a813 100644
--- a/arch/arm/dts/Makefile --- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile
@@ -1215,6 +1215,9 @@ dtb-$(CONFIG_TARGET_EA_LPC3250DEVKITV2) += lpc3250-ea3250.dtb @@ -1265,6 +1265,9 @@ dtb-$(CONFIG_TARGET_EA_LPC3250DEVKITV2) += lpc3250-ea3250.dtb
dtb-$(CONFIG_ARCH_QEMU) += qemu-arm.dtb qemu-arm64.dtb dtb-$(CONFIG_ARCH_QEMU) += qemu-arm.dtb qemu-arm64.dtb
@@ -369,10 +369,10 @@ index 000000000000..77a82c28929b
+obj-y := corstone1000.o +obj-y := corstone1000.o
diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c
new file mode 100644 new file mode 100644
index 000000000000..eff1739f0b02 index 000000000000..2fa485ff3799
--- /dev/null --- /dev/null
+++ b/board/armltd/corstone1000/corstone1000.c +++ b/board/armltd/corstone1000/corstone1000.c
@@ -0,0 +1,121 @@ @@ -0,0 +1,125 @@
+// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0+
+/* +/*
+ * (C) Copyright 2022 ARM Limited + * (C) Copyright 2022 ARM Limited
@@ -452,6 +452,10 @@ index 000000000000..eff1739f0b02
+ +
+struct mm_region *mem_map = corstone1000_mem_map; +struct mm_region *mem_map = corstone1000_mem_map;
+ +
+void set_dfu_alt_info(char *interface, char *devstr)
+{
+}
+
+int board_init(void) +int board_init(void)
+{ +{
+ return 0; + return 0;
@@ -673,5 +677,5 @@ index 000000000000..cf166f107efd
+ "bootefi $kernel_addr_r $fdtcontroladdr;" + "bootefi $kernel_addr_r $fdtcontroladdr;"
+#endif +#endif
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0003-usb-common-move-urb-code-to-common.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From b8f4f76e135ff2061d0032292f5209ac911dba16 Mon Sep 17 00:00:00 2001 From 61c5fe3758a0febdee33429f5be16f69279045cc Mon Sep 17 00:00:00 2001
From: Rui Miguel Silva <rui.silva@linaro.org> From: Rui Miguel Silva <rui.silva@linaro.org>
Date: Mon, 28 Jun 2021 23:20:55 +0100 Date: Mon, 28 Jun 2021 23:20:55 +0100
Subject: [PATCH 03/27] usb: common: move urb code to common Subject: [PATCH 03/24] usb: common: move urb code to common
Move urb code from musb only use to a more common scope, so other Move urb code from musb only use to a more common scope, so other
drivers in the future can use the handling of urb in usb. drivers in the future can use the handling of urb in usb.
@@ -493,5 +493,5 @@ index 6dd2c997f9b3..ec00161710a5 100644
/* /*
* Hub Status & Hub Change bit masks * Hub Status & Hub Change bit masks
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0004-usb-add-isp1760-family-driver.patch
+5 -5
View File
@@ -1,7 +1,7 @@
From 62a666a83766f5517e90464638455286bb33f433 Mon Sep 17 00:00:00 2001 From 8abb9c6a342d750a3a3a66e674c3be6597fc9f66 Mon Sep 17 00:00:00 2001
From: Rui Miguel Silva <rui.silva@linaro.org> From: Rui Miguel Silva <rui.silva@linaro.org>
Date: Mon, 28 Jun 2021 23:31:25 +0100 Date: Mon, 28 Jun 2021 23:31:25 +0100
Subject: [PATCH 04/27] usb: add isp1760 family driver Subject: [PATCH 04/24] usb: add isp1760 family driver
ISP1760/61/63 are a family of usb controllers, blah, blah, more info ISP1760/61/63 are a family of usb controllers, blah, blah, more info
here. here.
@@ -34,10 +34,10 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
create mode 100644 drivers/usb/isp1760/isp1760-uboot.h create mode 100644 drivers/usb/isp1760/isp1760-uboot.h
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index ad83d60dc39d..2c857c1fe2cc 100644 index 98867fbe06b4..67851020f5c1 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -834,6 +834,7 @@ libs-y += drivers/usb/host/ @@ -841,6 +841,7 @@ libs-y += drivers/usb/host/
libs-y += drivers/usb/mtu3/ libs-y += drivers/usb/mtu3/
libs-y += drivers/usb/musb/ libs-y += drivers/usb/musb/
libs-y += drivers/usb/musb-new/ libs-y += drivers/usb/musb-new/
@@ -3801,5 +3801,5 @@ index 000000000000..2486de6f9e27
+ +
+#endif +#endif
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0005-corstone1000-enable-isp1763-usb-controller.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From b7fb62e512e00a5fdbb4321bb0b4109261518481 Mon Sep 17 00:00:00 2001 From 5031fea320bb4ccc1ce7470193d8f4402ae819c9 Mon Sep 17 00:00:00 2001
From: Rui Miguel Silva <rui.silva@linaro.org> From: Rui Miguel Silva <rui.silva@linaro.org>
Date: Thu, 3 Mar 2022 16:52:02 +0000 Date: Thu, 3 Mar 2022 16:52:02 +0000
Subject: [PATCH 05/27] corstone1000: enable isp1763 usb controller Subject: [PATCH 05/24] corstone1000: enable isp1763 usb controller
MPS3 board have a ISP1763 usb controller, add the MPS3 board have a ISP1763 usb controller, add the
correspondent mmio area and enable it to be used for mass correspondent mmio area and enable it to be used for mass
@@ -44,5 +44,5 @@ index cf166f107efd..8ba0effb0ab2 100644
"boot_bank_flag=0x08002000\0" \ "boot_bank_flag=0x08002000\0" \
"kernel_addr_bank_0=0x083EE000\0" \ "kernel_addr_bank_0=0x083EE000\0" \
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0006-arm_ffa-introducing-Arm-FF-A-low-level-driver.patch
+19 -19
View File
@@ -1,7 +1,7 @@
From ede21dc1ca75132698cc81e88357c5789ccf67c7 Mon Sep 17 00:00:00 2001 From 968c86e8a6ed3e9e6621f0ae44977b5b13d90bfd Mon Sep 17 00:00:00 2001
From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
Date: Tue, 16 Nov 2021 12:34:52 +0000 Date: Tue, 16 Nov 2021 12:34:52 +0000
Subject: [PATCH 06/27] arm_ffa: introducing Arm FF-A low-level driver Subject: [PATCH 06/24] arm_ffa: introducing Arm FF-A low-level driver
This driver implements Arm Firmware Framework for Armv8-A on u-boot This driver implements Arm Firmware Framework for Armv8-A on u-boot
@@ -58,10 +58,10 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
create mode 100644 lib/arm-ffa/arm_ffa_helper.c create mode 100644 lib/arm-ffa/arm_ffa_helper.c
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index 96582fc67777..14307e6da644 100644 index 7f27ff4c20fc..d29d7e040764 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -232,6 +232,14 @@ F: board/CZ.NIC/ @@ -244,6 +244,14 @@ F: board/CZ.NIC/
F: configs/turris_*_defconfig F: configs/turris_*_defconfig
F: include/configs/turris_*.h F: include/configs/turris_*.h
@@ -143,20 +143,20 @@ index 22fd541f9a28..45eca83a473c 100644
DEFINE(ARM_SMCCC_QUIRK_STATE_OFFS, offsetof(struct arm_smccc_quirk, state)); DEFINE(ARM_SMCCC_QUIRK_STATE_OFFS, offsetof(struct arm_smccc_quirk, state));
#endif #endif
diff --git a/common/board_r.c b/common/board_r.c diff --git a/common/board_r.c b/common/board_r.c
index c24d9b4e220b..af20f38b104c 100644 index 6f4aca2077d6..412a0ea9fac3 100644
--- a/common/board_r.c --- a/common/board_r.c
+++ b/common/board_r.c +++ b/common/board_r.c
@@ -61,6 +61,9 @@ @@ -62,6 +62,9 @@
#include <wdt.h>
#include <asm-generic/gpio.h> #include <asm-generic/gpio.h>
#include <efi_loader.h> #include <efi_loader.h>
#include <relocate.h>
+#ifdef CONFIG_ARM_FFA_TRANSPORT +#ifdef CONFIG_ARM_FFA_TRANSPORT
+#include <arm_ffa_helper.h> +#include <arm_ffa_helper.h>
+#endif +#endif
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@@ -770,6 +773,9 @@ static init_fnc_t init_sequence_r[] = { @@ -779,6 +782,9 @@ static init_fnc_t init_sequence_r[] = {
INIT_FUNC_WATCHDOG_RESET INIT_FUNC_WATCHDOG_RESET
initr_net, initr_net,
#endif #endif
@@ -180,10 +180,10 @@ index b26ca8cf70c9..e83c23789d1b 100644
source "drivers/axi/Kconfig" source "drivers/axi/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile diff --git a/drivers/Makefile b/drivers/Makefile
index 4e7cf284405a..6671d2a604ab 100644 index 67c8af74424e..1be687b55d13 100644
--- a/drivers/Makefile --- a/drivers/Makefile
+++ b/drivers/Makefile +++ b/drivers/Makefile
@@ -107,6 +107,7 @@ obj-y += iommu/ @@ -109,6 +109,7 @@ obj-y += iommu/
obj-y += smem/ obj-y += smem/
obj-y += thermal/ obj-y += thermal/
obj-$(CONFIG_TEE) += tee/ obj-$(CONFIG_TEE) += tee/
@@ -2249,10 +2249,10 @@ index 000000000000..0e143e54511e
+int ffa_uuid_str_to_bin(const char *uuid_str, unsigned char *uuid_bin); +int ffa_uuid_str_to_bin(const char *uuid_str, unsigned char *uuid_bin);
+#endif +#endif
diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h
index 0e26e1d13824..a1181b8f48e7 100644 index 3ba69ad9a084..732441824557 100644
--- a/include/dm/uclass-id.h --- a/include/dm/uclass-id.h
+++ b/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h
@@ -52,6 +52,7 @@ enum uclass_id { @@ -55,6 +55,7 @@ enum uclass_id {
UCLASS_EFI_MEDIA, /* Devices provided by UEFI firmware */ UCLASS_EFI_MEDIA, /* Devices provided by UEFI firmware */
UCLASS_ETH, /* Ethernet device */ UCLASS_ETH, /* Ethernet device */
UCLASS_ETH_PHY, /* Ethernet PHY device */ UCLASS_ETH_PHY, /* Ethernet PHY device */
@@ -2320,10 +2320,10 @@ index 7f2be2339475..54980a130fdb 100644
#define arm_smccc_smc_quirk(...) __arm_smccc_smc(__VA_ARGS__) #define arm_smccc_smc_quirk(...) __arm_smccc_smc(__VA_ARGS__)
diff --git a/lib/Kconfig b/lib/Kconfig diff --git a/lib/Kconfig b/lib/Kconfig
index 3c6fa99b1a6a..473821b882e2 100644 index acc0ac081a44..65db65c3c4cd 100644
--- a/lib/Kconfig --- a/lib/Kconfig
+++ b/lib/Kconfig +++ b/lib/Kconfig
@@ -810,6 +810,7 @@ config SMBIOS_PARSER @@ -902,6 +902,7 @@ config SMBIOS_PARSER
source lib/efi/Kconfig source lib/efi/Kconfig
source lib/efi_loader/Kconfig source lib/efi_loader/Kconfig
source lib/optee/Kconfig source lib/optee/Kconfig
@@ -2332,7 +2332,7 @@ index 3c6fa99b1a6a..473821b882e2 100644
config TEST_FDTDEC config TEST_FDTDEC
bool "enable fdtdec test" bool "enable fdtdec test"
diff --git a/lib/Makefile b/lib/Makefile diff --git a/lib/Makefile b/lib/Makefile
index 11b03d1cbec8..8e6fad613067 100644 index d9b1811f7506..4aa3e2ed2a7e 100644
--- a/lib/Makefile --- a/lib/Makefile
+++ b/lib/Makefile +++ b/lib/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_EFI) += efi/ @@ -9,6 +9,7 @@ obj-$(CONFIG_EFI) += efi/
@@ -2564,7 +2564,7 @@ index 000000000000..623899d38044
+ return 0; + return 0;
+} +}
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 5bcb8253edba..cffa2c69d621 100644 index 4da64b5d2962..c68d9ed4f0bd 100644
--- a/lib/efi_loader/efi_boottime.c --- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c
@@ -23,6 +23,10 @@ @@ -23,6 +23,10 @@
@@ -2578,7 +2578,7 @@ index 5bcb8253edba..cffa2c69d621 100644
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
/* Task priority level */ /* Task priority level */
@@ -2114,6 +2118,10 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, @@ -2113,6 +2117,10 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle,
struct efi_event *evt, *next_event; struct efi_event *evt, *next_event;
efi_status_t ret = EFI_SUCCESS; efi_status_t ret = EFI_SUCCESS;
@@ -2589,7 +2589,7 @@ index 5bcb8253edba..cffa2c69d621 100644
EFI_ENTRY("%p, %zx", image_handle, map_key); EFI_ENTRY("%p, %zx", image_handle, map_key);
/* Check that the caller has read the current memory map */ /* Check that the caller has read the current memory map */
@@ -2174,6 +2182,15 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, @@ -2173,6 +2181,15 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle,
dm_remove_devices_flags(DM_REMOVE_ACTIVE_ALL); dm_remove_devices_flags(DM_REMOVE_ACTIVE_ALL);
} }
@@ -2606,5 +2606,5 @@ index 5bcb8253edba..cffa2c69d621 100644
efi_runtime_detach(); efi_runtime_detach();
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0007-arm_ffa-introducing-armffa-command.patch
+8 -8
View File
@@ -1,7 +1,7 @@
From 541b2b51dc77832ab5845cab4762d29976838d36 Mon Sep 17 00:00:00 2001 From 58358f79d9f8abbdc8bcfc7d08bd0c7c4c90ec84 Mon Sep 17 00:00:00 2001
From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
Date: Tue, 16 Nov 2021 12:36:27 +0000 Date: Tue, 16 Nov 2021 12:36:27 +0000
Subject: [PATCH 07/27] arm_ffa: introducing armffa command Subject: [PATCH 07/24] arm_ffa: introducing armffa command
A new armffa command is provided as an example of how to use A new armffa command is provided as an example of how to use
the FF-A helper functions to communicate with secure world. the FF-A helper functions to communicate with secure world.
@@ -20,10 +20,10 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
create mode 100644 cmd/armffa.c create mode 100644 cmd/armffa.c
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index 14307e6da644..f3fd559da54a 100644 index d29d7e040764..32fc267fcf13 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -235,6 +235,7 @@ F: include/configs/turris_*.h @@ -247,6 +247,7 @@ F: include/configs/turris_*.h
ARM FF-A ARM FF-A
M: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> M: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
S: Maintained S: Maintained
@@ -32,10 +32,10 @@ index 14307e6da644..f3fd559da54a 100644
F: include/arm_ffa.h F: include/arm_ffa.h
F: include/arm_ffa_helper.h F: include/arm_ffa_helper.h
diff --git a/cmd/Kconfig b/cmd/Kconfig diff --git a/cmd/Kconfig b/cmd/Kconfig
index ff50102a89c7..ff124bf4bad0 100644 index ba2f321ae989..090e668125d5 100644
--- a/cmd/Kconfig --- a/cmd/Kconfig
+++ b/cmd/Kconfig +++ b/cmd/Kconfig
@@ -813,6 +813,16 @@ endmenu @@ -873,6 +873,16 @@ endmenu
menu "Device access commands" menu "Device access commands"
@@ -53,7 +53,7 @@ index ff50102a89c7..ff124bf4bad0 100644
#depends on FLASH_CFI_DRIVER #depends on FLASH_CFI_DRIVER
bool "armflash" bool "armflash"
diff --git a/cmd/Makefile b/cmd/Makefile diff --git a/cmd/Makefile b/cmd/Makefile
index 166c652d9825..770b846c44e0 100644 index 5e43a1e022e8..e40f52f1e416 100644
--- a/cmd/Makefile --- a/cmd/Makefile
+++ b/cmd/Makefile +++ b/cmd/Makefile
@@ -12,6 +12,8 @@ obj-y += panic.o @@ -12,6 +12,8 @@ obj-y += panic.o
@@ -338,5 +338,5 @@ index 000000000000..71a6ebb656d1
+ "devlist\n" + "devlist\n"
+ " - displays the arm_ffa device info\n"); + " - displays the arm_ffa device info\n");
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0008-arm_ffa-introducing-MM-communication-with-FF-A.patch
+9 -9
View File
@@ -1,7 +1,7 @@
From 2f09d4a2e87febd7365b9e18d669208ff2c35edc Mon Sep 17 00:00:00 2001 From ee7c0aee66db53b2372a3b4245a8754dceee804d Mon Sep 17 00:00:00 2001
From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
Date: Wed, 13 Oct 2021 17:51:44 +0100 Date: Wed, 13 Oct 2021 17:51:44 +0100
Subject: [PATCH 08/27] arm_ffa: introducing MM communication with FF-A Subject: [PATCH 08/24] arm_ffa: introducing MM communication with FF-A
This commit allows to perform MM communication using FF-A transport. This commit allows to perform MM communication using FF-A transport.
@@ -30,10 +30,10 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
2 files changed, 273 insertions(+), 6 deletions(-) 2 files changed, 273 insertions(+), 6 deletions(-)
diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
index e5e35fe51f65..6827b821545e 100644 index e3f2402d0e8e..37131237af3f 100644
--- a/lib/efi_loader/Kconfig --- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig
@@ -56,13 +56,23 @@ config EFI_VARIABLE_FILE_STORE @@ -60,13 +60,23 @@ config EFI_VARIABLE_FILE_STORE
stored as file /ubootefi.var on the EFI system partition. stored as file /ubootefi.var on the EFI system partition.
config EFI_MM_COMM_TEE config EFI_MM_COMM_TEE
@@ -42,7 +42,7 @@ index e5e35fe51f65..6827b821545e 100644
+ bool "UEFI variables storage service via the trusted world" + bool "UEFI variables storage service via the trusted world"
+ depends on OPTEE || ARM_FFA_TRANSPORT + depends on OPTEE || ARM_FFA_TRANSPORT
help help
+ The MM SP (also called partition) can be StandAlonneMM or smm-gateway. + the MM SP (also called partition) can be StandAlonneMM or smm-gateway.
+ When using the u-boot OP-TEE driver, StandAlonneMM is supported. + When using the u-boot OP-TEE driver, StandAlonneMM is supported.
+ When using the u-boot FF-A driver, StandAlonneMM and smm-gateway are supported. + When using the u-boot FF-A driver, StandAlonneMM and smm-gateway are supported.
+ +
@@ -56,9 +56,9 @@ index e5e35fe51f65..6827b821545e 100644
+ MM buffer. The data is copied by u-boot to thea shared buffer before issuing + MM buffer. The data is copied by u-boot to thea shared buffer before issuing
+ the door bell event. + the door bell event.
+ +
endchoice config EFI_VARIABLE_NO_STORE
bool "Don't persist non-volatile UEFI variables"
config EFI_VARIABLES_PRESEED help
diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
index dfef18435dfa..9cb8cfb9c779 100644 index dfef18435dfa..9cb8cfb9c779 100644
--- a/lib/efi_loader/efi_variable_tee.c --- a/lib/efi_loader/efi_variable_tee.c
@@ -379,5 +379,5 @@ index dfef18435dfa..9cb8cfb9c779 100644
/* /*
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0009-arm_ffa-introducing-test-module-for-UCLASS_FFA.patch
+6 -6
View File
@@ -1,7 +1,7 @@
From c9a2c457648b732292482fae59a7fd61cefffd33 Mon Sep 17 00:00:00 2001 From 6f998a5e94e2562b5876b88864876c8b03b88f5a Mon Sep 17 00:00:00 2001
From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
Date: Tue, 16 Nov 2021 12:38:48 +0000 Date: Tue, 16 Nov 2021 12:38:48 +0000
Subject: [PATCH 09/27] arm_ffa: introducing test module for UCLASS_FFA Subject: [PATCH 09/24] arm_ffa: introducing test module for UCLASS_FFA
This is the test module for the UCLASS_FFA class. This is the test module for the UCLASS_FFA class.
@@ -17,10 +17,10 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
create mode 100644 test/dm/ffa.h create mode 100644 test/dm/ffa.h
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index f3fd559da54a..6510f844fe09 100644 index 32fc267fcf13..8209dc9319f1 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -240,6 +240,7 @@ F: drivers/arm-ffa/ @@ -252,6 +252,7 @@ F: drivers/arm-ffa/
F: include/arm_ffa.h F: include/arm_ffa.h
F: include/arm_ffa_helper.h F: include/arm_ffa_helper.h
F: lib/arm-ffa/ F: lib/arm-ffa/
@@ -29,7 +29,7 @@ index f3fd559da54a..6510f844fe09 100644
ARM FREESCALE IMX ARM FREESCALE IMX
M: Stefano Babic <sbabic@denx.de> M: Stefano Babic <sbabic@denx.de>
diff --git a/test/dm/Makefile b/test/dm/Makefile diff --git a/test/dm/Makefile b/test/dm/Makefile
index d46552fbf320..ddac250cdff0 100644 index f0a7c97e3d17..09a3403d2f53 100644
--- a/test/dm/Makefile --- a/test/dm/Makefile
+++ b/test/dm/Makefile +++ b/test/dm/Makefile
@@ -79,6 +79,7 @@ obj-$(CONFIG_POWER_DOMAIN) += power-domain.o @@ -79,6 +79,7 @@ obj-$(CONFIG_POWER_DOMAIN) += power-domain.o
@@ -128,5 +128,5 @@ index 000000000000..a0802bd6928a
+ +
+#endif /*__TEST_DM_FFA_H */ +#endif /*__TEST_DM_FFA_H */
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0010-arm_ffa-corstone1000-enable-FF-A-and-MM-support.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From ce6598d255113458fd5c9d19bb7469b721e37f6f Mon Sep 17 00:00:00 2001 From c0b01dff84d74f1b5aaff0d9b594e0aaec16c744 Mon Sep 17 00:00:00 2001
From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
Date: Tue, 2 Nov 2021 16:44:39 +0000 Date: Tue, 2 Nov 2021 16:44:39 +0000
Subject: [PATCH 10/27] arm_ffa: corstone1000: enable FF-A and MM support Subject: [PATCH 10/24] arm_ffa: corstone1000: enable FF-A and MM support
This commit allows corstone1000 platform to perform This commit allows corstone1000 platform to perform
MM communication between u-boot and the secure world MM communication between u-boot and the secure world
@@ -53,5 +53,5 @@ index 8ba0effb0ab2..afc9ccfc192b 100644
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0011-efi-corstone1000-introduce-EFI-capsule-update.patch
+16 -16
View File
@@ -1,7 +1,7 @@
From e70d0128090158872847b82b82cdbcf0e2f13885 Mon Sep 17 00:00:00 2001 From 652259af2f795a5d69c628ae7b1e79d33c234abd Mon Sep 17 00:00:00 2001
From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
Date: Thu, 11 Nov 2021 16:27:59 +0000 Date: Thu, 11 Nov 2021 16:27:59 +0000
Subject: [PATCH 11/27] efi: corstone1000: introduce EFI capsule update Subject: [PATCH 11/24] efi: corstone1000: introduce EFI capsule update
This commit provides capsule update feature for Corstone1000. This commit provides capsule update feature for Corstone1000.
@@ -58,10 +58,10 @@ index afc9ccfc192b..a400cdef69d0 100644
#define MM_SP_UUID_DATA \ #define MM_SP_UUID_DATA \
0xed, 0x32, 0xd5, 0x33, \ 0xed, 0x32, 0xd5, 0x33, \
diff --git a/include/efi_loader.h b/include/efi_loader.h diff --git a/include/efi_loader.h b/include/efi_loader.h
index 126db279dd3e..01b432e6184b 100644 index 5b41985244e2..796419b69b40 100644
--- a/include/efi_loader.h --- a/include/efi_loader.h
+++ b/include/efi_loader.h +++ b/include/efi_loader.h
@@ -965,11 +965,11 @@ extern const struct efi_firmware_management_protocol efi_fmp_fit; @@ -984,11 +984,11 @@ extern const struct efi_firmware_management_protocol efi_fmp_fit;
extern const struct efi_firmware_management_protocol efi_fmp_raw; extern const struct efi_firmware_management_protocol efi_fmp_raw;
/* Capsule update */ /* Capsule update */
@@ -76,10 +76,10 @@ index 126db279dd3e..01b432e6184b 100644
efi_uintn_t capsule_count, efi_uintn_t capsule_count,
u64 *maximum_capsule_size, u64 *maximum_capsule_size,
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index cffa2c69d621..5c77a40c3ebe 100644 index c68d9ed4f0bd..f2b5c7834c01 100644
--- a/lib/efi_loader/efi_boottime.c --- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c
@@ -2096,6 +2096,44 @@ static void efi_exit_caches(void) @@ -2095,6 +2095,44 @@ static void efi_exit_caches(void)
#endif #endif
} }
@@ -124,7 +124,7 @@ index cffa2c69d621..5c77a40c3ebe 100644
/** /**
* efi_exit_boot_services() - stop all boot services * efi_exit_boot_services() - stop all boot services
* @image_handle: handle of the loaded image * @image_handle: handle of the loaded image
@@ -2209,6 +2247,15 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, @@ -2208,6 +2246,15 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle,
/* Recalculate CRC32 */ /* Recalculate CRC32 */
efi_update_table_header_crc32(&systab.hdr); efi_update_table_header_crc32(&systab.hdr);
@@ -141,10 +141,10 @@ index cffa2c69d621..5c77a40c3ebe 100644
efi_set_watchdog(0); efi_set_watchdog(0);
WATCHDOG_RESET(); WATCHDOG_RESET();
diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c
index f00440163d41..c100c1b95298 100644 index a6b98f066a0b..a0689ba912fc 100644
--- a/lib/efi_loader/efi_capsule.c --- a/lib/efi_loader/efi_capsule.c
+++ b/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c
@@ -24,6 +24,14 @@ @@ -25,6 +25,14 @@
#include <crypto/pkcs7_parser.h> #include <crypto/pkcs7_parser.h>
#include <linux/err.h> #include <linux/err.h>
@@ -159,7 +159,7 @@ index f00440163d41..c100c1b95298 100644
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
const efi_guid_t efi_guid_capsule_report = EFI_CAPSULE_REPORT_GUID; const efi_guid_t efi_guid_capsule_report = EFI_CAPSULE_REPORT_GUID;
@@ -509,6 +517,89 @@ static efi_status_t efi_capsule_update_firmware( @@ -512,6 +520,89 @@ static efi_status_t efi_capsule_update_firmware(
} }
#endif /* CONFIG_EFI_CAPSULE_FIRMWARE_MANAGEMENT */ #endif /* CONFIG_EFI_CAPSULE_FIRMWARE_MANAGEMENT */
@@ -249,7 +249,7 @@ index f00440163d41..c100c1b95298 100644
/** /**
* efi_update_capsule() - process information from operating system * efi_update_capsule() - process information from operating system
* @capsule_header_array: Array of virtual address pointers * @capsule_header_array: Array of virtual address pointers
@@ -522,7 +613,7 @@ static efi_status_t efi_capsule_update_firmware( @@ -525,7 +616,7 @@ static efi_status_t efi_capsule_update_firmware(
* *
* Return: status code * Return: status code
*/ */
@@ -258,7 +258,7 @@ index f00440163d41..c100c1b95298 100644
struct efi_capsule_header **capsule_header_array, struct efi_capsule_header **capsule_header_array,
efi_uintn_t capsule_count, efi_uintn_t capsule_count,
u64 scatter_gather_list) u64 scatter_gather_list)
@@ -539,6 +630,13 @@ efi_status_t EFIAPI efi_update_capsule( @@ -542,6 +633,13 @@ efi_status_t EFIAPI efi_update_capsule(
goto out; goto out;
} }
@@ -272,7 +272,7 @@ index f00440163d41..c100c1b95298 100644
ret = EFI_SUCCESS; ret = EFI_SUCCESS;
for (i = 0, capsule = *capsule_header_array; i < capsule_count; for (i = 0, capsule = *capsule_header_array; i < capsule_count;
i++, capsule = *(++capsule_header_array)) { i++, capsule = *(++capsule_header_array)) {
@@ -551,6 +649,39 @@ efi_status_t EFIAPI efi_update_capsule( @@ -554,6 +652,39 @@ efi_status_t EFIAPI efi_update_capsule(
log_debug("Capsule[%d] (guid:%pUs)\n", log_debug("Capsule[%d] (guid:%pUs)\n",
i, &capsule->capsule_guid); i, &capsule->capsule_guid);
@@ -312,7 +312,7 @@ index f00440163d41..c100c1b95298 100644
if (!guidcmp(&capsule->capsule_guid, if (!guidcmp(&capsule->capsule_guid,
&efi_guid_firmware_management_capsule_id)) { &efi_guid_firmware_management_capsule_id)) {
ret = efi_capsule_update_firmware(capsule); ret = efi_capsule_update_firmware(capsule);
@@ -589,7 +720,7 @@ out: @@ -592,7 +723,7 @@ out:
* *
* Return: status code * Return: status code
*/ */
@@ -322,7 +322,7 @@ index f00440163d41..c100c1b95298 100644
efi_uintn_t capsule_count, efi_uintn_t capsule_count,
u64 *maximum_capsule_size, u64 *maximum_capsule_size,
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index eee54e48784f..989380d4f8cd 100644 index 492ecf4cb15c..bfd4687e10b5 100644
--- a/lib/efi_loader/efi_setup.c --- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c
@@ -16,6 +16,13 @@ @@ -16,6 +16,13 @@
@@ -355,5 +355,5 @@ index eee54e48784f..989380d4f8cd 100644
ret = efi_set_variable_int(u"CapsuleMax", ret = efi_set_variable_int(u"CapsuleMax",
&efi_guid_capsule_report, &efi_guid_capsule_report,
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0012-corstone1000-Update-FFA-shared-buffer-address.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From b2d752b4bbd5b2dc4cb22d2d652a261287505926 Mon Sep 17 00:00:00 2001 From 1ff229c8e02bdd3c859d581787636cfdf674eec1 Mon Sep 17 00:00:00 2001
From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com> From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
Date: Wed, 17 Nov 2021 15:28:06 +0000 Date: Wed, 17 Nov 2021 15:28:06 +0000
Subject: [PATCH 12/27] corstone1000: Update FFA shared buffer address Subject: [PATCH 12/24] corstone1000: Update FFA shared buffer address
FFA shared buffer address changed to 0x02000000. FFA shared buffer address changed to 0x02000000.
@@ -33,5 +33,5 @@ index a400cdef69d0..db0f91335cef 100644
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000) #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000)
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0013-corstone1000-Make-sure-shared-buffer-contents-are-no.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From 67a755f74716068cfd44a8897c31151fe9ee4328 Mon Sep 17 00:00:00 2001 From 370422921b2a3f4f7b73ce5b08820c24e82bba19 Mon Sep 17 00:00:00 2001
From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com> From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
Date: Thu, 18 Nov 2021 16:42:59 +0000 Date: Thu, 18 Nov 2021 16:42:59 +0000
Subject: [PATCH 13/27] corstone1000: Make sure shared buffer contents are not Subject: [PATCH 13/24] corstone1000: Make sure shared buffer contents are not
cached cached
After updating the shared buffer, it is required to flush the cache After updating the shared buffer, it is required to flush the cache
@@ -48,5 +48,5 @@ index 9cb8cfb9c779..b6be2b54a030 100644
ffa_ret = ffa_notify_mm_sp(); ffa_ret = ffa_notify_mm_sp();
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0014-arm-corstone1000-fix-unrecognized-filesystem-type.patch
+5 -5
View File
@@ -1,7 +1,7 @@
From e2463e3ef52260b38131085c0901de8708d52693 Mon Sep 17 00:00:00 2001 From 340ba3fbb0ea388578e30aede92695886f221eaf Mon Sep 17 00:00:00 2001
From: Rui Miguel Silva <rui.silva@linaro.org> From: Rui Miguel Silva <rui.silva@linaro.org>
Date: Fri, 4 Mar 2022 15:56:09 +0000 Date: Fri, 4 Mar 2022 15:56:09 +0000
Subject: [PATCH 14/27] arm: corstone1000: fix unrecognized filesystem type Subject: [PATCH 14/24] arm: corstone1000: fix unrecognized filesystem type
Some usb sticks are not recognized by usb, just add a Some usb sticks are not recognized by usb, just add a
delay before checking status. delay before checking status.
@@ -12,10 +12,10 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/common/usb_storage.c b/common/usb_storage.c diff --git a/common/usb_storage.c b/common/usb_storage.c
index c9e2d7343ce2..ae72338323ba 100644 index eaa31374ef73..79cf4297d4f4 100644
--- a/common/usb_storage.c --- a/common/usb_storage.c
+++ b/common/usb_storage.c +++ b/common/usb_storage.c
@@ -769,6 +769,9 @@ static int usb_stor_BBB_transport(struct scsi_cmd *srb, struct us_data *us) @@ -784,6 +784,9 @@ static int usb_stor_BBB_transport(struct scsi_cmd *srb, struct us_data *us)
st: st:
retry = 0; retry = 0;
again: again:
@@ -26,5 +26,5 @@ index c9e2d7343ce2..ae72338323ba 100644
result = usb_bulk_msg(us->pusb_dev, pipein, csw, UMASS_BBB_CSW_SIZE, result = usb_bulk_msg(us->pusb_dev, pipein, csw, UMASS_BBB_CSW_SIZE,
&actlen, USB_CNTL_TIMEOUT*5); &actlen, USB_CNTL_TIMEOUT*5);
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0015-efi_capsule-corstone1000-pass-interface-id-and-buffe.patch
+6 -6
View File
@@ -1,7 +1,7 @@
From 81bf9ed7e8e858cef13cfc3d1435c44445e523df Mon Sep 17 00:00:00 2001 From 4c249de0915750b328e456c34f18546f92850afd Mon Sep 17 00:00:00 2001
From: Vishnu Banavath <vishnu.banavath@arm.com> From: Vishnu Banavath <vishnu.banavath@arm.com>
Date: Fri, 10 Dec 2021 20:03:35 +0000 Date: Fri, 10 Dec 2021 20:03:35 +0000
Subject: [PATCH 15/27] efi_capsule: corstone1000: pass interface id and buffer Subject: [PATCH 15/24] efi_capsule: corstone1000: pass interface id and buffer
event id using register w4 event id using register w4
Initially the interface/event IDs are passed to the SP using register Initially the interface/event IDs are passed to the SP using register
@@ -39,10 +39,10 @@ index db0f91335cef..a7445e61348b 100644
#define CORSTONE1000_CAPSULE_BUFFER_SIZE (8192) /* 32 MB */ #define CORSTONE1000_CAPSULE_BUFFER_SIZE (8192) /* 32 MB */
diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c
index c100c1b95298..17d769803b2a 100644 index a0689ba912fc..e08e97cf3fb7 100644
--- a/lib/efi_loader/efi_capsule.c --- a/lib/efi_loader/efi_capsule.c
+++ b/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c
@@ -27,6 +27,8 @@ @@ -28,6 +28,8 @@
#ifdef CONFIG_TARGET_CORSTONE1000 #ifdef CONFIG_TARGET_CORSTONE1000
#include <arm_ffa_helper.h> #include <arm_ffa_helper.h>
#include <cpu_func.h> #include <cpu_func.h>
@@ -51,7 +51,7 @@ index c100c1b95298..17d769803b2a 100644
void *__efi_runtime_data corstone1000_capsule_buf; /* capsule shared buffer virtual address */ void *__efi_runtime_data corstone1000_capsule_buf; /* capsule shared buffer virtual address */
efi_guid_t corstone1000_capsule_guid = EFI_CORSTONE1000_CAPSULE_ID_GUID; efi_guid_t corstone1000_capsule_guid = EFI_CORSTONE1000_CAPSULE_ID_GUID;
@@ -587,11 +589,12 @@ static int __efi_runtime efi_corstone1000_buffer_ready_event(u32 capsule_image_s @@ -590,11 +592,12 @@ static int __efi_runtime efi_corstone1000_buffer_ready_event(u32 capsule_image_s
func_data.data0 = &part_id; func_data.data0 = &part_id;
/* /*
@@ -69,5 +69,5 @@ index c100c1b95298..17d769803b2a 100644
func_data.data1_size = sizeof(msg); func_data.data1_size = sizeof(msg);
func_data.data1 = &msg; func_data.data1 = &msg;
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0016-efi_boottime-corstone1000-pass-interface-id-and-kern.patch
+5 -5
View File
@@ -1,7 +1,7 @@
From 10d0ffc26ddcecd83921c2b3b37cb4eff54a154f Mon Sep 17 00:00:00 2001 From e5e1cf36cb7b77a5bb526f1744c0c77164374ca3 Mon Sep 17 00:00:00 2001
From: Vishnu Banavath <vishnu.banavath@arm.com> From: Vishnu Banavath <vishnu.banavath@arm.com>
Date: Fri, 10 Dec 2021 20:10:41 +0000 Date: Fri, 10 Dec 2021 20:10:41 +0000
Subject: [PATCH 16/27] efi_boottime: corstone1000: pass interface id and Subject: [PATCH 16/24] efi_boottime: corstone1000: pass interface id and
kernel event id using register w4 kernel event id using register w4
Initially the interface/event IDs are passed to the SP using register Initially the interface/event IDs are passed to the SP using register
@@ -21,7 +21,7 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
1 file changed, 10 insertions(+), 3 deletions(-) 1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 5c77a40c3ebe..b58a8c98fd05 100644 index f2b5c7834c01..140d0f4f71da 100644
--- a/lib/efi_loader/efi_boottime.c --- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c
@@ -27,6 +27,11 @@ @@ -27,6 +27,11 @@
@@ -36,7 +36,7 @@ index 5c77a40c3ebe..b58a8c98fd05 100644
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
/* Task priority level */ /* Task priority level */
@@ -2121,10 +2126,12 @@ static int efi_corstone1000_kernel_started_event(void) @@ -2120,10 +2125,12 @@ static int efi_corstone1000_kernel_started_event(void)
func_data.data0 = &part_id; func_data.data0 = &part_id;
/* /*
@@ -53,5 +53,5 @@ index 5c77a40c3ebe..b58a8c98fd05 100644
func_data.data1_size = sizeof(msg); func_data.data1_size = sizeof(msg);
func_data.data1 = &msg; func_data.data1 = &msg;
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0017-efi_loader-corstone1000-remove-guid-check-from-corst.patch
+6 -6
View File
@@ -1,7 +1,7 @@
From c463798489e41725f8ba33debeedc7c4011cda38 Mon Sep 17 00:00:00 2001 From 596cf4d04580b191d2f4f6082000534bdab13791 Mon Sep 17 00:00:00 2001
From: Vishnu Banavath <vishnu.banavath@arm.com> From: Vishnu Banavath <vishnu.banavath@arm.com>
Date: Sat, 11 Dec 2021 13:23:55 +0000 Date: Sat, 11 Dec 2021 13:23:55 +0000
Subject: [PATCH 17/27] efi_loader: corstone1000: remove guid check from Subject: [PATCH 17/24] efi_loader: corstone1000: remove guid check from
corstone1000 config option corstone1000 config option
Use generic fmp guid and no separte check is required for Use generic fmp guid and no separte check is required for
@@ -14,10 +14,10 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
1 file changed, 1 insertion(+), 15 deletions(-) 1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c
index 17d769803b2a..939040d2755e 100644 index e08e97cf3fb7..891143c33909 100644
--- a/lib/efi_loader/efi_capsule.c --- a/lib/efi_loader/efi_capsule.c
+++ b/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c
@@ -654,12 +654,6 @@ efi_status_t __efi_runtime EFIAPI efi_update_capsule( @@ -657,12 +657,6 @@ efi_status_t __efi_runtime EFIAPI efi_update_capsule(
i, &capsule->capsule_guid); i, &capsule->capsule_guid);
#if CONFIG_IS_ENABLED(TARGET_CORSTONE1000) #if CONFIG_IS_ENABLED(TARGET_CORSTONE1000)
@@ -30,7 +30,7 @@ index 17d769803b2a..939040d2755e 100644
if (efi_size_in_pages(capsule->capsule_image_size) > if (efi_size_in_pages(capsule->capsule_image_size) >
CORSTONE1000_CAPSULE_BUFFER_SIZE) { CORSTONE1000_CAPSULE_BUFFER_SIZE) {
log_err("Corstone1000: Capsule data size exceeds the shared buffer size\n"); log_err("Corstone1000: Capsule data size exceeds the shared buffer size\n");
@@ -685,15 +679,7 @@ efi_status_t __efi_runtime EFIAPI efi_update_capsule( @@ -688,15 +682,7 @@ efi_status_t __efi_runtime EFIAPI efi_update_capsule(
goto out; goto out;
#endif #endif
@@ -48,5 +48,5 @@ index 17d769803b2a..939040d2755e 100644
goto out; goto out;
} }
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0018-arm_ffa-removing-the-cast-when-using-binary-OR-on-FI.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From 1cfca60850727448bdbfe720d98d9e0d4523f6aa Mon Sep 17 00:00:00 2001 From 460406b46b51b6c585788001147a8961c95cc73c Mon Sep 17 00:00:00 2001
From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
Date: Sat, 11 Dec 2021 21:05:10 +0000 Date: Sat, 11 Dec 2021 21:05:10 +0000
Subject: [PATCH 18/27] arm_ffa: removing the cast when using binary OR on Subject: [PATCH 18/24] arm_ffa: removing the cast when using binary OR on
FIELD_PREP macros FIELD_PREP macros
When the GENMASK used is above 16-bits wide a u16 cast will cause When the GENMASK used is above 16-bits wide a u16 cast will cause
@@ -36,5 +36,5 @@ index 38ea4ba83efc..d0db3ef508a1 100644
/* The FF-A SMC function prototype definition */ /* The FF-A SMC function prototype definition */
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0019-Use-correct-buffer-size.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From 9ad9ead58e8e9e4f9e7a283c916421b443b424ce Mon Sep 17 00:00:00 2001 From 936c857add300f41bc58c300793a0e10b48ff69f Mon Sep 17 00:00:00 2001
From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com> From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
Date: Mon, 13 Dec 2021 15:25:23 +0000 Date: Mon, 13 Dec 2021 15:25:23 +0000
Subject: [PATCH 20/27] Use correct buffer size Subject: [PATCH 19/24] Use correct buffer size
The comm buffer created has additional 4 bytes length which The comm buffer created has additional 4 bytes length which
needs to be trimmed. This change will reduce the size of the needs to be trimmed. This change will reduce the size of the
@@ -36,5 +36,5 @@ index e65fbde60d0a..bb9919095649 100644
efi_uintn_t data_size; efi_uintn_t data_size;
efi_uintn_t name_size; efi_uintn_t name_size;
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0020-efi_loader-populate-ESRT-table-if-EFI_ESRT-config-op.patch
+5 -5
View File
@@ -1,7 +1,7 @@
From 5fec641015f8f1ca80f55f05b5e1f67653321303 Mon Sep 17 00:00:00 2001 From 5c57ef351882afebde479de430acf2c4f8fdefc8 Mon Sep 17 00:00:00 2001
From: Vishnu Banavath <vishnu.banavath@arm.com> From: Vishnu Banavath <vishnu.banavath@arm.com>
Date: Fri, 17 Dec 2021 19:49:02 +0000 Date: Fri, 17 Dec 2021 19:49:02 +0000
Subject: [PATCH 22/27] efi_loader: populate ESRT table if EFI_ESRT config Subject: [PATCH 20/24] efi_loader: populate ESRT table if EFI_ESRT config
option is set option is set
This change is to call efi_esrt_populate function if CONFIG_EFI_ESRT This change is to call efi_esrt_populate function if CONFIG_EFI_ESRT
@@ -14,10 +14,10 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
1 file changed, 7 insertions(+) 1 file changed, 7 insertions(+)
diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c
index 939040d2755e..790d2ba8fe19 100644 index 891143c33909..7db78f1f7648 100644
--- a/lib/efi_loader/efi_capsule.c --- a/lib/efi_loader/efi_capsule.c
+++ b/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c
@@ -676,6 +676,13 @@ efi_status_t __efi_runtime EFIAPI efi_update_capsule( @@ -679,6 +679,13 @@ efi_status_t __efi_runtime EFIAPI efi_update_capsule(
ret = EFI_SUCCESS; ret = EFI_SUCCESS;
} }
@@ -32,5 +32,5 @@ index 939040d2755e..790d2ba8fe19 100644
#endif #endif
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0021-efi_firmware-add-get_image_info-for-corstone1000.patch
+35 -32
View File
@@ -1,7 +1,7 @@
From 34fadec4f659248a6020676f5894895977ccf79d Mon Sep 17 00:00:00 2001 From fcd1dc670d83bd7e7528370d0d6f168bfb44054d Mon Sep 17 00:00:00 2001
From: Vishnu Banavath <vishnu.banavath@arm.com> From: Vishnu Banavath <vishnu.banavath@arm.com>
Date: Fri, 17 Dec 2021 19:50:25 +0000 Date: Fri, 17 Dec 2021 19:50:25 +0000
Subject: [PATCH 23/27] efi_firmware: add get_image_info for corstone1000 Subject: [PATCH 21/24] efi_firmware: add get_image_info for corstone1000
This change is to populate get_image_info which eventually This change is to populate get_image_info which eventually
will be populated in ESRT table will be populated in ESRT table
@@ -12,26 +12,25 @@ Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
--- ---
lib/efi_loader/efi_firmware.c | 64 ++++++++++++++++++++++++++++++++++- lib/efi_loader/efi_firmware.c | 71 ++++++++++++++++++++++++++++++++++-
1 file changed, 63 insertions(+), 1 deletion(-) 1 file changed, 70 insertions(+), 1 deletion(-)
diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c
index a5ff32f121f4..9eb89849b28d 100644 index 30cafd15caac..af43d4502f92 100644
--- a/lib/efi_loader/efi_firmware.c --- a/lib/efi_loader/efi_firmware.c
+++ b/lib/efi_loader/efi_firmware.c +++ b/lib/efi_loader/efi_firmware.c
@@ -241,6 +241,7 @@ const efi_guid_t efi_firmware_image_type_uboot_fit = @@ -17,11 +17,69 @@
*
* Return status code #define FMP_PAYLOAD_HDR_SIGNATURE SIGNATURE_32('M', 'S', 'S', '1')
*/
+
static
efi_status_t EFIAPI efi_firmware_fit_get_image_info(
struct efi_firmware_management_protocol *this,
@@ -332,6 +333,56 @@ const struct efi_firmware_management_protocol efi_fmp_fit = {
const efi_guid_t efi_firmware_image_type_uboot_raw =
EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID;
+#if CONFIG_IS_ENABLED(TARGET_CORSTONE1000) +#if CONFIG_IS_ENABLED(TARGET_CORSTONE1000)
+#define EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID \
+ EFI_GUID(0xe2bb9c06, 0x70e9, 0x4b14, 0x97, 0xa3, \
+ 0x5a, 0x79, 0x13, 0x17, 0x6e, 0x3f)
+
+ const efi_guid_t efi_firmware_image_type_uboot_raw =
+ EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID;
+
+static efi_status_t efi_corstone1000_img_info_get ( +static efi_status_t efi_corstone1000_img_info_get (
+ efi_uintn_t *image_info_size, + efi_uintn_t *image_info_size,
+ struct efi_firmware_image_descriptor *image_info, + struct efi_firmware_image_descriptor *image_info,
@@ -81,34 +80,38 @@ index a5ff32f121f4..9eb89849b28d 100644
+ return EFI_SUCCESS; + return EFI_SUCCESS;
+} +}
+#endif +#endif
+
/** /**
* efi_firmware_raw_get_image_info - return information about the current * struct fmp_payload_header - EDK2 header for the FMP payload
firmware image *
@@ -376,12 +427,20 @@ efi_status_t EFIAPI efi_firmware_raw_get_image_info( * This structure describes the header which is preprended to the
- * FMP payload by the edk2 capsule generation scripts.
+ * FMP payload by the edk1 capsule generation scripts.
*
* @signature: Header signature used to identify the header
* @header_size: Size of the structure
@@ -285,10 +343,18 @@ efi_status_t EFIAPI efi_firmware_get_image_info(
!descriptor_size || !package_version || !package_version_name)) !descriptor_size || !package_version || !package_version_name))
return EFI_EXIT(EFI_INVALID_PARAMETER); return EFI_EXIT(EFI_INVALID_PARAMETER);
- ret = efi_get_dfu_info(image_info_size, image_info,
+#if CONFIG_IS_ENABLED(TARGET_CORSTONE1000) +#if CONFIG_IS_ENABLED(TARGET_CORSTONE1000)
+ ret = efi_corstone1000_img_info_get(image_info_size, image_info, + ret = efi_corstone1000_img_info_get(image_info_size, image_info,
descriptor_version, descriptor_count,
descriptor_size,
package_version, package_version_name,
&efi_firmware_image_type_uboot_raw);
+#else
+ ret = efi_get_dfu_info(image_info_size, image_info,
+ descriptor_version, descriptor_count, + descriptor_version, descriptor_count,
+ descriptor_size, + descriptor_size,
+ package_version, package_version_name, + package_version, package_version_name,
+ &efi_firmware_image_type_uboot_raw); + &efi_firmware_image_type_uboot_raw);
+#else
ret = efi_fill_image_desc_array(image_info_size, image_info,
descriptor_version, descriptor_count,
descriptor_size, package_version,
package_version_name);
+#endif +#endif
return EFI_EXIT(ret); return EFI_EXIT(ret);
} }
@@ -401,6 +467,9 @@ efi_status_t EFIAPI efi_firmware_raw_set_image(
@@ -462,6 +521,9 @@ efi_status_t EFIAPI efi_firmware_raw_set_image( if (status != EFI_SUCCESS)
return EFI_EXIT(status);
}
+#if CONFIG_IS_ENABLED(TARGET_CORSTONE1000) +#if CONFIG_IS_ENABLED(TARGET_CORSTONE1000)
+ return EFI_EXIT(EFI_SUCCESS); + return EFI_EXIT(EFI_SUCCESS);
@@ -117,5 +120,5 @@ index a5ff32f121f4..9eb89849b28d 100644
NULL, NULL)) NULL, NULL))
return EFI_EXIT(EFI_DEVICE_ERROR); return EFI_EXIT(EFI_DEVICE_ERROR);
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0022-efi_loader-send-bootcomplete-message-to-secure-encla.patch
+9 -9
View File
@@ -1,7 +1,7 @@
From af2defbfaffa4264052e30f269b91794068e4773 Mon Sep 17 00:00:00 2001 From 902d5c499b6627a505986d298986a4ac430592b8 Mon Sep 17 00:00:00 2001
From: Vishnu Banavath <vishnu.banavath@arm.com> From: Vishnu Banavath <vishnu.banavath@arm.com>
Date: Wed, 5 Jan 2022 17:56:09 +0000 Date: Wed, 5 Jan 2022 17:56:09 +0000
Subject: [PATCH 25/27] efi_loader: send bootcomplete message to secure enclave Subject: [PATCH 22/24] efi_loader: send bootcomplete message to secure enclave
On corstone1000 platform, Secure Enclave will be expecting On corstone1000 platform, Secure Enclave will be expecting
an event from uboot when it performs capsule update. Previously, an event from uboot when it performs capsule update. Previously,
@@ -32,10 +32,10 @@ index a7445e61348b..06b605e43bdf 100644
#define PREP_SEPROXY_SVC_ID_MASK GENMASK(31, 16) #define PREP_SEPROXY_SVC_ID_MASK GENMASK(31, 16)
#define PREP_SEPROXY_SVC_ID(x) (FIELD_PREP(PREP_SEPROXY_SVC_ID_MASK, (x))) #define PREP_SEPROXY_SVC_ID(x) (FIELD_PREP(PREP_SEPROXY_SVC_ID_MASK, (x)))
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index b58a8c98fd05..d0703060491b 100644 index 140d0f4f71da..6b9f5cf272b8 100644
--- a/lib/efi_loader/efi_boottime.c --- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c
@@ -2101,46 +2101,6 @@ static void efi_exit_caches(void) @@ -2100,46 +2100,6 @@ static void efi_exit_caches(void)
#endif #endif
} }
@@ -82,7 +82,7 @@ index b58a8c98fd05..d0703060491b 100644
/** /**
* efi_exit_boot_services() - stop all boot services * efi_exit_boot_services() - stop all boot services
* @image_handle: handle of the loaded image * @image_handle: handle of the loaded image
@@ -2254,15 +2214,6 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, @@ -2253,15 +2213,6 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle,
/* Recalculate CRC32 */ /* Recalculate CRC32 */
efi_update_table_header_crc32(&systab.hdr); efi_update_table_header_crc32(&systab.hdr);
@@ -99,10 +99,10 @@ index b58a8c98fd05..d0703060491b 100644
efi_set_watchdog(0); efi_set_watchdog(0);
WATCHDOG_RESET(); WATCHDOG_RESET();
diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c
index 9eb89849b28d..477ad072070e 100644 index af43d4502f92..25f427b93669 100644
--- a/lib/efi_loader/efi_firmware.c --- a/lib/efi_loader/efi_firmware.c
+++ b/lib/efi_loader/efi_firmware.c +++ b/lib/efi_loader/efi_firmware.c
@@ -356,7 +356,7 @@ static efi_status_t efi_corstone1000_img_info_get ( @@ -47,7 +47,7 @@ static efi_status_t efi_corstone1000_img_info_get (
*package_version_name = NULL; /* not supported */ *package_version_name = NULL; /* not supported */
if(image_info == NULL) { if(image_info == NULL) {
@@ -112,7 +112,7 @@ index 9eb89849b28d..477ad072070e 100644
} }
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index 989380d4f8cd..515a0bdf74ef 100644 index bfd4687e10b5..a20128e9b582 100644
--- a/lib/efi_loader/efi_setup.c --- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c
@@ -17,6 +17,9 @@ @@ -17,6 +17,9 @@
@@ -187,5 +187,5 @@ index 989380d4f8cd..515a0bdf74ef 100644
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
printf("EFI: Corstone-1000: cannot allocate caspsule shared buffer\n"); printf("EFI: Corstone-1000: cannot allocate caspsule shared buffer\n");
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0023-efi_loader-fix-null-pointer-exception-with-get_image.patch
+5 -5
View File
@@ -1,7 +1,7 @@
From 2da8554ab732c59c7ca624ac4b16412fa9c2e39c Mon Sep 17 00:00:00 2001 From 383078dde2fbf509dc3d24505f6b328316aee030 Mon Sep 17 00:00:00 2001
From: Vishnu Banavath <vishnu.banavath@arm.com> From: Vishnu Banavath <vishnu.banavath@arm.com>
Date: Fri, 14 Jan 2022 15:24:18 +0000 Date: Fri, 14 Jan 2022 15:24:18 +0000
Subject: [PATCH 26/27] efi_loader: fix null pointer exception with Subject: [PATCH 23/24] efi_loader: fix null pointer exception with
get_image_info get_image_info
get_img_info API implemented for corstone1000 target does not get_img_info API implemented for corstone1000 target does not
@@ -16,10 +16,10 @@ Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
1 file changed, 11 insertions(+), 8 deletions(-) 1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c
index 477ad072070e..f99c57fde576 100644 index 25f427b93669..28d9a19edb90 100644
--- a/lib/efi_loader/efi_firmware.c --- a/lib/efi_loader/efi_firmware.c
+++ b/lib/efi_loader/efi_firmware.c +++ b/lib/efi_loader/efi_firmware.c
@@ -347,26 +347,29 @@ static efi_status_t efi_corstone1000_img_info_get ( @@ -38,26 +38,29 @@ static efi_status_t efi_corstone1000_img_info_get (
int i = 0; int i = 0;
*image_info_size = sizeof(*image_info); *image_info_size = sizeof(*image_info);
@@ -58,5 +58,5 @@ index 477ad072070e..f99c57fde576 100644
IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED; IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED;
image_info[i].attributes_setting = IMAGE_ATTRIBUTE_IMAGE_UPDATABLE; image_info[i].attributes_setting = IMAGE_ATTRIBUTE_IMAGE_UPDATABLE;
-- --
2.30.2 2.37.1
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0024-arm-corstone1000-add-mmc-for-fvp.patch
+4 -4
View File
@@ -1,7 +1,7 @@
From cbf16548dc6dcc8eea97aa18c6ae17fb848e5c6c Mon Sep 17 00:00:00 2001 From cc3356c2a30b7aa85a25e9bc7b69a03537df3f27 Mon Sep 17 00:00:00 2001
From: Rui Miguel Silva <rui.silva@linaro.org> From: Rui Miguel Silva <rui.silva@linaro.org>
Date: Tue, 5 Apr 2022 10:24:38 +0100 Date: Tue, 5 Apr 2022 10:24:38 +0100
Subject: [PATCH 27/27] arm:corstone1000: add mmc for fvp Subject: [PATCH 24/24] arm:corstone1000: add mmc for fvp
Enable support mmc/sdcard for the corstone1000 FVP. Enable support mmc/sdcard for the corstone1000 FVP.
@@ -52,7 +52,7 @@ index 1fcc137a493c..26b0f1b3cea6 100644
+ }; + };
}; };
diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c
index eff1739f0b02..936a6c9f8b89 100644 index 2fa485ff3799..3d537d7a9052 100644
--- a/board/armltd/corstone1000/corstone1000.c --- a/board/armltd/corstone1000/corstone1000.c
+++ b/board/armltd/corstone1000/corstone1000.c +++ b/board/armltd/corstone1000/corstone1000.c
@@ -46,22 +46,38 @@ static struct mm_region corstone1000_mem_map[] = { @@ -46,22 +46,38 @@ static struct mm_region corstone1000_mem_map[] = {
@@ -144,5 +144,5 @@ index 06b605e43bdf..d9855bf91ebf 100644
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
-- --
2.30.2 2.37.1