From cb247b9fcabbab39fb1a146e905f1cc4ffe010e7 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Thu, 12 Jan 2023 15:32:59 -0700 Subject: zynqmp: Update machine conf file using gen-machineconf tool 1. Update below zynqmp eval board machine conf file using gen-machineconf tool by parsing respective xsa. - zcu102-zynqmp - zcu104-zynqmp - zcu106-zynqmp - zcu111-zynqmp - zcu1275-zynqmp - zcu1285-zynqmp - zcu216-zynqmp 2. Move variables which changes based on xsa before required inclusion file to handle pre-expansion values. 3. Disable U-boot SPL boot and kernel device tree by default. User has to set explicitly to use it. 4. Use use soc variant based generic machine inclusion Signed-off-by: Sandeep Gundlupet Raju Remove zcu208-zynqmp, no public XSA. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 58 ++++++++++++++++++++--- meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 55 +++++++++++++++++++--- meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 59 +++++++++++++++++++++--- meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | 59 +++++++++++++++++++++--- meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | 51 +++++++++++++++++--- meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | 55 +++++++++++++++++++--- meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf | 11 ----- meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf | 51 +++++++++++++++++--- 8 files changed, 342 insertions(+), 57 deletions(-) delete mode 100644 meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf (limited to 'meta-xilinx-bsp/conf') diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index d336043c..61b2bf2b 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -1,12 +1,58 @@ #@TYPE: Machine #@NAME: zcu102-zynqmp -#@DESCRIPTION: Machine support for ZCU102 Evaluation Board. +#@DESCRIPTION: Machine configuration for the ZCU102 evaluation board. -SOC_VARIANT = "eg" +# Compatibility with old BOARD value. +# TODO - Remove these once removed from petalinux bsp +MACHINEOVERRIDES =. "zcu102:" -require conf/machine/zynqmp-generic.conf +#### Preamble +MACHINEOVERRIDES =. "${@['', 'zcu102-zynqmp:']['zcu102-zynqmp' !='${MACHINE}']}" +#### Regular settings follow -# Add board compatibility override -MACHINEOVERRIDES .= ":zcu102" +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in zynqmp-generic.conf will be set. -KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-rev1.0.dtb" +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" +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" +TFA_BL33_LOAD ?= "0x8000000" + +# Yocto PMUFW variables +YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" + +# Yocto FSBL variables +YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# zcu102-zynqmp Serial Console +SERIAL_CONSOLES ?= "115200;ttyPS0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# ZCU102 board uses ZynqMP EG device hence use soc variant based generic machine +# inclusion +require conf/machine/zynqmp-eg-generic.conf + +# This eval board machine conf file uses zcu102-zynqmp xsa as reference input. +# User can override with zcu102 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "zcu102-zynqmp" + +# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match +# the xsa. User can enable explicitly if required from local.conf. +# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-rev1.0.dtb" + +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu102_zynqmp']['zcu102-zynqmp' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf index 942b8978..bf38eebe 100644 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf @@ -1,16 +1,57 @@ #@TYPE: Machine #@NAME: zcu104-zynqmp -#@DESCRIPTION: Machine support for ZCU104 Evaluation Board. -# +#@DESCRIPTION: Machine configuration for the ZCU104 evaluation board. -SOC_VARIANT = "ev" +#### Preamble +MACHINEOVERRIDES =. "${@['', 'zcu104-zynqmp:']['zcu104-zynqmp' !='${MACHINE}']}" +#### Regular settings follow -require conf/machine/zynqmp-generic.conf +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in zynqmp-generic.conf will be set. -# Add board compatibility override -MACHINEOVERRIDES .= ":zcu104" +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" +YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" +YAML_DT_BOARD_FLAGS ?= "{BOARD zcu104-revc}" -KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb" +# Yocto arm-trusted-firmware(TF-A) variables +ATF_CONSOLE_DEFAULT ?= "cadence" +TFA_BL33_LOAD ?= "0x8000000" + +# Yocto PMUFW variables +YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" + +# Yocto FSBL variables +YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# zcu104-zynqmp Serial Console +SERIAL_CONSOLES ?= "115200;ttyPS0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# ZCU104 board uses ZynqMP EV device hence use soc variant based generic machine +# inclusion +require conf/machine/zynqmp-ev-generic.conf + +# This eval board machine conf file uses zcu104-zynqmp xsa as reference input. +# User can override with zcu104 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "zcu104-zynqmp" + +# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match +# the xsa. User can enable explicitly if required from local.conf. +# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb" MACHINE_HWCODECS = "libomxil-xlnx" +IMAGE_FEATURES += "hwcodecs" +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu104_zynqmp']['zcu104-zynqmp' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index 03090aa8..6853edb0 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf @@ -1,14 +1,61 @@ #@TYPE: Machine #@NAME: zcu106-zynqmp -#@DESCRIPTION: Machine support for ZCU106 Evaluation Board. +#@DESCRIPTION: Machine configuration for the ZCU106 evaluation board. -SOC_VARIANT = "ev" +# Compatibility with old BOARD value. +# TODO - Remove these once removed from petalinux bsp +MACHINEOVERRIDES =. "zcu106:" -require conf/machine/zynqmp-generic.conf +#### Preamble +MACHINEOVERRIDES =. "${@['', 'zcu106-zynqmp:']['zcu106-zynqmp' !='${MACHINE}']}" +#### Regular settings follow -# Add board compatibility override -MACHINEOVERRIDES .= ":zcu106" +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in zynqmp-generic.conf will be set. -KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb" +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" +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" +TFA_BL33_LOAD ?= "0x8000000" + +# Yocto PMUFW variables +YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" + +# Yocto FSBL variables +YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# zcu106-zynqmp Serial Console +SERIAL_CONSOLES ?= "115200;ttyPS0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# ZCU106 board uses ZynqMP EV device hence use soc variant based generic machine +# inclusion +require conf/machine/zynqmp-ev-generic.conf + +# This eval board machine conf file uses zcu106-zynqmp xsa as reference input. +# User can override with zcu106 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "zcu106-zynqmp" + +# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match +# the xsa. User can enable explicitly if required from local.conf. +# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb" MACHINE_HWCODECS = "libomxil-xlnx" +IMAGE_FEATURES += "hwcodecs" + +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu106_zynqmp']['zcu106-zynqmp' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf index 09ca2b33..92e80460 100644 --- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf @@ -1,13 +1,58 @@ #@TYPE: Machine #@NAME: zcu111-zynqmp -#@DESCRIPTION: Machine support for ZCU111 Evaluation Board. -# +#@DESCRIPTION: Machine configuration for the ZCU111 evaluation board. -SOC_VARIANT = "dr" +# Compatibility with old BOARD value. +# TODO - Remove these once removed from petalinux bsp +MACHINEOVERRIDES =. "zcu111:" -require conf/machine/zynqmp-generic.conf +#### Preamble +MACHINEOVERRIDES =. "${@['', 'zcu111-zynqmp:']['zcu111-zynqmp' !='${MACHINE}']}" +#### Regular settings follow -# Add board compatibility override -MACHINEOVERRIDES .= ":zcu111" +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in zynqmp-generic.conf will be set. -KERNEL_DEVICETREE = "xilinx/zynqmp-zcu111-revA.dtb" +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" +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" +TFA_BL33_LOAD ?= "0x8000000" + +# Yocto PMUFW variables +YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" + +# Yocto FSBL variables +YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# zcu111-zynqmp Serial Console +SERIAL_CONSOLES ?= "115200;ttyPS0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# ZCU111 board uses ZynqMP DR device hence use soc variant based generic machine +# inclusion +require conf/machine/zynqmp-dr-generic.conf + +# This eval board machine conf file uses zcu111-zynqmp xsa as reference input. +# User can override with zcu111 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "zcu111-zynqmp" + +# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match +# the xsa. User can enable explicitly if required from local.conf. +# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu111-revA.dtb" + +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu111_zynqmp']['zcu111-zynqmp' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf index 8ae4e40c..597c05a7 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf @@ -1,13 +1,50 @@ #@TYPE: Machine #@NAME: zcu1275-zynqmp -#@DESCRIPTION: Machine support for ZCU1275 Evaluation Board. -# +#@DESCRIPTION: Machine configuration for the ZCU1275 evaluation board. -SOC_VARIANT = "dr" +#### Preamble +MACHINEOVERRIDES =. "${@['', 'zcu1275-zynqmp:']['zcu1275-zynqmp' !='${MACHINE}']}" +#### Regular settings follow -require conf/machine/zynqmp-generic.conf +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" +YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" +YAML_DT_BOARD_FLAGS ?= "{BOARD zcu1275-revb}" -# Add board compatibility override -MACHINEOVERRIDES .= ":zcu1275" +# Yocto arm-trusted-firmware(TF-A) variables +ATF_CONSOLE_DEFAULT ?= "cadence" +TFA_BL33_LOAD ?= "0x8000000" -KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1275-revB.dtb" +# Yocto PMUFW variables +YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" + +# Yocto FSBL variables +YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# zcu1275-zynqmp Serial Console +SERIAL_CONSOLES ?= "115200;ttyPS0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# ZCU1275 board uses ZynqMP DR device hence use soc variant based generic machine +# inclusion +require conf/machine/zynqmp-dr-generic.conf + +# This eval board machine conf file uses zcu1275-zynqmp xsa as reference input. +# User can override with zcu1275 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "zcu1275-zynqmp" + +# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match +# the xsa. User can enable explicitly if required from local.conf. +# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1275-revB.dtb" + +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu1275_zynqmp']['zcu1275-zynqmp' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf index b0743a44..396eafe9 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf @@ -1,13 +1,54 @@ #@TYPE: Machine #@NAME: zcu1285-zynqmp -#@DESCRIPTION: Machine support for ZCU1285 Evaluation Board. -# +#@DESCRIPTION: Machine configuration for the ZCU1285 evaluation board. -SOC_VARIANT = "dr" +#### Preamble +MACHINEOVERRIDES =. "${@['', 'zcu1285-zynqmp:']['zcu1285-zynqmp' !='${MACHINE}']}" +#### Regular settings follow -require conf/machine/zynqmp-generic.conf +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in zynqmp-generic.conf will be set. -# Add board compatibility override -MACHINEOVERRIDES .= ":zcu1285" +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" +YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" +YAML_DT_BOARD_FLAGS ?= "{BOARD zcu1285-reva}" -KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1285-revA.dtb" +# Yocto arm-trusted-firmware(TF-A) variables +ATF_CONSOLE_DEFAULT ?= "cadence" +TFA_BL33_LOAD ?= "0x8000000" + +# Yocto PMUFW variables +YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" + +# Yocto FSBL variables +YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# zcu1285-zynqmp Serial Console +SERIAL_CONSOLES ?= "115200;ttyPS0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# ZCU1285 board uses ZynqMP DR device hence use soc variant based generic machine +# inclusion +require conf/machine/zynqmp-dr-generic.conf + +# This eval board machine conf file uses zcu1285-zynqmp xsa as reference input. +# User can override with zcu1285 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "zcu1285-zynqmp" + +# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match +# the xsa. User can enable explicitly if required from local.conf. +# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1285-revA.dtb" + +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu1285_zynqmp']['zcu1285-zynqmp' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf deleted file mode 100644 index 0be5a3d3..00000000 --- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: zcu208-zynqmp -#@DESCRIPTION: Machine support for ZCU208 Evaluation Board. -# - -SOC_VARIANT = "dr" - -require conf/machine/zynqmp-generic.conf - -# Add board compatibility override -MACHINEOVERRIDES .= ":zcu208" diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf index cba83052..5f5856e8 100644 --- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf @@ -1,11 +1,50 @@ #@TYPE: Machine #@NAME: zcu216-zynqmp -#@DESCRIPTION: Machine support for ZCU216 Evaluation Board. -# +#@DESCRIPTION: Machine configuration for the ZCU216 evaluation board. -SOC_VARIANT = "dr" +#### Preamble +MACHINEOVERRIDES =. "${@['', 'zcu216-zynqmp:']['zcu216-zynqmp' !='${MACHINE}']}" +#### Regular settings follow -require conf/machine/zynqmp-generic.conf +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in zynqmp-generic.conf will be set. -# Add board compatibility override -MACHINEOVERRIDES .= ":zcu216" +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" +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" +TFA_BL33_LOAD ?= "0x8000000" + +# Yocto PMUFW variables +YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" + +# Yocto FSBL variables +YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# zcu216-zynqmp Serial Console +SERIAL_CONSOLES ?= "115200;ttyPS0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# ZCU216 board uses ZynqMP DR device hence use soc variant based generic machine +# inclusion +require conf/machine/zynqmp-dr-generic.conf + +# This eval board machine conf file uses zcu216-zynqmp xsa as reference input. +# User can override with zcu216 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "zcu216-zynqmp" + +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu216_zynqmp']['zcu216-zynqmp' != '${MACHINE}']}" -- cgit v1.2.3-54-g00ecf