From 647a168299fa7c83de3e3afddc3cd4c540941e6c Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Tue, 16 Aug 2022 18:49:02 -0700 Subject: [PATCH] Enable more peripherals in Zynq designs Signed-off-by: Alex Forencich --- fpga/mqnic/ZCU102/fpga/ip/zynq_ps.tcl | 15 +++++++++++++++ .../fpga/ps/petalinux/project-spec/configs/config | 9 +++++++-- .../petalinux/project-spec/configs/rootfs_config | 9 +++------ .../fsbl-firmware/fsbl-firmware_%.bbappend | 2 +- fpga/mqnic/ZCU106/fpga_zynqmp/ip/zynq_ps.tcl | 9 +++++++++ .../ps/petalinux/project-spec/configs/config | 7 ++++++- .../petalinux/project-spec/configs/rootfs_config | 9 +++------ .../fsbl-firmware/fsbl-firmware_%.bbappend | 2 +- 8 files changed, 45 insertions(+), 17 deletions(-) diff --git a/fpga/mqnic/ZCU102/fpga/ip/zynq_ps.tcl b/fpga/mqnic/ZCU102/fpga/ip/zynq_ps.tcl index e63d21431..f25b3aa9a 100644 --- a/fpga/mqnic/ZCU102/fpga/ip/zynq_ps.tcl +++ b/fpga/mqnic/ZCU102/fpga/ip/zynq_ps.tcl @@ -76,6 +76,21 @@ set_property -dict [list \ CONFIG.PSU__ENET3__PERIPHERAL__ENABLE {1} \ CONFIG.PSU__ENET3__GRP_MDIO__ENABLE {1} \ CONFIG.PSU__USB0__PERIPHERAL__ENABLE {1} \ + CONFIG.PSU__USB0__REF_CLK_SEL {Ref Clk2} \ + CONFIG.PSU__USB3_0__PERIPHERAL__ENABLE {1} \ + CONFIG.PSU__USB3_0__PERIPHERAL__IO {GT Lane2} \ + CONFIG.PSU__DISPLAYPORT__PERIPHERAL__ENABLE {1} \ + CONFIG.PSU__DPAUX__PERIPHERAL__IO {MIO 27 .. 30} \ + CONFIG.PSU__DP__REF_CLK_SEL {Ref Clk3} \ + CONFIG.PSU__DP__LANE_SEL {Single Lower} \ + CONFIG.PSU__SATA__PERIPHERAL__ENABLE {1} \ + CONFIG.PSU__SATA__LANE1__IO {GT Lane3} \ + CONFIG.PSU__PCIE__PERIPHERAL__ENABLE {1} \ + CONFIG.PSU__PCIE__PERIPHERAL__ROOTPORT_IO {MIO 31} \ + CONFIG.PSU__PCIE__DEVICE_PORT_TYPE {Root Port} \ + CONFIG.PSU__PCIE__BAR0_ENABLE {0} \ + CONFIG.PSU__PCIE__CLASS_CODE_BASE {0x06} \ + CONFIG.PSU__PCIE__CLASS_CODE_SUB {0x04} \ CONFIG.PSU__SWDT0__PERIPHERAL__ENABLE {1} \ CONFIG.PSU__SWDT1__PERIPHERAL__ENABLE {1} \ CONFIG.PSU__TTC0__PERIPHERAL__ENABLE {1} \ diff --git a/fpga/mqnic/ZCU102/fpga/ps/petalinux/project-spec/configs/config b/fpga/mqnic/ZCU102/fpga/ps/petalinux/project-spec/configs/config index 3b2ff9b46..07ba757f3 100644 --- a/fpga/mqnic/ZCU102/fpga/ps/petalinux/project-spec/configs/config +++ b/fpga/mqnic/ZCU102/fpga/ps/petalinux/project-spec/configs/config @@ -133,8 +133,11 @@ CONFIG_SUBSYSTEM_SD_PSU_SD_1_SELECT=y # CONFIG_SUBSYSTEM_RTC_PSU_RTC_SELECT=y # CONFIG_SUBSYSTEM_RTC_MANUAL_SELECT is not set +CONFIG_SUBSYSTEM_SATA_PSU_SATA_SELECT=y CONFIG_SUBSYSTEM_I2C_PSU_I2C_1_SELECT=y CONFIG_SUBSYSTEM_I2C_PSU_I2C_0_SELECT=y +CONFIG_SUBSYSTEM_USB_PSU_USB_0_SELECT=y +CONFIG_SUBSYSTEM_DP_PSU_DP_SELECT=y CONFIG_SUBSYSTEM_ENDIAN_LITTLE=y # @@ -148,11 +151,12 @@ CONFIG_SUBSYSTEM_EXTRA_DT_FILES="" # CONFIG_SUBSYSTEM_BOOTARGS_AUTO=y CONFIG_SUBSYSTEM_BOOTARGS_EARLYPRINTK=y -CONFIG_SUBSYSTEM_BOOTARGS_GENERATED=" earlycon console=ttyPS0,115200 clk_ignore_unused init_fatal_sh=1" + CONFIG_SUBSYSTEM_DEVICETREE_COMPILER_FLAGS="-@" # CONFIG_SUBSYSTEM_DTB_OVERLAY is not set # CONFIG_SUBSYSTEM_REMOVE_PL_DTB is not set # CONFIG_SUBSYSTEM_ENABLE_NO_ALIAS is not set +# CONFIG_SUBSYSTEM_ENABLE_DT_VERBOSE is not set # # PMUFW Configuration @@ -187,7 +191,7 @@ CONFIG_SUBSYSTEM_UBOOT_CONFIG_TARGET="xilinx_zynqmp_virt_defconfig" # u-boot script configuration # CONFIG_SUBSYSTEM_UBOOT_APPEND_BASEADDR=y -CONFIG_SUBSYSTEM_UBOOT_PRE_BOOTENV="" +CONFIG_SUBSYSTEM_UBOOT_PRE_BOOTENV="i2c dev 0; i2c mw 20 6 0; i2c mw 20 2 ee; gpio clear gpio@ff0a000031; gpio set gpio@ff0a000031" # # JTAG/DDR image offsets @@ -299,3 +303,4 @@ CONFIG_YOCTO_NETWORK_SSTATE_FEEDS_URL="http://petalinux.xilinx.com/sswreleases/r # CONFIG_USER_LAYER_0="${PROOT}/../../../../../../meta-corundum" CONFIG_USER_LAYER_1="" +CONFIG_SUBSYSTEM_BOOTARGS_GENERATED=" earlycon console=ttyPS0,115200 clk_ignore_unused init_fatal_sh=1" diff --git a/fpga/mqnic/ZCU102/fpga/ps/petalinux/project-spec/configs/rootfs_config b/fpga/mqnic/ZCU102/fpga/ps/petalinux/project-spec/configs/rootfs_config index baa68db44..f068abfc6 100644 --- a/fpga/mqnic/ZCU102/fpga/ps/petalinux/project-spec/configs/rootfs_config +++ b/fpga/mqnic/ZCU102/fpga/ps/petalinux/project-spec/configs/rootfs_config @@ -1271,7 +1271,6 @@ CONFIG_run-postinsts=y # CONFIG_cairo-dbg is not set # CONFIG_cairo-dev is not set # CONFIG_cairo-script-interpreter is not set -# CONFIG_cairo-perf-utils is not set # CONFIG_cairo-gobject is not set # @@ -3100,7 +3099,6 @@ CONFIG_packagegroup-core-ssh-dropbear=y # CONFIG_qtxmlpatterns is not set # CONFIG_qtxmlpatterns-dev is not set # CONFIG_qtxmlpatterns-mkspecs is not set -# CONFIG_qtxmlpatterns-examples is not set # CONFIG_qtxmlpatterns-dbg is not set # CONFIG_qtxmlpatterns-tools is not set @@ -3504,7 +3502,6 @@ CONFIG_watchdog-init=y # # CONFIG_gstreamer1.0 is not set # CONFIG_gstreamer1.0-dev is not set -# CONFIG_gstreamer1.0-bash-completion is not set # CONFIG_gstreamer1.0-dbg is not set # @@ -3766,10 +3763,10 @@ CONFIG_u-boot-tools=y # CONFIG_libgnome-desktop3 is not set # -# gnome-themes-standard +# gnome-themes-extra # -# CONFIG_gnome-themes-standard-dev is not set -# CONFIG_gnome-themes-standard-dbg is not set +# CONFIG_gnome-themes-extra-dev is not set +# CONFIG_gnome-themes-extra-dbg is not set # CONFIG_gnome-theme-adwaita is not set # diff --git a/fpga/mqnic/ZCU102/fpga/ps/petalinux/project-spec/meta-user/recipes-bsp/fsbl-firmware/fsbl-firmware_%.bbappend b/fpga/mqnic/ZCU102/fpga/ps/petalinux/project-spec/meta-user/recipes-bsp/fsbl-firmware/fsbl-firmware_%.bbappend index 7639d58ae..e2013979f 100644 --- a/fpga/mqnic/ZCU102/fpga/ps/petalinux/project-spec/meta-user/recipes-bsp/fsbl-firmware/fsbl-firmware_%.bbappend +++ b/fpga/mqnic/ZCU102/fpga/ps/petalinux/project-spec/meta-user/recipes-bsp/fsbl-firmware/fsbl-firmware_%.bbappend @@ -1,4 +1,4 @@ ############################################################################### # enable message level FSBL_DEBUG_DETAILED -YAML_COMPILER_FLAGS_append = " -DFSBL_DEBUG_DETAILED" +#YAML_COMPILER_FLAGS_append = " -DFSBL_DEBUG_DETAILED" diff --git a/fpga/mqnic/ZCU106/fpga_zynqmp/ip/zynq_ps.tcl b/fpga/mqnic/ZCU106/fpga_zynqmp/ip/zynq_ps.tcl index 6629b3ac7..3858bab13 100644 --- a/fpga/mqnic/ZCU106/fpga_zynqmp/ip/zynq_ps.tcl +++ b/fpga/mqnic/ZCU106/fpga_zynqmp/ip/zynq_ps.tcl @@ -73,6 +73,15 @@ set_property -dict [list \ CONFIG.PSU__ENET3__PERIPHERAL__ENABLE {1} \ CONFIG.PSU__ENET3__GRP_MDIO__ENABLE {1} \ CONFIG.PSU__USB0__PERIPHERAL__ENABLE {1} \ + CONFIG.PSU__USB0__REF_CLK_SEL {Ref Clk2} \ + CONFIG.PSU__USB3_0__PERIPHERAL__ENABLE {1} \ + CONFIG.PSU__USB3_0__PERIPHERAL__IO {GT Lane2} \ + CONFIG.PSU__DISPLAYPORT__PERIPHERAL__ENABLE {1} \ + CONFIG.PSU__DPAUX__PERIPHERAL__IO {MIO 27 .. 30} \ + CONFIG.PSU__DP__REF_CLK_SEL {Ref Clk3} \ + CONFIG.PSU__DP__LANE_SEL {Dual Lower} \ + CONFIG.PSU__SATA__PERIPHERAL__ENABLE {1} \ + CONFIG.PSU__SATA__LANE1__IO {GT Lane3} \ CONFIG.PSU__SWDT0__PERIPHERAL__ENABLE {1} \ CONFIG.PSU__SWDT1__PERIPHERAL__ENABLE {1} \ CONFIG.PSU__TTC0__PERIPHERAL__ENABLE {1} \ diff --git a/fpga/mqnic/ZCU106/fpga_zynqmp/ps/petalinux/project-spec/configs/config b/fpga/mqnic/ZCU106/fpga_zynqmp/ps/petalinux/project-spec/configs/config index 7314cef3b..50e42b62e 100644 --- a/fpga/mqnic/ZCU106/fpga_zynqmp/ps/petalinux/project-spec/configs/config +++ b/fpga/mqnic/ZCU106/fpga_zynqmp/ps/petalinux/project-spec/configs/config @@ -133,8 +133,11 @@ CONFIG_SUBSYSTEM_SD_PSU_SD_1_SELECT=y # CONFIG_SUBSYSTEM_RTC_PSU_RTC_SELECT=y # CONFIG_SUBSYSTEM_RTC_MANUAL_SELECT is not set +CONFIG_SUBSYSTEM_SATA_PSU_SATA_SELECT=y CONFIG_SUBSYSTEM_I2C_PSU_I2C_1_SELECT=y CONFIG_SUBSYSTEM_I2C_PSU_I2C_0_SELECT=y +CONFIG_SUBSYSTEM_USB_PSU_USB_0_SELECT=y +CONFIG_SUBSYSTEM_DP_PSU_DP_SELECT=y CONFIG_SUBSYSTEM_ENDIAN_LITTLE=y # @@ -148,11 +151,12 @@ CONFIG_SUBSYSTEM_EXTRA_DT_FILES="" # CONFIG_SUBSYSTEM_BOOTARGS_AUTO=y CONFIG_SUBSYSTEM_BOOTARGS_EARLYPRINTK=y -CONFIG_SUBSYSTEM_BOOTARGS_GENERATED=" earlycon console=ttyPS0,115200 clk_ignore_unused init_fatal_sh=1" + CONFIG_SUBSYSTEM_DEVICETREE_COMPILER_FLAGS="-@" # CONFIG_SUBSYSTEM_DTB_OVERLAY is not set # CONFIG_SUBSYSTEM_REMOVE_PL_DTB is not set # CONFIG_SUBSYSTEM_ENABLE_NO_ALIAS is not set +# CONFIG_SUBSYSTEM_ENABLE_DT_VERBOSE is not set # # PMUFW Configuration @@ -299,3 +303,4 @@ CONFIG_YOCTO_NETWORK_SSTATE_FEEDS_URL="http://petalinux.xilinx.com/sswreleases/r # CONFIG_USER_LAYER_0="${PROOT}/../../../../../../meta-corundum" CONFIG_USER_LAYER_1="" +CONFIG_SUBSYSTEM_BOOTARGS_GENERATED=" earlycon console=ttyPS0,115200 clk_ignore_unused init_fatal_sh=1" diff --git a/fpga/mqnic/ZCU106/fpga_zynqmp/ps/petalinux/project-spec/configs/rootfs_config b/fpga/mqnic/ZCU106/fpga_zynqmp/ps/petalinux/project-spec/configs/rootfs_config index baa68db44..f068abfc6 100644 --- a/fpga/mqnic/ZCU106/fpga_zynqmp/ps/petalinux/project-spec/configs/rootfs_config +++ b/fpga/mqnic/ZCU106/fpga_zynqmp/ps/petalinux/project-spec/configs/rootfs_config @@ -1271,7 +1271,6 @@ CONFIG_run-postinsts=y # CONFIG_cairo-dbg is not set # CONFIG_cairo-dev is not set # CONFIG_cairo-script-interpreter is not set -# CONFIG_cairo-perf-utils is not set # CONFIG_cairo-gobject is not set # @@ -3100,7 +3099,6 @@ CONFIG_packagegroup-core-ssh-dropbear=y # CONFIG_qtxmlpatterns is not set # CONFIG_qtxmlpatterns-dev is not set # CONFIG_qtxmlpatterns-mkspecs is not set -# CONFIG_qtxmlpatterns-examples is not set # CONFIG_qtxmlpatterns-dbg is not set # CONFIG_qtxmlpatterns-tools is not set @@ -3504,7 +3502,6 @@ CONFIG_watchdog-init=y # # CONFIG_gstreamer1.0 is not set # CONFIG_gstreamer1.0-dev is not set -# CONFIG_gstreamer1.0-bash-completion is not set # CONFIG_gstreamer1.0-dbg is not set # @@ -3766,10 +3763,10 @@ CONFIG_u-boot-tools=y # CONFIG_libgnome-desktop3 is not set # -# gnome-themes-standard +# gnome-themes-extra # -# CONFIG_gnome-themes-standard-dev is not set -# CONFIG_gnome-themes-standard-dbg is not set +# CONFIG_gnome-themes-extra-dev is not set +# CONFIG_gnome-themes-extra-dbg is not set # CONFIG_gnome-theme-adwaita is not set # diff --git a/fpga/mqnic/ZCU106/fpga_zynqmp/ps/petalinux/project-spec/meta-user/recipes-bsp/fsbl-firmware/fsbl-firmware_%.bbappend b/fpga/mqnic/ZCU106/fpga_zynqmp/ps/petalinux/project-spec/meta-user/recipes-bsp/fsbl-firmware/fsbl-firmware_%.bbappend index 7639d58ae..e2013979f 100644 --- a/fpga/mqnic/ZCU106/fpga_zynqmp/ps/petalinux/project-spec/meta-user/recipes-bsp/fsbl-firmware/fsbl-firmware_%.bbappend +++ b/fpga/mqnic/ZCU106/fpga_zynqmp/ps/petalinux/project-spec/meta-user/recipes-bsp/fsbl-firmware/fsbl-firmware_%.bbappend @@ -1,4 +1,4 @@ ############################################################################### # enable message level FSBL_DEBUG_DETAILED -YAML_COMPILER_FLAGS_append = " -DFSBL_DEBUG_DETAILED" +#YAML_COMPILER_FLAGS_append = " -DFSBL_DEBUG_DETAILED"