-
Notifications
You must be signed in to change notification settings - Fork 136
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/rel-v2023.1'
Resolved conflicts Preserved 2022* versions Signed-off-by: Mark Hatle <[email protected]>
- Loading branch information
Showing
266 changed files
with
3,671 additions
and
775 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| [submodule "gen-machine-conf"] | ||
| path = meta-xilinx-core/gen-machine-conf | ||
| url = https://github.com/Xilinx/gen-machine-conf.git | ||
| branch = xlnx_rel_v2023.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| meta-xilinx-core/gen-machine-conf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #@TYPE: Machine | ||
| #@NAME: ac701-microblazeel | ||
| #@DESCRIPTION: Machine configuration for the AC701 evaluation board. | ||
|
|
||
| #### Preamble | ||
| MACHINEOVERRIDES =. "${@['', 'ac701-microblazeel:']['ac701-microblazeel' !='${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 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" | ||
| DT_PADDING_SIZE:pn-device-tree ?= "0x1000" | ||
| DTC_FLAGS:pn-device-tree ?= "" | ||
| XSCTH_PROC:pn-device-tree ?= "microblaze_0" | ||
| YAML_DT_BOARD_FLAGS ?= "{BOARD ac701-full}" | ||
|
|
||
| # 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 | ||
|
|
||
| # This machine conf file uses ac701-microblazeel xsa as reference input. | ||
| # User can override with ac701 custom xsa using HDF_BASE and HDF_PATH variables | ||
| # from local.conf. | ||
| HDF_MACHINE = "ac701-microblazeel" | ||
|
|
||
| #### No additional settings should be after the Postamble | ||
| #### Postamble | ||
| PACKAGE_EXTRA_ARCHS:append = "${@['', 'ac701_microblazeel']['ac701-microblazeel' != '${MACHINE}']}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #@TYPE: Machine | ||
| #@NAME: kcu105-microblazeel | ||
| #@DESCRIPTION: Machine configuration for the KCU105 evaluation board. | ||
|
|
||
| #### Preamble | ||
| MACHINEOVERRIDES =. "${@['', 'kcu105-microblazeel:']['kcu105-microblazeel' !='${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 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" | ||
| DT_PADDING_SIZE:pn-device-tree ?= "0x1000" | ||
| DTC_FLAGS:pn-device-tree ?= "" | ||
| XSCTH_PROC:pn-device-tree ?= "microblaze_0" | ||
| YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}" | ||
|
|
||
| # 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 | ||
|
|
||
| # This machine conf file uses kcu105-microblazeel xsa as reference input. | ||
| # User can override with kcu105 custom xsa using HDF_BASE and HDF_PATH variables | ||
| # from local.conf. | ||
| HDF_MACHINE = "kcu105-microblazeel" | ||
|
|
||
| #### No additional settings should be after the Postamble | ||
| #### Postamble | ||
| PACKAGE_EXTRA_ARCHS:append = "${@['', 'kcu105_microblazeel']['kcu105-microblazeel' != '${MACHINE}']}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| #@TYPE: Machine | ||
| #@NAME: vcu118-microblazeel | ||
| #@DESCRIPTION: Machine configuration for the VCU118 evaluation board. | ||
|
|
||
| #### Preamble | ||
| MACHINEOVERRIDES =. "${@['', 'vcu118-microblazeel:']['vcu118-microblazeel' !='${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 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" | ||
| DT_PADDING_SIZE:pn-device-tree ?= "0x1000" | ||
| DTC_FLAGS:pn-device-tree ?= "" | ||
| XSCTH_PROC:pn-device-tree ?= "microblaze_0" | ||
| YAML_DT_BOARD_FLAGS ?= "{BOARD vcu118-rev2.0}" | ||
|
|
||
| # Yocto KERNEL Variables | ||
| UBOOT_ENTRYPOINT ?= "0x80000000" | ||
| UBOOT_LOADADDRESS ?= "0x80000000" | ||
|
|
||
| # 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 | ||
|
|
||
| # This machine conf file uses vcu118-microblazeel xsa as reference input. | ||
| # User can override with vcu118 custom xsa using HDF_BASE and HDF_PATH variables | ||
| # from local.conf. | ||
| HDF_MACHINE = "vcu118-microblazeel" | ||
|
|
||
| #### No additional settings should be after the Postamble | ||
| #### Postamble | ||
| PACKAGE_EXTRA_ARCHS:append = "${@['', 'vcu118_microblazeel']['vcu118-microblazeel' != '${MACHINE}']}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| #@TYPE: Machine | ||
| #@NAME: vek280-versal | ||
| #@DESCRIPTION: Machine configuration for the VEK280 evaluation boards. | ||
|
|
||
| #### Preamble | ||
| MACHINEOVERRIDES =. "${@['', 'vek280-versal:']['vek280-versal' !='${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 versal-generic.conf will be set. | ||
|
|
||
| # Yocto device-tree variables | ||
| YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0" | ||
| YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-reva}" | ||
|
|
||
| # 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" | ||
|
|
||
| # vek280-versal Serial Console | ||
| SERIAL_CONSOLES ?= "115200;ttyAMA0" | ||
| YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | ||
|
|
||
| # Required generic machine inclusion | ||
| require conf/machine/versal-ai-edge-generic.conf | ||
|
|
||
| # This machine conf file uses vek280-versal xsa as reference input. | ||
| # User can override with vek280 custom xsa using HDF_BASE and HDF_PATH variables | ||
| # from local.conf. | ||
| HDF_MACHINE = "vek280-versal" | ||
|
|
||
| #### No additional settings should be after the Postamble | ||
| #### Postamble | ||
| PACKAGE_EXTRA_ARCHS:append = "${@['', 'vek280_versal']['vek280-versal' != '${MACHINE}']}" |
Oops, something went wrong.