diff options
author | Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> | 2023-01-12 15:32:58 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-01-13 23:31:51 -0600 |
commit | 4d236e3fc6dd3013f4c52b7f2f03652396576e37 (patch) | |
tree | 0203d6ef4cec3715d18338e6eb7497e7b0b5b589 /meta-xilinx-bsp | |
parent | 4589b2300a3d3a2468c0cda185190daa3785dd26 (diff) | |
download | meta-xilinx-4d236e3fc6dd3013f4c52b7f2f03652396576e37.tar.gz |
zynq7: Update machine conf file using gen-machineconf tool
1. Update zc702 and zc706 machine conf file using gen-machineconf
tool by parsing zc702 and zc706 xsa.
2. Move variables which changes based on xsa before required
inclusion file to handle pre-expansion values.
3. Remove BOARD MACHINEOVERRIDES in conf file.
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/zc702-zynq7.conf | 53 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 57 |
2 files changed, 73 insertions, 37 deletions
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf index b020936e..dc6f55b1 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | |||
@@ -1,23 +1,44 @@ | |||
1 | #@TYPE: Machine | 1 | #@TYPE: Machine |
2 | #@NAME: zc702-zynq7 | 2 | #@NAME: zc702-zynq7 |
3 | #@DESCRIPTION: Machine support for ZC702 Evaluation Board. | 3 | #@DESCRIPTION: Machine configuration for the ZC702 evaluation boards. |
4 | # | ||
5 | # For details on the Evaluation board: | ||
6 | # http://www.xilinx.com/products/boards-and-kits/EK-Z7-ZC702-G.htm | ||
7 | # For documentation and design files for the ZC702: | ||
8 | # http://www.xilinx.com/support/index.html/content/xilinx/en/supportNav/boards_and_kits/zynq-7000_soc_boards_and_kits/zynq-7000_soc_zc702_evaluation_kit.html | ||
9 | # For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files. | ||
10 | # | ||
11 | 4 | ||
5 | #### Preamble | ||
6 | MACHINEOVERRIDES =. "${@['', 'zc702-zynq7:']['zc702-zynq7' !='${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 zynq-generic.conf will be set. | ||
12 | |||
13 | # Yocto device-tree variables | ||
14 | YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "ps7_uart_1" | ||
15 | YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PS7_DDR_0" | ||
16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zc702}" | ||
17 | |||
18 | # Yocto FSBL variables | ||
19 | YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "ps7_uart_1" | ||
20 | YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1" | ||
21 | |||
22 | # Yocto KERNEL Variables | ||
23 | UBOOT_ENTRYPOINT ?= "0x200000" | ||
24 | UBOOT_LOADADDRESS ?= "0x200000" | ||
25 | |||
26 | # zc702-zynq7 Serial Console | ||
27 | SERIAL_CONSOLES ?= "115200;ttyPS0" | ||
28 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | ||
29 | |||
30 | # Required generic machine inclusion | ||
12 | require conf/machine/zynq-generic.conf | 31 | require conf/machine/zynq-generic.conf |
13 | 32 | ||
14 | # Add board compatibility override | 33 | # This eval board machine conf file uses zc702-zynq7 xsa as reference input. |
15 | MACHINEOVERRIDES .= ":zc702" | 34 | # User can override with zc702 custom xsa using HDF_BASE and HDF_PATH variables |
35 | # from local.conf. | ||
36 | HDF_MACHINE = "zc702-zynq7" | ||
16 | 37 | ||
17 | KERNEL_DEVICETREE = "zynq-zc702.dtb" | 38 | # KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match |
39 | # the xsa. User can enable explicitly if required from local.conf. | ||
40 | # KERNEL_DEVICETREE = "zynq-zc702.dtb" | ||
18 | 41 | ||
19 | IMAGE_BOOT_FILES += " \ | 42 | #### No additional settings should be after the Postamble |
20 | boot.bin \ | 43 | #### Postamble |
21 | uEnv.txt \ | 44 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'zc702_zynq7']['zc702-zynq7' != '${MACHINE}']}" |
22 | boot.scr \ | ||
23 | " | ||
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf index 8bf45c46..e6b7ce57 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | |||
@@ -1,29 +1,44 @@ | |||
1 | #@TYPE: Machine | 1 | #@TYPE: Machine |
2 | #@NAME: zc706-zynq7 | 2 | #@NAME: zc706-zynq7 |
3 | #@DESCRIPTION: Machine support for ZC706 Evaluation Board. | 3 | #@DESCRIPTION: Machine configuration for the ZC706 evaluation boards. |
4 | # | ||
5 | # For details on the Evaluation board: | ||
6 | # http://www.xilinx.com/products/boards-and-kits/EK-Z7-ZC706-G.htm | ||
7 | # For documentation and design files for the ZC702: | ||
8 | # http://www.xilinx.com/support/index.html/content/xilinx/en/supportNav/boards_and_kits/zynq-7000_soc_boards_and_kits/zynq-7000_soc_zc706_evaluation_kit.html | ||
9 | # For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files. | ||
10 | # | ||
11 | 4 | ||
12 | require conf/machine/zynq-generic.conf | 5 | #### Preamble |
6 | MACHINEOVERRIDES =. "${@['', 'zc706-zynq7:']['zc706-zynq7' !='${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 zynq-generic.conf will be set. | ||
12 | |||
13 | # Yocto device-tree variables | ||
14 | YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "ps7_uart_1" | ||
15 | YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PS7_DDR_0" | ||
16 | YAML_DT_BOARD_FLAGS ?= "{BOARD zc706}" | ||
13 | 17 | ||
14 | # Add board compatibility override | 18 | # Yocto FSBL variables |
15 | MACHINEOVERRIDES .= ":zc706" | 19 | YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "ps7_uart_1" |
20 | YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1" | ||
16 | 21 | ||
17 | SPL_BINARY ?= "spl/boot.bin" | 22 | # Yocto KERNEL Variables |
23 | UBOOT_ENTRYPOINT ?= "0x200000" | ||
24 | UBOOT_LOADADDRESS ?= "0x200000" | ||
25 | |||
26 | # zc702-zynq7 Serial Console | ||
27 | SERIAL_CONSOLES ?= "115200;ttyPS0" | ||
28 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | ||
29 | |||
30 | # Required generic machine inclusion | ||
31 | require conf/machine/zynq-generic.conf | ||
18 | 32 | ||
19 | EXTRA_IMAGEDEPENDS += " \ | 33 | # This eval board machine conf file uses zc702-zynq7 xsa as reference input. |
20 | u-boot-xlnx-uenv \ | 34 | # User can override with zc702 custom xsa using HDF_BASE and HDF_PATH variables |
21 | " | 35 | # from local.conf. |
36 | HDF_MACHINE = "zc706-zynq7" | ||
22 | 37 | ||
23 | KERNEL_DEVICETREE = "zynq-zc706.dtb" | 38 | # KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match |
39 | # the xsa. User can enable explicitly if required from local.conf. | ||
40 | # KERNEL_DEVICETREE = "zynq-zc706.dtb" | ||
24 | 41 | ||
25 | IMAGE_BOOT_FILES += " \ | 42 | #### No additional settings should be after the Postamble |
26 | boot.bin \ | 43 | #### Postamble |
27 | uEnv.txt \ | 44 | PACKAGE_EXTRA_ARCHS:append = "${@['', 'zc706_zynq7']['zc706-zynq7' != '${MACHINE}']}" |
28 | boot.scr \ | ||
29 | " | ||