remove debug sync fw

orgua · Apr 27, 2024 · e1ab405 · e1ab405
1 parent a284503
commit e1ab405
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 214 deletions.
diff --git a/deploy/roles/sheep/tasks/build_shp.yml b/deploy/roles/sheep/tasks/build_shp.yml
@@ -16,7 +16,6 @@
     - pru0-shepherd-fw
     - pru1-shepherd-fw
     - pru0-programmer
-    - pru1-sync
   become: true
 
 - name: Build PRU firmware
@@ -27,7 +26,6 @@
     - pru0-shepherd-fw
     - pru1-shepherd-fw
     - pru0-programmer
-    - pru1-sync
   environment:
     PRU_CGT: '{{ sheep_ti_pru_cgt_path }}'
     PRU_CGT_SUPPORT: '{{ sheep_ti_pru_support_path }}'
@@ -44,7 +42,6 @@
     - pru0-shepherd-fw
     - pru1-shepherd-fw
     - pru0-programmer
-    - pru1-sync
   become: true
 
 # build second programmer

diff --git a/software/firmware/Makefile b/software/firmware/Makefile
@@ -1,4 +1,4 @@
-DIRS = pru0-shepherd-fw pru1-shepherd-fw device-tree pru0-programmer pru1-sync
+DIRS = pru0-shepherd-fw pru1-shepherd-fw device-tree pru0-programmer
 # TODO: this makefile currently can't produce both versions of the programmer
 
 BUILDDIRS = $(DIRS:%=build-%)

diff --git a/software/firmware/pru1-sync/.gitignore b/software/firmware/pru1-sync/.gitignore
diff --git a/software/firmware/pru1-sync/Makefile b/software/firmware/pru1-sync/Makefile
diff --git a/software/firmware/pru1-sync/main.c b/software/firmware/pru1-sync/main.c
diff --git a/software/kernel-module/src/commons.h b/software/kernel-module/src/commons.h
@@ -10,7 +10,6 @@
 #define PRU0_FW_PRG_SWD              ("am335x-pru0-programmer-SWD-fw")
 #define PRU0_FW_PRG_SBW              ("am335x-pru0-programmer-SBW-fw")
 #define PRU1_FW_DEFAULT              ("am335x-pru1-shepherd-fw")
-#define PRU1_FW_SYNC                 ("am335x-pru1-sync-fw")
 
 
 // NOTE: a (almost)Copy of this definition-file exists for the pru-firmware (copy changes by hand)

diff --git a/software/kernel-module/src/sysfs_interface.c b/software/kernel-module/src/sysfs_interface.c
@@ -833,10 +833,10 @@ static ssize_t sysfs_pru1_firmware_store(struct kobject *kobj, struct kobj_attri
     /* FAIL with no file-name or not matching start-string */
     if (strlen(buffer) == 0) return -EINVAL;
 
-    if ((strncmp(buffer, "sync", 4) == 0) || (strncmp(buffer, PRU1_FW_SYNC, 19) == 0))
+    if (strncmp(buffer, "sync", 4) == 0)
     {
-        swap_pru_firmware("", PRU1_FW_SYNC);
-        /* only for debug */
+        printk(KERN_ERR "shprd.k: sync-fw was removed");
+        // NOTE: this could be removed, but that makes the whole FN useless
     }
     else { swap_pru_firmware("", PRU1_FW_DEFAULT); }
 

diff --git a/software/python-package/shepherd_sheep/sysfs_interface.py b/software/python-package/shepherd_sheep/sysfs_interface.py
@@ -583,7 +583,6 @@ def check_programmer() -> str:
     "am335x-pru0-programmer-SWD-fw",
     "am335x-pru0-programmer-SBW-fw",
     "am335x-pru1-shepherd-fw",
-    "am335x-pru1-sync-fw",  # just for debug
 ]