diff --git a/designs/vivado/scalp_firmware/2019.2/lin64/.scripts/create_prj_scalp_firmware.tcl b/designs/vivado/scalp_firmware/2019.2/lin64/.scripts/create_prj_scalp_firmware.tcl
index d7374b0fdb1db5f445c7f31e2888e18de437cdb7..ee33af9e96999e922127cec1205198f5a3802d75 100644
--- a/designs/vivado/scalp_firmware/2019.2/lin64/.scripts/create_prj_scalp_firmware.tcl
+++ b/designs/vivado/scalp_firmware/2019.2/lin64/.scripts/create_prj_scalp_firmware.tcl
@@ -36,11 +36,16 @@ set src_dir "${PRJ_DIR}/../src"
 set ip_dir "${PRJ_DIR}/../../../../../ips/hw"
 set comp_dir "${ip_dir}/$prj_name"
 set comp_src_dir "${comp_dir}/src"
+# USER DEFINE
+#set PRJ_ZYNPS "scalp_zynqps"
+#set zynqps_dir "${PRJ_DIR}/../../../../../soc/hw/${scalp_zynqps}/src"
+##
+
 print_status "Set directory paths" "OK"
 
 # Create the project
 create_project $prj_name ${PRJ_DIR}/$prj_name -part xc7z015clg485-2
-set_property board_part SCALP [current_project]
+#set_property board_part SCALP [current_project]
 set_property target_language VHDL [current_project]
 print_status "Create project" "OK"
 
diff --git a/designs/vivado/scalp_firmware/2019.2/src/hdl/scalp_firmware.vhd b/designs/vivado/scalp_firmware/2019.2/src/hdl/scalp_firmware.vhd
index ec56b6bba45ad515b7aa67c1a40e068b2cfa8f81..0119ea9eb54292e1bcd5725f02f0d1c4a21e0263 100644
--- a/designs/vivado/scalp_firmware/2019.2/src/hdl/scalp_firmware.vhd
+++ b/designs/vivado/scalp_firmware/2019.2/src/hdl/scalp_firmware.vhd
@@ -15,7 +15,7 @@
 -- Tool version: 2019.2
 -- Description: scalp_firmware
 --
--- Last update: 2020-09-03
+-- Last update: 2020-09-07
 --
 ---------------------------------------------------------------------------------
 
@@ -286,8 +286,16 @@ architecture arch of scalp_firmware is
     -- Attributes
     attribute mark_debug : string;
     attribute keep       : string;
-
-
+    -- Clocks
+    attribute mark_debug of PSSysClkxC   : signal is "true";
+    attribute keep of PSSysClkxC         : signal is "true";
+    attribute mark_debug of GTPRefClk0xC : signal is "true";
+    attribute keep of GTPRefClk0xC       : signal is "true";
+    attribute mark_debug of GTPRefClk1xC : signal is "true";
+    attribute keep of GTPRefClk1xC       : signal is "true";
+    -- Resets
+    attribute mark_debug of PSSysResetxR : signal is "true";
+    attribute keep of PSSysResetxR       : signal is "true";
 
 begin
 
diff --git a/designs/vivado/scalp_firmware/2019.2/src/ipi_tcl/scalp_firmware_ipi.tcl b/designs/vivado/scalp_firmware/2019.2/src/ipi_tcl/scalp_firmware_ipi.tcl
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..effef90a7408fb38ef837fab7247ca9e983247c1 100644
--- a/designs/vivado/scalp_firmware/2019.2/src/ipi_tcl/scalp_firmware_ipi.tcl
+++ b/designs/vivado/scalp_firmware/2019.2/src/ipi_tcl/scalp_firmware_ipi.tcl
@@ -0,0 +1,7 @@
+set PRJ_ZYNQPS "scalp_zynqps"
+set VIVADO_VERSION "2019.2"
+
+set zynqps_dir "../../../../../../soc/vivado/${PRJ_ZYNQPS}/${VIVADO_VERSION}/src/ipi_tcl"
+set zynqps_ipi "${PRJ_ZYNQPS}_ipi.tcl"
+
+source "${zynqps_dir}/${zynqps_ipi}"