From 7a17e5f6bcda517828998333a24a6d8ceb3cb264 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Tue, 18 Jul 2023 16:13:45 -0600 Subject: machine: Deprecate zcu1275 and zcu1285 machine conf files Since zcu1275 and zcu1285 design xsa has deprecated, hence deprecate zcu1275 and zcu1285 machine conf files. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | 50 ---------------------- meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | 54 ------------------------ 2 files changed, 104 deletions(-) delete mode 100644 meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf deleted file mode 100644 index 597c05a7..00000000 --- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf +++ /dev/null @@ -1,50 +0,0 @@ -#@TYPE: Machine -#@NAME: zcu1275-zynqmp -#@DESCRIPTION: Machine configuration for the ZCU1275 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zcu1275-zynqmp:']['zcu1275-zynqmp' !='${MACHINE}']}" -#### Regular settings follow - -# 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}" - -# 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" - -# 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 deleted file mode 100644 index 396eafe9..00000000 --- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf +++ /dev/null @@ -1,54 +0,0 @@ -#@TYPE: Machine -#@NAME: zcu1285-zynqmp -#@DESCRIPTION: Machine configuration for the ZCU1285 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zcu1285-zynqmp:']['zcu1285-zynqmp' !='${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 zynqmp-generic.conf will be set. - -# 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}" - -# 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}']}" -- cgit v1.2.3-54-g00ecf