Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-20 19:44:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "feat(qemu): add hob support for qemu platforms" into integration

Browse source
This commit is contained in:
Olivier Deprez 2025-02-18 17:18:23 +01:00 • committed by TrustedFirmware Code Review
commit 0035ab76e5
3 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plat/qemu/common/common.mk
View file

@ -153,4 +153,12 @@ ifeq ($(BRANCH_PROTECTION),$(filter $(BRANCH_PROTECTION),1 2 3))
PLAT_BL_COMMON_SOURCES += plat/arm/common/aarch64/arm_pauth.c PLAT_BL_COMMON_SOURCES += plat/arm/common/aarch64/arm_pauth.c
endif endif
ifeq (${TRANSFER_LIST}, 1)
include lib/transfer_list/transfer_list.mk
endif
ifeq (${HOB_LIST}, 1)
include lib/hob/hob.mk
endif
endif endif

4
plat/qemu/qemu/platform.mk
View file

@ -39,10 +39,6 @@ $(eval $(call add_define,SPMC_OPTEE))
add-lib-optee := yes add-lib-optee := yes
endif endif
ifeq (${TRANSFER_LIST},1)
include lib/transfer_list/transfer_list.mk
endif
ifeq ($(NEED_BL32),yes) ifeq ($(NEED_BL32),yes)
$(eval $(call add_define,QEMU_LOAD_BL32)) $(eval $(call add_define,QEMU_LOAD_BL32))
endif endif

24
plat/qemu/qemu_sbsa/include/platform_def.h
View file

@ -150,9 +150,19 @@
*/ */
#define BL31_SIZE 0x400000 #define BL31_SIZE 0x400000
#define BL31_BASE (BL31_LIMIT - BL31_SIZE) #define BL31_BASE (BL31_LIMIT - BL31_SIZE)
#define BL31_LIMIT (BL1_RW_BASE) #define BL31_LIMIT (BL1_RW_BASE - FW_HANDOFF_SIZE)
#define BL31_PROGBITS_LIMIT BL1_RW_BASE #define BL31_PROGBITS_LIMIT BL1_RW_BASE
#if TRANSFER_LIST
#define FW_HANDOFF_BASE BL31_LIMIT
#define FW_HANDOFF_LIMIT (FW_HANDOFF_BASE + FW_HANDOFF_SIZE)
#define FW_HANDOFF_SIZE 0x4000
#else
#define FW_HANDOFF_SIZE 0
#endif
#if TRANSFER_LIST
#define FW_NS_HANDOFF_BASE (NS_IMAGE_OFFSET - FW_HANDOFF_SIZE)
#endif
/* /*
* BL3-2 specific defines. * BL3-2 specific defines.
@ -174,14 +184,14 @@
#define PLAT_PHY_ADDR_SPACE_SIZE (1ull << 42) #define PLAT_PHY_ADDR_SPACE_SIZE (1ull << 42)
#define PLAT_VIRT_ADDR_SPACE_SIZE (1ull << 42) #define PLAT_VIRT_ADDR_SPACE_SIZE (1ull << 42)
#if SPM_MM #if SPM_MM
#define MAX_MMAP_REGIONS 13
#define MAX_XLAT_TABLES 13
#elif ENABLE_RME
#define MAX_MMAP_REGIONS 15
#define MAX_XLAT_TABLES 15
#else
#define MAX_MMAP_REGIONS 12 #define MAX_MMAP_REGIONS 12
#define MAX_XLAT_TABLES 12 #define MAX_XLAT_TABLES 12
#elif ENABLE_RME
#define MAX_MMAP_REGIONS 14
#define MAX_XLAT_TABLES 14
#else
#define MAX_MMAP_REGIONS 11
#define MAX_XLAT_TABLES 11
#endif #endif
#define MAX_IO_DEVICES 3 #define MAX_IO_DEVICES 3
#define MAX_IO_HANDLES 4 #define MAX_IO_HANDLES 4