From db2ce4c937dc1f20ef439c17131a3613cb256236 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Tue, 18 Jul 2023 16:13:43 -0600 Subject: machine: Update machine conf file using gen-machineconf tool 1. Add missing space to append operation for machine files generated by gen-machineconf tool. 2. Update all machine conf file using gen-machineconf tool by parsing latest xsa. a. Reorder the variables to match the gen-machineconf tool output. b. Add any missing or new variables. 3. Remove machine overrides for XSCTH_PROC variable. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- .../conf/machine/ac701-microblazeel.conf | 24 ++++++++++++++-------- .../conf/machine/kc705-microblazeel.conf | 12 +++++------ .../conf/machine/kcu105-microblazeel.conf | 24 ++++++++++++++-------- meta-xilinx-bsp/conf/machine/vck190-versal.conf | 2 +- meta-xilinx-bsp/conf/machine/vck5000-versal.conf | 2 +- .../conf/machine/vcu118-microblazeel.conf | 20 ++++++++++-------- meta-xilinx-bsp/conf/machine/vek280-versal.conf | 10 ++++++++- meta-xilinx-bsp/conf/machine/vhk158-versal.conf | 4 ++-- meta-xilinx-bsp/conf/machine/vmk180-versal.conf | 2 +- meta-xilinx-bsp/conf/machine/vpk120-versal.conf | 4 ++-- meta-xilinx-bsp/conf/machine/vpk180-versal.conf | 4 ++-- meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 4 ++-- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 3 ++- meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 3 ++- meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf | 2 +- 20 files changed, 80 insertions(+), 50 deletions(-) diff --git a/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf b/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf index 88a0d7bb..27cb3939 100644 --- a/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf +++ b/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf @@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'ac701-microblazeel:']['ac701-microblazeel' !='${MA # defined before calling the required inclusion file else pre-expansion value # defined in microblazeel-generic.conf will be set. -# Yocto AC701 FS-Boot variables -YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "MIG_7SERIES_0" -YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" -XSCTH_PROC:pn-fs-boot ?= "microblaze_0" - # Yocto AC701 device-tree variables YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0" @@ -25,6 +18,21 @@ DTC_FLAGS:pn-device-tree ?= "" XSCTH_PROC:pn-device-tree ?= "microblaze_0" YAML_DT_BOARD_FLAGS ?= "{BOARD ac701-full}" +# Yocto FS-Boot variables +YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" +YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "MIG_7SERIES_0" +YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" +XSCTH_PROC:pn-fs-boot ?= "microblaze_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x80000000" +UBOOT_LOADADDRESS ?= "0x80000000" + +# ac701-microblazeel Serial Console +SERIAL_CONSOLES ?= "115200;ttyUL0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + # Set DDR Base address for u-boot-xlnx-scr variables DDR_BASEADDR ?= "0x80000000" SKIP_APPEND_BASEADDR ?= "0" @@ -39,4 +47,4 @@ HDF_MACHINE = "ac701-microblazeel" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'ac701_microblazeel']['ac701-microblazeel' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' ac701_microblazeel']['ac701-microblazeel' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf index f24d0356..f3236f07 100644 --- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf +++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf @@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0" DT_PADDING_SIZE:pn-device-tree ?= "0x1000" DTC_FLAGS:pn-device-tree ?= "" -XSCTH_PROC:microblaze:pn-device-tree ?= "microblaze_0" +XSCTH_PROC:pn-device-tree ?= "microblaze_0" YAML_DT_BOARD_FLAGS ?= "{BOARD kc705-full}" # Yocto FS-Boot variables @@ -29,14 +29,14 @@ XSCTH_PROC:pn-fs-boot ?= "microblaze_0" UBOOT_ENTRYPOINT ?= "0x80000000" UBOOT_LOADADDRESS ?= "0x80000000" -# Set DDR Base address for u-boot-xlnx-scr variables -DDR_BASEADDR ?= "0x80000000" -SKIP_APPEND_BASEADDR ?= "0" - # kc705-microblazeel Serial Console SERIAL_CONSOLES ?= "115200;ttyUL0" YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" +# Set DDR Base address for u-boot-xlnx-scr variables +DDR_BASEADDR ?= "0x80000000" +SKIP_APPEND_BASEADDR ?= "0" + # Required generic machine inclusion require conf/machine/microblaze-generic.conf @@ -47,4 +47,4 @@ HDF_MACHINE = "kc705-microblazeel" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'kc705_microblazeel']['kc705-microblazeel' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' kc705_microblazeel']['kc705-microblazeel' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf index 3edf190e..a866f87c 100644 --- a/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf +++ b/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf @@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'kcu105-microblazeel:']['kcu105-microblazeel' !='${ # defined before calling the required inclusion file else pre-expansion value # defined in microblazeel-generic.conf will be set. -# Yocto KCU105 FS-Boot variables -YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0" -YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" -XSCTH_PROC:pn-fs-boot ?= "microblaze_0" - # Yocto KCU105 device-tree variables YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0" @@ -25,6 +18,21 @@ DTC_FLAGS:pn-device-tree ?= "" XSCTH_PROC:pn-device-tree ?= "microblaze_0" YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}" +# Yocto FS-Boot variables +YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" +YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0" +YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" +XSCTH_PROC:pn-fs-boot ?= "microblaze_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x80000000" +UBOOT_LOADADDRESS ?= "0x80000000" + +# kcu105-microblazeel Serial Console +SERIAL_CONSOLES ?= "115200;ttyUL0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + # Set DDR Base address for u-boot-xlnx-scr variables DDR_BASEADDR ?= "0x80000000" SKIP_APPEND_BASEADDR ?= "0" @@ -39,4 +47,4 @@ HDF_MACHINE = "kcu105-microblazeel" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'kcu105_microblazeel']['kcu105-microblazeel' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' kcu105_microblazeel']['kcu105-microblazeel' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf index 02f1c015..db5d0a95 100644 --- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf @@ -42,4 +42,4 @@ HDF_MACHINE = "vck190-versal" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'vck190_versal']['vck190-versal' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' vck190_versal']['vck190-versal' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf index e77a4cfc..975cde93 100644 --- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf @@ -42,4 +42,4 @@ HDF_MACHINE = "vck5000-versal" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'vck5000_versal']['vck5000-versal' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' vck5000_versal']['vck5000-versal' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf b/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf index ada52ceb..bfd60336 100644 --- a/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf +++ b/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf @@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'vcu118-microblazeel:']['vcu118-microblazeel' !='${ # defined before calling the required inclusion file else pre-expansion value # defined in microblazeel-generic.conf will be set. -# Yocto VCU118 FS-Boot variables -YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0" -YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" -XSCTH_PROC:pn-fs-boot ?= "microblaze_0" - # Yocto VCU118 device-tree variables YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0" @@ -25,10 +18,21 @@ DTC_FLAGS:pn-device-tree ?= "" XSCTH_PROC:pn-device-tree ?= "microblaze_0" YAML_DT_BOARD_FLAGS ?= "{BOARD vcu118-rev2.0}" +# Yocto FS-Boot variables +YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" +YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0" +YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" +XSCTH_PROC:pn-fs-boot ?= "microblaze_0" + # Yocto KERNEL Variables UBOOT_ENTRYPOINT ?= "0x80000000" UBOOT_LOADADDRESS ?= "0x80000000" +# vcu118-microblazeel Serial Console +SERIAL_CONSOLES ?= "115200;ttyUL0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + # Set DDR Base address for u-boot-xlnx-scr variables DDR_BASEADDR ?= "0x80000000" SKIP_APPEND_BASEADDR ?= "0" @@ -43,4 +47,4 @@ HDF_MACHINE = "vcu118-microblazeel" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'vcu118_microblazeel']['vcu118-microblazeel' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' vcu118_microblazeel']['vcu118-microblazeel' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vek280-versal.conf b/meta-xilinx-bsp/conf/machine/vek280-versal.conf index 457a49d6..75723946 100644 --- a/meta-xilinx-bsp/conf/machine/vek280-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vek280-versal.conf @@ -14,10 +14,18 @@ MACHINEOVERRIDES =. "${@['', 'vek280-versal:']['vek280-versal' !='${MACHINE}']}" YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0" YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-revb}" +# Yocto arm-trusted-firmware(TF-A) variables +ATF_CONSOLE_DEFAULT ?= "pl011" +TFA_BL33_LOAD ?= "0x8000000" + # Yocto PLM variables YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + # vek280-versal Serial Console SERIAL_CONSOLES ?= "115200;ttyAMA0" YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" @@ -42,4 +50,4 @@ MACHINE_FEATURES += "vdu" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'vek280_versal']['vek280-versal' != '${MACHINE}']}" \ No newline at end of file +PACKAGE_EXTRA_ARCHS:append = "${@['', ' vek280_versal']['vek280-versal' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vhk158-versal.conf b/meta-xilinx-bsp/conf/machine/vhk158-versal.conf index 5c0406de..e22f264c 100644 --- a/meta-xilinx-bsp/conf/machine/vhk158-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vhk158-versal.conf @@ -26,7 +26,7 @@ YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauar UBOOT_ENTRYPOINT ?= "0x200000" UBOOT_LOADADDRESS ?= "0x200000" -# vhk158-versal Serial Console +# vhk158-versal Serial Console SERIAL_CONSOLES ?= "115200;ttyAMA0" YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" @@ -49,4 +49,4 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'vhk158_versal']['vhk158-versal' != '${MACHINE}']}" \ No newline at end of file +PACKAGE_EXTRA_ARCHS:append = "${@['', ' vhk158_versal']['vhk158-versal' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf index 2ccbca05..d0d58b0f 100644 --- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf @@ -42,4 +42,4 @@ HDF_MACHINE = "vmk180-versal" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'vmk180_versal']['vmk180-versal' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' vmk180_versal']['vmk180-versal' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf index 8eb6dea4..b9f36564 100644 --- a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf @@ -26,7 +26,7 @@ YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauar UBOOT_ENTRYPOINT ?= "0x200000" UBOOT_LOADADDRESS ?= "0x200000" -# vpk120-versal Serial Console +# vpk120-versal Serial Console SERIAL_CONSOLES ?= "115200;ttyAMA0" YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" @@ -45,4 +45,4 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'vpk120_versal']['vpk120-versal' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' vpk120_versal']['vpk120-versal' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf index 099cd956..9b06ef8f 100644 --- a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf @@ -26,7 +26,7 @@ YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauar UBOOT_ENTRYPOINT ?= "0x200000" UBOOT_LOADADDRESS ?= "0x200000" -# vpk180-versal Serial Console +# vpk180-versal Serial Console SERIAL_CONSOLES ?= "115200;ttyAMA0" YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" @@ -45,4 +45,4 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'vpk180_versal']['vpk180-versal' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' vpk180_versal']['vpk180-versal' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf index dc6f55b1..1db0616f 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf @@ -41,4 +41,4 @@ HDF_MACHINE = "zc702-zynq7" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'zc702_zynq7']['zc702-zynq7' != '${MACHINE}']}" +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 e6b7ce57..7e0525d1 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf @@ -23,7 +23,7 @@ YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1" UBOOT_ENTRYPOINT ?= "0x200000" UBOOT_LOADADDRESS ?= "0x200000" -# zc702-zynq7 Serial Console +# zc706-zynq7 Serial Console SERIAL_CONSOLES ?= "115200;ttyPS0" YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" @@ -41,4 +41,4 @@ HDF_MACHINE = "zc706-zynq7" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'zc706_zynq7']['zc706-zynq7' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' zc706_zynq7']['zc706-zynq7' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index 52a2a194..9e5e556a 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -51,4 +51,4 @@ HDF_MACHINE = "zcu102-zynqmp" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu102_zynqmp']['zcu102-zynqmp' != '${MACHINE}']}" +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 bf38eebe..80bd34de 100644 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf @@ -49,9 +49,10 @@ HDF_MACHINE = "zcu104-zynqmp" # the xsa. User can enable explicitly if required from local.conf. # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb" +# Yocto IMAGE_FEATURES Variable 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}']}" +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 0cc55654..be48e178 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf @@ -49,9 +49,10 @@ HDF_MACHINE = "zcu106-zynqmp" # the xsa. User can enable explicitly if required from local.conf. # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb" +# Yocto IMAGE_FEATURES Variable 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}']}" +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 493b1f13..4cf028de 100644 --- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf @@ -51,4 +51,4 @@ HDF_MACHINE = "zcu111-zynqmp" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu111_zynqmp']['zcu111-zynqmp' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu111_zynqmp']['zcu111-zynqmp' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf index d7b2f340..be1f310c 100644 --- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf @@ -47,4 +47,4 @@ HDF_MACHINE = "zcu208-zynqmp" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu208_zynqmp']['zcu208-zynqmp' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu208_zynqmp']['zcu208-zynqmp' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf index 5f5856e8..cd2644af 100644 --- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf @@ -47,4 +47,4 @@ HDF_MACHINE = "zcu216-zynqmp" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu216_zynqmp']['zcu216-zynqmp' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu216_zynqmp']['zcu216-zynqmp' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf index 6b1dd488..48f81474 100644 --- a/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf @@ -47,4 +47,4 @@ HDF_MACHINE = "zcu670-zynqmp" #### No additional settings should be after the Postamble #### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu670_zynqmp']['zcu670-zynqmp' != '${MACHINE}']}" +PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu670_zynqmp']['zcu670-zynqmp' != '${MACHINE}']}" -- cgit v1.2.3-54-g00ecf