meta-xilinx-bsp:machine: Use ATF_CONSOLE instead of ATF_CONSOLE_DEFAULT

In arm-trusted-firmware recipe, ATF_CONSOLE_DEFAULT variable has
override and setting this variable value from local.conf and
machine.conf will not be effective during variable pre-expansion values.
Hence use ATF_CONSOLE instead of ATF_CONSOLE_DEFAULT in machine conf
files.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

14 files changed, 14 insertions, 14 deletions

diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index db5d0a95..ed049268 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
index 975cde93..9396bd97 100644
--- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart
 YAML_DT_BOARD_FLAGS ?= "{BOARD template}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/vek280-versal.conf b/meta-xilinx-bsp/conf/machine/vek280-versal.conf
index 75723946..625cbca1 100644
--- a/meta-xilinx-bsp/conf/machine/vek280-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vek280-versal.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-revb}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/vhk158-versal.conf b/meta-xilinx-bsp/conf/machine/vhk158-versal.conf
index e22f264c..b09bde28 100644
--- a/meta-xilinx-bsp/conf/machine/vhk158-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vhk158-versal.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vhk158-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index d0d58b0f..0f474f78 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vmk180-reva-x-ebm-01-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
index b9f36564..e200d42d 100644
--- a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vpk120-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
index 9b06ef8f..92630e97 100644
--- a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vpk180-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 9e5e556a..acd2544a 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -16,7 +16,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu102-rev1.0}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index 80bd34de..b4c11f3a 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -16,7 +16,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu104-revc}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index be48e178..ff273134 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -16,7 +16,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu106-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index 4cf028de..77da93ca 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -16,7 +16,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu111-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
index be1f310c..7bb2c9db 100644
--- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
@@ -16,7 +16,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu208-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index cd2644af..f4e1619d 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -16,7 +16,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu216-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf
index 48f81474..c726e9f5 100644
--- a/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf
@@ -16,7 +16,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD zcu670-revb}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables