From 46c000b94a9b179b9634dd7eae6e6d68d5b2eb96 Mon Sep 17 00:00:00 2001
From: Madeline Busig <madeline.busig@outlook.com>
Date: Mon, 10 Nov 2025 18:51:30 -0800
Subject: [PATCH] Package IP and clear settings in package_ip.tcl

---
 tcl/package_ip.tcl | 72 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 70 insertions(+), 2 deletions(-)

diff --git a/tcl/package_ip.tcl b/tcl/package_ip.tcl
index 2311c71..504df1e 100644
--- a/tcl/package_ip.tcl
+++ b/tcl/package_ip.tcl
@@ -14,11 +14,15 @@ if { $argc < 1 } {
 }
 
 set proj_name [lindex $argv 0]
+set tmp_proj_name "tmp_$proj_name"
 
 puts "Packaging $proj_name"
 
-set proj_dir "$gitroot/Top/$proj_name"
-set ip_conf_file "$proj_dir/ip.conf"
+set proj_top_dir "$gitroot/Top/$proj_name"
+set proj_dir "$gitroot/Projects/$proj_name"
+set proj_file "$proj_dir/$proj_name.xpr"
+
+set ip_conf_file "$proj_top_dir/ip.conf"
 
 puts "Reading configuration file $ip_conf_file"
 
@@ -31,5 +35,69 @@ if { [dict exists $ip_conf main] == 0 } {
 	exit -2
 }
 
+set ip_root "$gitroot/[dict get $ip_conf main ROOT]"
+set ip_vendor [dict get $ip_conf main VENDOR]
+set ip_library [dict get $ip_conf main LIBRARY]
+set ip_taxonomy [dict get $ip_conf main TAXONOMY]
+
+puts "Opening project $proj_file"
+open_project "$proj_file"
+
+puts "Packaging project"
+
+ipx::package_project -root_dir "$ip_root" -vendor "$ip_vendor" -library "$ip_library" -taxonomy "$ip_taxonomy" -import_files -set_current false
+
+set ip_component_file "$ip_root/component.xml"
+
+puts "Unloading core"
+
+ipx::unload_core "$ip_component_file"
+ipx::edit_ip_in_project -name "$tmp_proj_name" -upgrade true -directory "$ip_root" "$ip_component_file"
+update_compile_order -fileset sources_1
+
+current_project "$tmp_proj_name"
+
+# Remove inferred interfaces and memory maps. Start from a blank slate.
+
+puts "Removing inferred interfaces"
+
+foreach iface [ipx::get_bus_interfaces -of_objects [ipx::current_core]] {
+	set iface_name [lindex $iface 2]
+	puts "Removing inferred bus interface $iface_name"
+	ipx::remove_bus_interface $iface_name [ipx::current_core]
+}
+
+foreach memmap [ipx::get_memory_maps -of_objects [ipx::current_core]] {
+	set memmap_name [lindex $memmap 2]
+	puts "Removing inferred memory map $memmap_name"
+	ipx::remove_memory_map $memmap_name [ipx::current_core]
+}
+
+foreach param [ipx::get_user_parameters -of_objects [ipx::current_core]] {
+	set param_name [lindex $param 2]
+
+	if { $param_name == "Component_Name" } {
+		continue
+	}
+
+	puts "Removing inferred user parameter $param_name"
+	ipx::remove_user_parameter $param_name [ipx::current_core]
+}
+
+puts "Packaging IP"
+
+# Increment revision
+set rev [get_property core_revision [ipx::current_core]]
+incr rev
+set_property core_revision $rev [ipx::current_core]
+
+ipx::update_source_project_archive -component [ipx::current_core]
+ipx::create_xgui_files [ipx::current_core]
+ipx::update_checksums [ipx::current_core]
+ipx::check_integrity [ipx::current_core]
+ipx::save_core [ipx::current_core]
+
+close_project
+
 puts "Done"