Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-05-02 17:00:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(versal2): rename console build arg to generic" into integration

Browse source
This commit is contained in:
Joanna Farley 2025-03-19 10:48:49 +01:00 • committed by TrustedFirmware Code Review
commit c03884e51f
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plat/amd/versal2/include/def.h
View file

@ -15,14 +15,14 @@
#define MAX_INTR_EL3 2U #define MAX_INTR_EL3 2U
/* List all consoles */ /* List all consoles */
#define VERSAL2_CONSOLE_ID_none 0 #define CONSOLE_ID_none 0
#define VERSAL2_CONSOLE_ID_pl011 1 #define CONSOLE_ID_pl011 1
#define VERSAL2_CONSOLE_ID_pl011_0 1 #define CONSOLE_ID_pl011_0 1
#define VERSAL2_CONSOLE_ID_pl011_1 2 #define CONSOLE_ID_pl011_1 2
#define VERSAL2_CONSOLE_ID_dcc 3 #define CONSOLE_ID_dcc 3
#define VERSAL2_CONSOLE_ID_dtb 4 #define CONSOLE_ID_dtb 4
#define CONSOLE_IS(con) (VERSAL2_CONSOLE_ID_ ## con == VERSAL2_CONSOLE) #define CONSOLE_IS(con) (CONSOLE_ID_ ## con == CONSOLE)
/* Runtime console */ /* Runtime console */
#define RT_CONSOLE_ID_pl011 1 #define RT_CONSOLE_ID_pl011 1

8
plat/amd/versal2/platform.mk
View file

@ -71,13 +71,13 @@ endif
USE_COHERENT_MEM := 0 USE_COHERENT_MEM := 0
HW_ASSISTED_COHERENCY := 1 HW_ASSISTED_COHERENCY := 1
VERSAL2_CONSOLE ?= pl011 CONSOLE ?= pl011
ifeq (${VERSAL2_CONSOLE}, $(filter ${VERSAL2_CONSOLE},pl011 pl011_0 pl011_1 dcc dtb none)) ifeq (${CONSOLE}, $(filter ${CONSOLE},pl011 pl011_0 pl011_1 dcc dtb none))
else else
$(error "Please define VERSAL2_CONSOLE") $(error "Please define CONSOLE")
endif endif
$(eval $(call add_define_val,VERSAL2_CONSOLE,VERSAL2_CONSOLE_ID_${VERSAL2_CONSOLE})) $(eval $(call add_define_val,CONSOLE,CONSOLE_ID_${CONSOLE}))
# Runtime console in default console in DEBUG build # Runtime console in default console in DEBUG build
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)