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-09-07 15:57:27 -0500 |
commit | 232b687a3fac78c2d88f9163bfc4d1e9dbd962b9 (patch) | |
tree | b9c68ac1f2b36be4c926e83ec65abe89a789e146 /meta-xilinx-bsp/conf | |
parent | 79ee71a293cd4c9b7089fb247fd1813cffa64c38 (diff) | |
download | meta-xilinx-232b687a3fac78c2d88f9163bfc4d1e9dbd962b9.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>
Diffstat (limited to 'meta-xilinx-bsp/conf')
-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/vek280-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/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 |
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" | |||
15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}" | 15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-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/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 | |||
15 | YAML_DT_BOARD_FLAGS ?= "{BOARD template}" | 15 | YAML_DT_BOARD_FLAGS ?= "{BOARD template}" |
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/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" | |||
15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-revb}" | 15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-revb}" |
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/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 | |||
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 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 | |||
15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vmk180-reva-x-ebm-01-reva}" | 15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vmk180-reva-x-ebm-01-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/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 | |||
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 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 | |||
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 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" | |||
16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu102-rev1.0}" | 16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu102-rev1.0}" |
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/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" | |||
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 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" | |||
16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu106-reva}" | 16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu106-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/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" | |||
16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu111-reva}" | 16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu111-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 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" | |||
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 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" | |||
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 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" | |||
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 |