diff options
| author | Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> | 2023-07-18 16:13:45 -0600 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2023-07-20 11:56:40 -0500 |
| commit | 7a17e5f6bcda517828998333a24a6d8ceb3cb264 (patch) | |
| tree | 31496d0bb89d0a953a0015309b817e0e76056469 /meta-xilinx-bsp | |
| parent | a04e152f4f736c39cad2b8ea4d4e83f22fad30cf (diff) | |
| download | meta-xilinx-7a17e5f6bcda517828998333a24a6d8ceb3cb264.tar.gz | |
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 <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-bsp')
| -rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | 50 | ||||
| -rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | 54 |
2 files changed, 0 insertions, 104 deletions
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 @@ | |||
| 1 | #@TYPE: Machine | ||
| 2 | #@NAME: zcu1275-zynqmp | ||
| 3 | #@DESCRIPTION: Machine configuration for the ZCU1275 evaluation board. | ||
| 4 | |||
| 5 | #### Preamble | ||
| 6 | MACHINEOVERRIDES =. "${@['', 'zcu1275-zynqmp:']['zcu1275-zynqmp' !='${MACHINE}']}" | ||
| 7 | #### Regular settings follow | ||
| 8 | |||
| 9 | # Yocto device-tree variables | ||
| 10 | YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" | ||
| 11 | YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" | ||
| 12 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu1275-revb}" | ||
| 13 | |||
| 14 | # Yocto arm-trusted-firmware(TF-A) variables | ||
| 15 | ATF_CONSOLE_DEFAULT ?= "cadence" | ||
| 16 | TFA_BL33_LOAD ?= "0x8000000" | ||
| 17 | |||
| 18 | # Yocto PMUFW variables | ||
| 19 | YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" | ||
| 20 | YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" | ||
| 21 | |||
| 22 | # Yocto FSBL variables | ||
| 23 | YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" | ||
| 24 | YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" | ||
| 25 | |||
| 26 | # Yocto KERNEL Variables | ||
| 27 | UBOOT_ENTRYPOINT ?= "0x200000" | ||
| 28 | UBOOT_LOADADDRESS ?= "0x200000" | ||
| 29 | |||
| 30 | # zcu1275-zynqmp Serial Console | ||
| 31 | SERIAL_CONSOLES ?= "115200;ttyPS0" | ||
| 32 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | ||
| 33 | |||
| 34 | # Required generic machine inclusion | ||
| 35 | # ZCU1275 board uses ZynqMP DR device hence use soc variant based generic machine | ||
| 36 | # inclusion | ||
| 37 | require conf/machine/zynqmp-dr-generic.conf | ||
| 38 | |||
| 39 | # This eval board machine conf file uses zcu1275-zynqmp xsa as reference input. | ||
| 40 | # User can override with zcu1275 custom xsa using HDF_BASE and HDF_PATH variables | ||
| 41 | # from local.conf. | ||
| 42 | HDF_MACHINE = "zcu1275-zynqmp" | ||
| 43 | |||
| 44 | # KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match | ||
| 45 | # the xsa. User can enable explicitly if required from local.conf. | ||
| 46 | # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1275-revB.dtb" | ||
| 47 | |||
| 48 | #### No additional settings should be after the Postamble | ||
| 49 | #### Postamble | ||
| 50 | 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 @@ | |||
| 1 | #@TYPE: Machine | ||
| 2 | #@NAME: zcu1285-zynqmp | ||
| 3 | #@DESCRIPTION: Machine configuration for the ZCU1285 evaluation board. | ||
| 4 | |||
| 5 | #### Preamble | ||
| 6 | MACHINEOVERRIDES =. "${@['', 'zcu1285-zynqmp:']['zcu1285-zynqmp' !='${MACHINE}']}" | ||
| 7 | #### Regular settings follow | ||
| 8 | |||
| 9 | # Variables that changes based on hw design or board specific requirement must be | ||
| 10 | # defined before calling the required inclusion file else pre-expansion value | ||
| 11 | # defined in zynqmp-generic.conf will be set. | ||
| 12 | |||
| 13 | # Yocto device-tree variables | ||
| 14 | YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" | ||
| 15 | YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" | ||
| 16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zcu1285-reva}" | ||
| 17 | |||
| 18 | # Yocto arm-trusted-firmware(TF-A) variables | ||
| 19 | ATF_CONSOLE_DEFAULT ?= "cadence" | ||
| 20 | TFA_BL33_LOAD ?= "0x8000000" | ||
| 21 | |||
| 22 | # Yocto PMUFW variables | ||
| 23 | YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" | ||
| 24 | YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" | ||
| 25 | |||
| 26 | # Yocto FSBL variables | ||
| 27 | YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" | ||
| 28 | YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" | ||
| 29 | |||
| 30 | # Yocto KERNEL Variables | ||
| 31 | UBOOT_ENTRYPOINT ?= "0x200000" | ||
| 32 | UBOOT_LOADADDRESS ?= "0x200000" | ||
| 33 | |||
| 34 | # zcu1285-zynqmp Serial Console | ||
| 35 | SERIAL_CONSOLES ?= "115200;ttyPS0" | ||
| 36 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | ||
| 37 | |||
| 38 | # Required generic machine inclusion | ||
| 39 | # ZCU1285 board uses ZynqMP DR device hence use soc variant based generic machine | ||
| 40 | # inclusion | ||
| 41 | require conf/machine/zynqmp-dr-generic.conf | ||
| 42 | |||
| 43 | # This eval board machine conf file uses zcu1285-zynqmp xsa as reference input. | ||
| 44 | # User can override with zcu1285 custom xsa using HDF_BASE and HDF_PATH variables | ||
| 45 | # from local.conf. | ||
| 46 | HDF_MACHINE = "zcu1285-zynqmp" | ||
| 47 | |||
| 48 | # KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match | ||
| 49 | # the xsa. User can enable explicitly if required from local.conf. | ||
| 50 | # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1285-revA.dtb" | ||
| 51 | |||
| 52 | #### No additional settings should be after the Postamble | ||
| 53 | #### Postamble | ||
| 54 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu1285_zynqmp']['zcu1285-zynqmp' != '${MACHINE}']}" | ||
