fix(versal2): rename console build arg to generic
Rename VERSAL2_CONSOLE build argument to CONSOLE to
keep it aligned with generic build arguments.
Change-Id: I0f4967aa262f0300d8f76f6638030a1839901234
Signed-off-by: Maheedhar Bollapalli <maheedharsai.bollapalli@amd.com>
diff --git a/plat/amd/versal2/include/def.h b/plat/amd/versal2/include/def.h
index 938b118..9bef9d0 100644
--- a/plat/amd/versal2/include/def.h
+++ b/plat/amd/versal2/include/def.h
@@ -15,14 +15,14 @@
#define MAX_INTR_EL3 2U
/* List all consoles */
-#define VERSAL2_CONSOLE_ID_none 0
-#define VERSAL2_CONSOLE_ID_pl011 1
-#define VERSAL2_CONSOLE_ID_pl011_0 1
-#define VERSAL2_CONSOLE_ID_pl011_1 2
-#define VERSAL2_CONSOLE_ID_dcc 3
-#define VERSAL2_CONSOLE_ID_dtb 4
+#define CONSOLE_ID_none 0
+#define CONSOLE_ID_pl011 1
+#define CONSOLE_ID_pl011_0 1
+#define CONSOLE_ID_pl011_1 2
+#define CONSOLE_ID_dcc 3
+#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 */
#define RT_CONSOLE_ID_pl011 1
diff --git a/plat/amd/versal2/platform.mk b/plat/amd/versal2/platform.mk
index 489a063..7cd864e 100644
--- a/plat/amd/versal2/platform.mk
+++ b/plat/amd/versal2/platform.mk
@@ -71,13 +71,13 @@
USE_COHERENT_MEM := 0
HW_ASSISTED_COHERENCY := 1
-VERSAL2_CONSOLE ?= pl011
-ifeq (${VERSAL2_CONSOLE}, $(filter ${VERSAL2_CONSOLE},pl011 pl011_0 pl011_1 dcc dtb none))
+CONSOLE ?= pl011
+ifeq (${CONSOLE}, $(filter ${CONSOLE},pl011 pl011_0 pl011_1 dcc dtb none))
else
- $(error "Please define VERSAL2_CONSOLE")
+ $(error "Please define CONSOLE")
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
ifeq ($(DEBUG), 1)