From 4d236e3fc6dd3013f4c52b7f2f03652396576e37 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Thu, 12 Jan 2023 15:32:58 -0700 Subject: zynq7: Update machine conf file using gen-machineconf tool 1. Update zc702 and zc706 machine conf file using gen-machineconf tool by parsing zc702 and zc706 xsa. 2. Move variables which changes based on xsa before required inclusion file to handle pre-expansion values. 3. Remove BOARD MACHINEOVERRIDES in conf file. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 53 +++++++++++++++++-------- meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 57 +++++++++++++++++---------- 2 files changed, 73 insertions(+), 37 deletions(-) (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf index b020936e..dc6f55b1 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf @@ -1,23 +1,44 @@ #@TYPE: Machine #@NAME: zc702-zynq7 -#@DESCRIPTION: Machine support for ZC702 Evaluation Board. -# -# For details on the Evaluation board: -# http://www.xilinx.com/products/boards-and-kits/EK-Z7-ZC702-G.htm -# For documentation and design files for the ZC702: -# http://www.xilinx.com/support/index.html/content/xilinx/en/supportNav/boards_and_kits/zynq-7000_soc_boards_and_kits/zynq-7000_soc_zc702_evaluation_kit.html -# For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files. -# +#@DESCRIPTION: Machine configuration for the ZC702 evaluation boards. +#### Preamble +MACHINEOVERRIDES =. "${@['', 'zc702-zynq7:']['zc702-zynq7' !='${MACHINE}']}" +#### Regular settings follow + +# 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 zynq-generic.conf will be set. + +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "ps7_uart_1" +YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PS7_DDR_0" +YAML_DT_BOARD_FLAGS ?= "{BOARD zc702}" + +# Yocto FSBL variables +YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "ps7_uart_1" +YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# zc702-zynq7 Serial Console +SERIAL_CONSOLES ?= "115200;ttyPS0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion require conf/machine/zynq-generic.conf -# Add board compatibility override -MACHINEOVERRIDES .= ":zc702" +# This eval board machine conf file uses zc702-zynq7 xsa as reference input. +# User can override with zc702 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "zc702-zynq7" -KERNEL_DEVICETREE = "zynq-zc702.dtb" +# 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 = "zynq-zc702.dtb" -IMAGE_BOOT_FILES += " \ - boot.bin \ - uEnv.txt \ - boot.scr \ - " +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'zc702_zynq7']['zc702-zynq7' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf index 8bf45c46..e6b7ce57 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf @@ -1,29 +1,44 @@ #@TYPE: Machine #@NAME: zc706-zynq7 -#@DESCRIPTION: Machine support for ZC706 Evaluation Board. -# -# For details on the Evaluation board: -# http://www.xilinx.com/products/boards-and-kits/EK-Z7-ZC706-G.htm -# For documentation and design files for the ZC702: -# http://www.xilinx.com/support/index.html/content/xilinx/en/supportNav/boards_and_kits/zynq-7000_soc_boards_and_kits/zynq-7000_soc_zc706_evaluation_kit.html -# For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files. -# +#@DESCRIPTION: Machine configuration for the ZC706 evaluation boards. -require conf/machine/zynq-generic.conf +#### Preamble +MACHINEOVERRIDES =. "${@['', 'zc706-zynq7:']['zc706-zynq7' !='${MACHINE}']}" +#### Regular settings follow + +# 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 zynq-generic.conf will be set. + +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "ps7_uart_1" +YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PS7_DDR_0" +YAML_DT_BOARD_FLAGS ?= "{BOARD zc706}" -# Add board compatibility override -MACHINEOVERRIDES .= ":zc706" +# Yocto FSBL variables +YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "ps7_uart_1" +YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1" -SPL_BINARY ?= "spl/boot.bin" +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# zc702-zynq7 Serial Console +SERIAL_CONSOLES ?= "115200;ttyPS0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +require conf/machine/zynq-generic.conf -EXTRA_IMAGEDEPENDS += " \ - u-boot-xlnx-uenv \ - " +# This eval board machine conf file uses zc702-zynq7 xsa as reference input. +# User can override with zc702 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "zc706-zynq7" -KERNEL_DEVICETREE = "zynq-zc706.dtb" +# 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 = "zynq-zc706.dtb" -IMAGE_BOOT_FILES += " \ - boot.bin \ - uEnv.txt \ - boot.scr \ - " +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'zc706_zynq7']['zc706-zynq7' != '${MACHINE}']}" -- cgit v1.2.3-54-g00ecf