diff options
Diffstat (limited to 'meta-xilinx-bsp/conf/machine')
19 files changed, 91 insertions, 67 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 | |||
10 | # defined before calling the required inclusion file else pre-expansion value | 10 | # defined before calling the required inclusion file else pre-expansion value |
11 | # defined in microblazeel-generic.conf will be set. | 11 | # defined in microblazeel-generic.conf will be set. |
12 | 12 | ||
13 | # Yocto AC701 FS-Boot variables | ||
14 | YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" | ||
15 | YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" | ||
16 | YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "MIG_7SERIES_0" | ||
17 | YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" | ||
18 | XSCTH_PROC:pn-fs-boot ?= "microblaze_0" | ||
19 | |||
20 | # Yocto AC701 device-tree variables | 13 | # Yocto AC701 device-tree variables |
21 | YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" | 14 | YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" |
22 | YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0" | 15 | YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0" |
@@ -25,6 +18,21 @@ DTC_FLAGS:pn-device-tree ?= "" | |||
25 | XSCTH_PROC:pn-device-tree ?= "microblaze_0" | 18 | XSCTH_PROC:pn-device-tree ?= "microblaze_0" |
26 | YAML_DT_BOARD_FLAGS ?= "{BOARD ac701-full}" | 19 | YAML_DT_BOARD_FLAGS ?= "{BOARD ac701-full}" |
27 | 20 | ||
21 | # Yocto FS-Boot variables | ||
22 | YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" | ||
23 | YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" | ||
24 | YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "MIG_7SERIES_0" | ||
25 | YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" | ||
26 | XSCTH_PROC:pn-fs-boot ?= "microblaze_0" | ||
27 | |||
28 | # Yocto KERNEL Variables | ||
29 | UBOOT_ENTRYPOINT ?= "0x80000000" | ||
30 | UBOOT_LOADADDRESS ?= "0x80000000" | ||
31 | |||
32 | # ac701-microblazeel Serial Console | ||
33 | SERIAL_CONSOLES ?= "115200;ttyUL0" | ||
34 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | ||
35 | |||
28 | # Set DDR Base address for u-boot-xlnx-scr variables | 36 | # Set DDR Base address for u-boot-xlnx-scr variables |
29 | DDR_BASEADDR ?= "0x80000000" | 37 | DDR_BASEADDR ?= "0x80000000" |
30 | SKIP_APPEND_BASEADDR ?= "0" | 38 | SKIP_APPEND_BASEADDR ?= "0" |
@@ -39,4 +47,4 @@ HDF_MACHINE = "ac701-microblazeel" | |||
39 | 47 | ||
40 | #### No additional settings should be after the Postamble | 48 | #### No additional settings should be after the Postamble |
41 | #### Postamble | 49 | #### Postamble |
42 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'ac701_microblazeel']['ac701-microblazeel' != '${MACHINE}']}" | 50 | 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" | |||
15 | YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0" | 15 | YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0" |
16 | DT_PADDING_SIZE:pn-device-tree ?= "0x1000" | 16 | DT_PADDING_SIZE:pn-device-tree ?= "0x1000" |
17 | DTC_FLAGS:pn-device-tree ?= "" | 17 | DTC_FLAGS:pn-device-tree ?= "" |
18 | XSCTH_PROC:microblaze:pn-device-tree ?= "microblaze_0" | 18 | XSCTH_PROC:pn-device-tree ?= "microblaze_0" |
19 | YAML_DT_BOARD_FLAGS ?= "{BOARD kc705-full}" | 19 | YAML_DT_BOARD_FLAGS ?= "{BOARD kc705-full}" |
20 | 20 | ||
21 | # Yocto FS-Boot variables | 21 | # Yocto FS-Boot variables |
@@ -29,14 +29,14 @@ XSCTH_PROC:pn-fs-boot ?= "microblaze_0" | |||
29 | UBOOT_ENTRYPOINT ?= "0x80000000" | 29 | UBOOT_ENTRYPOINT ?= "0x80000000" |
30 | UBOOT_LOADADDRESS ?= "0x80000000" | 30 | UBOOT_LOADADDRESS ?= "0x80000000" |
31 | 31 | ||
32 | # Set DDR Base address for u-boot-xlnx-scr variables | ||
33 | DDR_BASEADDR ?= "0x80000000" | ||
34 | SKIP_APPEND_BASEADDR ?= "0" | ||
35 | |||
36 | # kc705-microblazeel Serial Console | 32 | # kc705-microblazeel Serial Console |
37 | SERIAL_CONSOLES ?= "115200;ttyUL0" | 33 | SERIAL_CONSOLES ?= "115200;ttyUL0" |
38 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | 34 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" |
39 | 35 | ||
36 | # Set DDR Base address for u-boot-xlnx-scr variables | ||
37 | DDR_BASEADDR ?= "0x80000000" | ||
38 | SKIP_APPEND_BASEADDR ?= "0" | ||
39 | |||
40 | # Required generic machine inclusion | 40 | # Required generic machine inclusion |
41 | require conf/machine/microblaze-generic.conf | 41 | require conf/machine/microblaze-generic.conf |
42 | 42 | ||
@@ -47,4 +47,4 @@ HDF_MACHINE = "kc705-microblazeel" | |||
47 | 47 | ||
48 | #### No additional settings should be after the Postamble | 48 | #### No additional settings should be after the Postamble |
49 | #### Postamble | 49 | #### Postamble |
50 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'kc705_microblazeel']['kc705-microblazeel' != '${MACHINE}']}" | 50 | 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' !='${ | |||
10 | # defined before calling the required inclusion file else pre-expansion value | 10 | # defined before calling the required inclusion file else pre-expansion value |
11 | # defined in microblazeel-generic.conf will be set. | 11 | # defined in microblazeel-generic.conf will be set. |
12 | 12 | ||
13 | # Yocto KCU105 FS-Boot variables | ||
14 | YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" | ||
15 | YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" | ||
16 | YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0" | ||
17 | YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" | ||
18 | XSCTH_PROC:pn-fs-boot ?= "microblaze_0" | ||
19 | |||
20 | # Yocto KCU105 device-tree variables | 13 | # Yocto KCU105 device-tree variables |
21 | YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" | 14 | YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" |
22 | YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0" | 15 | YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0" |
@@ -25,6 +18,21 @@ DTC_FLAGS:pn-device-tree ?= "" | |||
25 | XSCTH_PROC:pn-device-tree ?= "microblaze_0" | 18 | XSCTH_PROC:pn-device-tree ?= "microblaze_0" |
26 | YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}" | 19 | YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}" |
27 | 20 | ||
21 | # Yocto FS-Boot variables | ||
22 | YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" | ||
23 | YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" | ||
24 | YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0" | ||
25 | YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" | ||
26 | XSCTH_PROC:pn-fs-boot ?= "microblaze_0" | ||
27 | |||
28 | # Yocto KERNEL Variables | ||
29 | UBOOT_ENTRYPOINT ?= "0x80000000" | ||
30 | UBOOT_LOADADDRESS ?= "0x80000000" | ||
31 | |||
32 | # kcu105-microblazeel Serial Console | ||
33 | SERIAL_CONSOLES ?= "115200;ttyUL0" | ||
34 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | ||
35 | |||
28 | # Set DDR Base address for u-boot-xlnx-scr variables | 36 | # Set DDR Base address for u-boot-xlnx-scr variables |
29 | DDR_BASEADDR ?= "0x80000000" | 37 | DDR_BASEADDR ?= "0x80000000" |
30 | SKIP_APPEND_BASEADDR ?= "0" | 38 | SKIP_APPEND_BASEADDR ?= "0" |
@@ -39,4 +47,4 @@ HDF_MACHINE = "kcu105-microblazeel" | |||
39 | 47 | ||
40 | #### No additional settings should be after the Postamble | 48 | #### No additional settings should be after the Postamble |
41 | #### Postamble | 49 | #### Postamble |
42 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'kcu105_microblazeel']['kcu105-microblazeel' != '${MACHINE}']}" | 50 | 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 1b3e8123..ed049268 100644 --- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf | |||
@@ -2,10 +2,6 @@ | |||
2 | #@NAME: vck190-versal | 2 | #@NAME: vck190-versal |
3 | #@DESCRIPTION: Machine configuration for the VCK190 evaluation board. | 3 | #@DESCRIPTION: Machine configuration for the VCK190 evaluation board. |
4 | 4 | ||
5 | # Compatibility with old BOARD value. | ||
6 | # TODO - Remove these once removed from petalinux bsp | ||
7 | MACHINEOVERRIDES =. "vck190:" | ||
8 | |||
9 | #### Preamble | 5 | #### Preamble |
10 | MACHINEOVERRIDES =. "${@['', 'vck190-versal:']['vck190-versal' !='${MACHINE}']}" | 6 | MACHINEOVERRIDES =. "${@['', 'vck190-versal:']['vck190-versal' !='${MACHINE}']}" |
11 | #### Regular settings follow | 7 | #### Regular settings follow |
@@ -46,4 +42,4 @@ HDF_MACHINE = "vck190-versal" | |||
46 | 42 | ||
47 | #### No additional settings should be after the Postamble | 43 | #### No additional settings should be after the Postamble |
48 | #### Postamble | 44 | #### Postamble |
49 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'vck190_versal']['vck190-versal' != '${MACHINE}']}" | 45 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' vck190_versal']['vck190-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' !='${ | |||
10 | # defined before calling the required inclusion file else pre-expansion value | 10 | # defined before calling the required inclusion file else pre-expansion value |
11 | # defined in microblazeel-generic.conf will be set. | 11 | # defined in microblazeel-generic.conf will be set. |
12 | 12 | ||
13 | # Yocto VCU118 FS-Boot variables | ||
14 | YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" | ||
15 | YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" | ||
16 | YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0" | ||
17 | YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" | ||
18 | XSCTH_PROC:pn-fs-boot ?= "microblaze_0" | ||
19 | |||
20 | # Yocto VCU118 device-tree variables | 13 | # Yocto VCU118 device-tree variables |
21 | YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" | 14 | YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" |
22 | YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0" | 15 | YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0" |
@@ -25,10 +18,21 @@ DTC_FLAGS:pn-device-tree ?= "" | |||
25 | XSCTH_PROC:pn-device-tree ?= "microblaze_0" | 18 | XSCTH_PROC:pn-device-tree ?= "microblaze_0" |
26 | YAML_DT_BOARD_FLAGS ?= "{BOARD vcu118-rev2.0}" | 19 | YAML_DT_BOARD_FLAGS ?= "{BOARD vcu118-rev2.0}" |
27 | 20 | ||
21 | # Yocto FS-Boot variables | ||
22 | YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" | ||
23 | YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" | ||
24 | YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0" | ||
25 | YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" | ||
26 | XSCTH_PROC:pn-fs-boot ?= "microblaze_0" | ||
27 | |||
28 | # Yocto KERNEL Variables | 28 | # Yocto KERNEL Variables |
29 | UBOOT_ENTRYPOINT ?= "0x80000000" | 29 | UBOOT_ENTRYPOINT ?= "0x80000000" |
30 | UBOOT_LOADADDRESS ?= "0x80000000" | 30 | UBOOT_LOADADDRESS ?= "0x80000000" |
31 | 31 | ||
32 | # vcu118-microblazeel Serial Console | ||
33 | SERIAL_CONSOLES ?= "115200;ttyUL0" | ||
34 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | ||
35 | |||
32 | # Set DDR Base address for u-boot-xlnx-scr variables | 36 | # Set DDR Base address for u-boot-xlnx-scr variables |
33 | DDR_BASEADDR ?= "0x80000000" | 37 | DDR_BASEADDR ?= "0x80000000" |
34 | SKIP_APPEND_BASEADDR ?= "0" | 38 | SKIP_APPEND_BASEADDR ?= "0" |
@@ -43,4 +47,4 @@ HDF_MACHINE = "vcu118-microblazeel" | |||
43 | 47 | ||
44 | #### No additional settings should be after the Postamble | 48 | #### No additional settings should be after the Postamble |
45 | #### Postamble | 49 | #### Postamble |
46 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'vcu118_microblazeel']['vcu118-microblazeel' != '${MACHINE}']}" | 50 | 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 b533b833..625cbca1 100644 --- a/meta-xilinx-bsp/conf/machine/vek280-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vek280-versal.conf | |||
@@ -12,12 +12,20 @@ MACHINEOVERRIDES =. "${@['', 'vek280-versal:']['vek280-versal' !='${MACHINE}']}" | |||
12 | 12 | ||
13 | # Yocto device-tree variables | 13 | # Yocto device-tree variables |
14 | YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0" | 14 | YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0" |
15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-reva}" | 15 | YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-revb}" |
16 | |||
17 | # Yocto arm-trusted-firmware(TF-A) variables | ||
18 | ATF_CONSOLE ?= "pl011" | ||
19 | TFA_BL33_LOAD ?= "0x8000000" | ||
16 | 20 | ||
17 | # Yocto PLM variables | 21 | # Yocto PLM variables |
18 | YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" | 22 | YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" |
19 | YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" | 23 | YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" |
20 | 24 | ||
25 | # Yocto KERNEL Variables | ||
26 | UBOOT_ENTRYPOINT ?= "0x200000" | ||
27 | UBOOT_LOADADDRESS ?= "0x200000" | ||
28 | |||
21 | # vek280-versal Serial Console | 29 | # vek280-versal Serial Console |
22 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 30 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
23 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | 31 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" |
@@ -30,6 +38,16 @@ require conf/machine/versal-ai-edge-generic.conf | |||
30 | # from local.conf. | 38 | # from local.conf. |
31 | HDF_MACHINE = "vek280-versal" | 39 | HDF_MACHINE = "vek280-versal" |
32 | 40 | ||
41 | # VEK280 board has 12GB memory only but default versal-generic has QB_MEM set to | ||
42 | # 8G, Hence we need set 12G in QB_MEM. | ||
43 | QB_MEM = "-m 12G" | ||
44 | |||
45 | QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vek280.dtb" | ||
46 | QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb" | ||
47 | |||
48 | # Yocto MACHINE_FEATURES Variable | ||
49 | MACHINE_FEATURES += "vdu" | ||
50 | |||
33 | #### No additional settings should be after the Postamble | 51 | #### No additional settings should be after the Postamble |
34 | #### Postamble | 52 | #### Postamble |
35 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'vek280_versal']['vek280-versal' != '${MACHINE}']}" \ No newline at end of file | 53 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' vek280_versal']['vek280-versal' != '${MACHINE}']}" |
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf index 941f0aba..0f474f78 100644 --- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf | |||
@@ -2,10 +2,6 @@ | |||
2 | #@NAME: vmk180-versal | 2 | #@NAME: vmk180-versal |
3 | #@DESCRIPTION: Machine configuration for the VMK180 evaluation board. | 3 | #@DESCRIPTION: Machine configuration for the VMK180 evaluation board. |
4 | 4 | ||
5 | # Compatibility with old BOARD value. | ||
6 | # TODO - Remove these once removed from petalinux bsp | ||
7 | MACHINEOVERRIDES =. "vmk180:" | ||
8 | |||
9 | #### Preamble | 5 | #### Preamble |
10 | MACHINEOVERRIDES =. "${@['', 'vmk180-versal:']['vmk180-versal' !='${MACHINE}']}" | 6 | MACHINEOVERRIDES =. "${@['', 'vmk180-versal:']['vmk180-versal' !='${MACHINE}']}" |
11 | #### Regular settings follow | 7 | #### Regular settings follow |
@@ -46,4 +42,4 @@ HDF_MACHINE = "vmk180-versal" | |||
46 | 42 | ||
47 | #### No additional settings should be after the Postamble | 43 | #### No additional settings should be after the Postamble |
48 | #### Postamble | 44 | #### Postamble |
49 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'vmk180_versal']['vmk180-versal' != '${MACHINE}']}" | 45 | 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 30818313..e200d42d 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 | |||
26 | UBOOT_ENTRYPOINT ?= "0x200000" | 26 | UBOOT_ENTRYPOINT ?= "0x200000" |
27 | UBOOT_LOADADDRESS ?= "0x200000" | 27 | UBOOT_LOADADDRESS ?= "0x200000" |
28 | 28 | ||
29 | # vpk120-versal Serial Console | 29 | # vpk120-versal Serial Console |
30 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 30 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
31 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | 31 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" |
32 | 32 | ||
@@ -45,4 +45,4 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb" | |||
45 | 45 | ||
46 | #### No additional settings should be after the Postamble | 46 | #### No additional settings should be after the Postamble |
47 | #### Postamble | 47 | #### Postamble |
48 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'vpk120_versal']['vpk120-versal' != '${MACHINE}']}" | 48 | 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 dd2dc111..92630e97 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 | |||
26 | UBOOT_ENTRYPOINT ?= "0x200000" | 26 | UBOOT_ENTRYPOINT ?= "0x200000" |
27 | UBOOT_LOADADDRESS ?= "0x200000" | 27 | UBOOT_LOADADDRESS ?= "0x200000" |
28 | 28 | ||
29 | # vpk180-versal Serial Console | 29 | # vpk180-versal Serial Console |
30 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 30 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
31 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | 31 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" |
32 | 32 | ||
@@ -45,4 +45,4 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb" | |||
45 | 45 | ||
46 | #### No additional settings should be after the Postamble | 46 | #### No additional settings should be after the Postamble |
47 | #### Postamble | 47 | #### Postamble |
48 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'vpk180_versal']['vpk180-versal' != '${MACHINE}']}" | 48 | 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" | |||
41 | 41 | ||
42 | #### No additional settings should be after the Postamble | 42 | #### No additional settings should be after the Postamble |
43 | #### Postamble | 43 | #### Postamble |
44 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'zc702_zynq7']['zc702-zynq7' != '${MACHINE}']}" | 44 | 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" | |||
23 | UBOOT_ENTRYPOINT ?= "0x200000" | 23 | UBOOT_ENTRYPOINT ?= "0x200000" |
24 | UBOOT_LOADADDRESS ?= "0x200000" | 24 | UBOOT_LOADADDRESS ?= "0x200000" |
25 | 25 | ||
26 | # zc702-zynq7 Serial Console | 26 | # zc706-zynq7 Serial Console |
27 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 27 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
28 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | 28 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" |
29 | 29 | ||
@@ -41,4 +41,4 @@ HDF_MACHINE = "zc706-zynq7" | |||
41 | 41 | ||
42 | #### No additional settings should be after the Postamble | 42 | #### No additional settings should be after the Postamble |
43 | #### Postamble | 43 | #### Postamble |
44 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'zc706_zynq7']['zc706-zynq7' != '${MACHINE}']}" | 44 | 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 c434067d..acd2544a 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | |||
@@ -2,10 +2,6 @@ | |||
2 | #@NAME: zcu102-zynqmp | 2 | #@NAME: zcu102-zynqmp |
3 | #@DESCRIPTION: Machine configuration for the ZCU102 evaluation board. | 3 | #@DESCRIPTION: Machine configuration for the ZCU102 evaluation board. |
4 | 4 | ||
5 | # Compatibility with old BOARD value. | ||
6 | # TODO - Remove these once removed from petalinux bsp | ||
7 | MACHINEOVERRIDES =. "zcu102:" | ||
8 | |||
9 | #### Preamble | 5 | #### Preamble |
10 | MACHINEOVERRIDES =. "${@['', 'zcu102-zynqmp:']['zcu102-zynqmp' !='${MACHINE}']}" | 6 | MACHINEOVERRIDES =. "${@['', 'zcu102-zynqmp:']['zcu102-zynqmp' !='${MACHINE}']}" |
11 | #### Regular settings follow | 7 | #### Regular settings follow |
@@ -55,4 +51,4 @@ HDF_MACHINE = "zcu102-zynqmp" | |||
55 | 51 | ||
56 | #### No additional settings should be after the Postamble | 52 | #### No additional settings should be after the Postamble |
57 | #### Postamble | 53 | #### Postamble |
58 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu102_zynqmp']['zcu102-zynqmp' != '${MACHINE}']}" | 54 | 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 710078eb..b4c11f3a 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" | |||
49 | # the xsa. User can enable explicitly if required from local.conf. | 49 | # the xsa. User can enable explicitly if required from local.conf. |
50 | # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb" | 50 | # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb" |
51 | 51 | ||
52 | # Yocto IMAGE_FEATURES Variable | ||
52 | MACHINE_HWCODECS = "libomxil-xlnx" | 53 | MACHINE_HWCODECS = "libomxil-xlnx" |
53 | IMAGE_FEATURES += "hwcodecs" | 54 | IMAGE_FEATURES += "hwcodecs" |
54 | 55 | ||
55 | #### No additional settings should be after the Postamble | 56 | #### No additional settings should be after the Postamble |
56 | #### Postamble | 57 | #### Postamble |
57 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu104_zynqmp']['zcu104-zynqmp' != '${MACHINE}']}" | 58 | 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 23a936d8..ff273134 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | |||
@@ -2,10 +2,6 @@ | |||
2 | #@NAME: zcu106-zynqmp | 2 | #@NAME: zcu106-zynqmp |
3 | #@DESCRIPTION: Machine configuration for the ZCU106 evaluation board. | 3 | #@DESCRIPTION: Machine configuration for the ZCU106 evaluation board. |
4 | 4 | ||
5 | # Compatibility with old BOARD value. | ||
6 | # TODO - Remove these once removed from petalinux bsp | ||
7 | MACHINEOVERRIDES =. "zcu106:" | ||
8 | |||
9 | #### Preamble | 5 | #### Preamble |
10 | MACHINEOVERRIDES =. "${@['', 'zcu106-zynqmp:']['zcu106-zynqmp' !='${MACHINE}']}" | 6 | MACHINEOVERRIDES =. "${@['', 'zcu106-zynqmp:']['zcu106-zynqmp' !='${MACHINE}']}" |
11 | #### Regular settings follow | 7 | #### Regular settings follow |
@@ -53,9 +49,10 @@ HDF_MACHINE = "zcu106-zynqmp" | |||
53 | # the xsa. User can enable explicitly if required from local.conf. | 49 | # the xsa. User can enable explicitly if required from local.conf. |
54 | # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb" | 50 | # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb" |
55 | 51 | ||
52 | # Yocto IMAGE_FEATURES Variable | ||
56 | MACHINE_HWCODECS = "libomxil-xlnx" | 53 | MACHINE_HWCODECS = "libomxil-xlnx" |
57 | IMAGE_FEATURES += "hwcodecs" | 54 | IMAGE_FEATURES += "hwcodecs" |
58 | 55 | ||
59 | #### No additional settings should be after the Postamble | 56 | #### No additional settings should be after the Postamble |
60 | #### Postamble | 57 | #### Postamble |
61 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu106_zynqmp']['zcu106-zynqmp' != '${MACHINE}']}" | 58 | 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 5868449f..77da93ca 100644 --- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | |||
@@ -2,10 +2,6 @@ | |||
2 | #@NAME: zcu111-zynqmp | 2 | #@NAME: zcu111-zynqmp |
3 | #@DESCRIPTION: Machine configuration for the ZCU111 evaluation board. | 3 | #@DESCRIPTION: Machine configuration for the ZCU111 evaluation board. |
4 | 4 | ||
5 | # Compatibility with old BOARD value. | ||
6 | # TODO - Remove these once removed from petalinux bsp | ||
7 | MACHINEOVERRIDES =. "zcu111:" | ||
8 | |||
9 | #### Preamble | 5 | #### Preamble |
10 | MACHINEOVERRIDES =. "${@['', 'zcu111-zynqmp:']['zcu111-zynqmp' !='${MACHINE}']}" | 6 | MACHINEOVERRIDES =. "${@['', 'zcu111-zynqmp:']['zcu111-zynqmp' !='${MACHINE}']}" |
11 | #### Regular settings follow | 7 | #### Regular settings follow |
@@ -55,4 +51,4 @@ HDF_MACHINE = "zcu111-zynqmp" | |||
55 | 51 | ||
56 | #### No additional settings should be after the Postamble | 52 | #### No additional settings should be after the Postamble |
57 | #### Postamble | 53 | #### Postamble |
58 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu111_zynqmp']['zcu111-zynqmp' != '${MACHINE}']}" | 54 | 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 71c94038..18aa3eee 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | |||
@@ -1,3 +1,5 @@ | |||
1 | XILINX_DEPRECATED[zcu1275-zynqmp] = "${@'zcu1275-zynqmp is not supported in 2023.2' if d.getVar("XILINX_RELEASE_VERSION") == 'v2023.2' else ''}" | ||
2 | |||
1 | #@TYPE: Machine | 3 | #@TYPE: Machine |
2 | #@NAME: zcu1275-zynqmp | 4 | #@NAME: zcu1275-zynqmp |
3 | #@DESCRIPTION: Machine configuration for the ZCU1275 evaluation board. | 5 | #@DESCRIPTION: Machine configuration for the ZCU1275 evaluation board. |
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf index 812a283f..6fba3619 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | |||
@@ -1,3 +1,5 @@ | |||
1 | XILINX_DEPRECATED[zcu1285-zynqmp] = "${@'zcu1285-zynqmp is not supported in 2023.2' if d.getVar("XILINX_RELEASE_VERSION") == 'v2023.2' else ''}" | ||
2 | |||
1 | #@TYPE: Machine | 3 | #@TYPE: Machine |
2 | #@NAME: zcu1285-zynqmp | 4 | #@NAME: zcu1285-zynqmp |
3 | #@DESCRIPTION: Machine configuration for the ZCU1285 evaluation board. | 5 | #@DESCRIPTION: Machine configuration for the ZCU1285 evaluation board. |
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf index 273606e2..7bb2c9db 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" | |||
47 | 47 | ||
48 | #### No additional settings should be after the Postamble | 48 | #### No additional settings should be after the Postamble |
49 | #### Postamble | 49 | #### Postamble |
50 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu208_zynqmp']['zcu208-zynqmp' != '${MACHINE}']}" | 50 | 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 80a15358..f4e1619d 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" | |||
47 | 47 | ||
48 | #### No additional settings should be after the Postamble | 48 | #### No additional settings should be after the Postamble |
49 | #### Postamble | 49 | #### Postamble |
50 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu216_zynqmp']['zcu216-zynqmp' != '${MACHINE}']}" | 50 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu216_zynqmp']['zcu216-zynqmp' != '${MACHINE}']}" |