diff options
author | Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> | 2023-08-30 16:14:27 -0600 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-08-31 09:10:25 -0500 |
commit | b7591c66b985f2eed53b0f53d1211c2255ae8e00 (patch) | |
tree | 4823bcefdbb434aa852a1cec9e604e027578ca1a | |
parent | 89d9b4727f3ddf5d561d8c27e95e06352ba29969 (diff) | |
download | meta-xilinx-b7591c66b985f2eed53b0f53d1211c2255ae8e00.tar.gz |
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>
-rw-r--r-- | meta-xilinx-bsp/conf/machine/vck190-versal.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/vck5000-versal.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/vhk158-versal.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/vmk180-versal.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/vpk120-versal.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/vpk180-versal.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf index 76b3cf1d..1b3e8123 100644 --- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf | |||
@@ -19,7 +19,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0" | |||
19 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}" | 19 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}" |
20 | 20 | ||
21 | # Yocto arm-trusted-firmware(TF-A) variables | 21 | # Yocto arm-trusted-firmware(TF-A) variables |
22 | ATF_CONSOLE_DEFAULT ?= "pl011" | 22 | ATF_CONSOLE ?= "pl011" |
23 | TFA_BL33_LOAD ?= "0x8000000" | 23 | TFA_BL33_LOAD ?= "0x8000000" |
24 | 24 | ||
25 | # Yocto PLM variables | 25 | # Yocto PLM variables |
diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf index a80788cc..d2df899e 100644 --- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf | |||
@@ -19,7 +19,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart | |||
19 | YAML_DT_BOARD_FLAGS ?= "{BOARD template}" | 19 | YAML_DT_BOARD_FLAGS ?= "{BOARD template}" |
20 | 20 | ||
21 | # Yocto arm-trusted-firmware(TF-A) variables | 21 | # Yocto arm-trusted-firmware(TF-A) variables |
22 | ATF_CONSOLE_DEFAULT ?= "pl011" | 22 | ATF_CONSOLE ?= "pl011" |
23 | TFA_BL33_LOAD ?= "0x8000000" | 23 | TFA_BL33_LOAD ?= "0x8000000" |
24 | 24 | ||
25 | # Yocto PLM variables | 25 | # Yocto PLM variables |
diff --git a/meta-xilinx-bsp/conf/machine/vhk158-versal.conf b/meta-xilinx-bsp/conf/machine/vhk158-versal.conf index 5c0406de..b9be436e 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 | |||
15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vhk158-reva}" | 15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vhk158-reva}" |
16 | 16 | ||
17 | # Yocto arm-trusted-firmware(TF-A) variables | 17 | # Yocto arm-trusted-firmware(TF-A) variables |
18 | ATF_CONSOLE_DEFAULT ?= "pl011" | 18 | ATF_CONSOLE ?= "pl011" |
19 | TFA_BL33_LOAD ?= "0x8000000" | 19 | TFA_BL33_LOAD ?= "0x8000000" |
20 | 20 | ||
21 | # Yocto PLM variables | 21 | # Yocto PLM variables |
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf index 077bf0a2..941f0aba 100644 --- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf | |||
@@ -19,7 +19,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart | |||
19 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vmk180-reva-x-ebm-01-reva}" | 19 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vmk180-reva-x-ebm-01-reva}" |
20 | 20 | ||
21 | # Yocto arm-trusted-firmware(TF-A) variables | 21 | # Yocto arm-trusted-firmware(TF-A) variables |
22 | ATF_CONSOLE_DEFAULT ?= "pl011" | 22 | ATF_CONSOLE ?= "pl011" |
23 | TFA_BL33_LOAD ?= "0x8000000" | 23 | TFA_BL33_LOAD ?= "0x8000000" |
24 | 24 | ||
25 | # Yocto PLM variables | 25 | # Yocto PLM variables |
diff --git a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf index 8eb6dea4..30818313 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 | |||
15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vpk120-reva}" | 15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vpk120-reva}" |
16 | 16 | ||
17 | # Yocto arm-trusted-firmware(TF-A) variables | 17 | # Yocto arm-trusted-firmware(TF-A) variables |
18 | ATF_CONSOLE_DEFAULT ?= "pl011" | 18 | ATF_CONSOLE ?= "pl011" |
19 | TFA_BL33_LOAD ?= "0x8000000" | 19 | TFA_BL33_LOAD ?= "0x8000000" |
20 | 20 | ||
21 | # Yocto PLM variables | 21 | # Yocto PLM variables |
diff --git a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf index 099cd956..dd2dc111 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 | |||
15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vpk180-reva}" | 15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vpk180-reva}" |
16 | 16 | ||
17 | # Yocto arm-trusted-firmware(TF-A) variables | 17 | # Yocto arm-trusted-firmware(TF-A) variables |
18 | ATF_CONSOLE_DEFAULT ?= "pl011" | 18 | ATF_CONSOLE ?= "pl011" |
19 | TFA_BL33_LOAD ?= "0x8000000" | 19 | TFA_BL33_LOAD ?= "0x8000000" |
20 | 20 | ||
21 | # Yocto PLM variables | 21 | # Yocto PLM variables |
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index 61b2bf2b..c434067d 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | |||
@@ -20,7 +20,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" | |||
20 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu102-rev1.0}" | 20 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu102-rev1.0}" |
21 | 21 | ||
22 | # Yocto arm-trusted-firmware(TF-A) variables | 22 | # Yocto arm-trusted-firmware(TF-A) variables |
23 | ATF_CONSOLE_DEFAULT ?= "cadence" | 23 | ATF_CONSOLE ?= "cadence" |
24 | TFA_BL33_LOAD ?= "0x8000000" | 24 | TFA_BL33_LOAD ?= "0x8000000" |
25 | 25 | ||
26 | # Yocto PMUFW variables | 26 | # Yocto PMUFW variables |
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf index bf38eebe..710078eb 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" | |||
16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu104-revc}" | 16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu104-revc}" |
17 | 17 | ||
18 | # Yocto arm-trusted-firmware(TF-A) variables | 18 | # Yocto arm-trusted-firmware(TF-A) variables |
19 | ATF_CONSOLE_DEFAULT ?= "cadence" | 19 | ATF_CONSOLE ?= "cadence" |
20 | TFA_BL33_LOAD ?= "0x8000000" | 20 | TFA_BL33_LOAD ?= "0x8000000" |
21 | 21 | ||
22 | # Yocto PMUFW variables | 22 | # Yocto PMUFW variables |
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index 6853edb0..23a936d8 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | |||
@@ -20,7 +20,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" | |||
20 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu106-reva}" | 20 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu106-reva}" |
21 | 21 | ||
22 | # Yocto arm-trusted-firmware(TF-A) variables | 22 | # Yocto arm-trusted-firmware(TF-A) variables |
23 | ATF_CONSOLE_DEFAULT ?= "cadence" | 23 | ATF_CONSOLE ?= "cadence" |
24 | TFA_BL33_LOAD ?= "0x8000000" | 24 | TFA_BL33_LOAD ?= "0x8000000" |
25 | 25 | ||
26 | # Yocto PMUFW variables | 26 | # Yocto PMUFW variables |
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf index 92e80460..5868449f 100644 --- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | |||
@@ -20,7 +20,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" | |||
20 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu111-reva}" | 20 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu111-reva}" |
21 | 21 | ||
22 | # Yocto arm-trusted-firmware(TF-A) variables | 22 | # Yocto arm-trusted-firmware(TF-A) variables |
23 | ATF_CONSOLE_DEFAULT ?= "cadence" | 23 | ATF_CONSOLE ?= "cadence" |
24 | TFA_BL33_LOAD ?= "0x8000000" | 24 | TFA_BL33_LOAD ?= "0x8000000" |
25 | 25 | ||
26 | # Yocto PMUFW variables | 26 | # Yocto PMUFW variables |
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf index 597c05a7..71c94038 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | |||
@@ -12,7 +12,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" | |||
12 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu1275-revb}" | 12 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu1275-revb}" |
13 | 13 | ||
14 | # Yocto arm-trusted-firmware(TF-A) variables | 14 | # Yocto arm-trusted-firmware(TF-A) variables |
15 | ATF_CONSOLE_DEFAULT ?= "cadence" | 15 | ATF_CONSOLE ?= "cadence" |
16 | TFA_BL33_LOAD ?= "0x8000000" | 16 | TFA_BL33_LOAD ?= "0x8000000" |
17 | 17 | ||
18 | # Yocto PMUFW variables | 18 | # Yocto PMUFW variables |
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf index 396eafe9..812a283f 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | |||
@@ -16,7 +16,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" | |||
16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu1285-reva}" | 16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu1285-reva}" |
17 | 17 | ||
18 | # Yocto arm-trusted-firmware(TF-A) variables | 18 | # Yocto arm-trusted-firmware(TF-A) variables |
19 | ATF_CONSOLE_DEFAULT ?= "cadence" | 19 | ATF_CONSOLE ?= "cadence" |
20 | TFA_BL33_LOAD ?= "0x8000000" | 20 | TFA_BL33_LOAD ?= "0x8000000" |
21 | 21 | ||
22 | # Yocto PMUFW variables | 22 | # Yocto PMUFW variables |
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf index d7b2f340..273606e2 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" | |||
16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu208-reva}" | 16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu208-reva}" |
17 | 17 | ||
18 | # Yocto arm-trusted-firmware(TF-A) variables | 18 | # Yocto arm-trusted-firmware(TF-A) variables |
19 | ATF_CONSOLE_DEFAULT ?= "cadence" | 19 | ATF_CONSOLE ?= "cadence" |
20 | TFA_BL33_LOAD ?= "0x8000000" | 20 | TFA_BL33_LOAD ?= "0x8000000" |
21 | 21 | ||
22 | # Yocto PMUFW variables | 22 | # Yocto PMUFW variables |
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf index 5f5856e8..80a15358 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" | |||
16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu216-reva}" | 16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu216-reva}" |
17 | 17 | ||
18 | # Yocto arm-trusted-firmware(TF-A) variables | 18 | # Yocto arm-trusted-firmware(TF-A) variables |
19 | ATF_CONSOLE_DEFAULT ?= "cadence" | 19 | ATF_CONSOLE ?= "cadence" |
20 | TFA_BL33_LOAD ?= "0x8000000" | 20 | TFA_BL33_LOAD ?= "0x8000000" |
21 | 21 | ||
22 | # Yocto PMUFW variables | 22 | # Yocto PMUFW variables |
diff --git a/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf index 6b1dd488..67f6390b 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" | |||
16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu670-revb}" | 16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu670-revb}" |
17 | 17 | ||
18 | # Yocto arm-trusted-firmware(TF-A) variables | 18 | # Yocto arm-trusted-firmware(TF-A) variables |
19 | ATF_CONSOLE_DEFAULT ?= "cadence" | 19 | ATF_CONSOLE ?= "cadence" |
20 | TFA_BL33_LOAD ?= "0x8000000" | 20 | TFA_BL33_LOAD ?= "0x8000000" |
21 | 21 | ||
22 | # Yocto PMUFW variables | 22 | # Yocto PMUFW variables |