Merge pull request #454 from sifive/clic-examples

Minor cleaning up of clic examples
sifive · Mar 31, 2020 · f86b422 · f86b422
2 parents 982a5df + 37fc38b
commit f86b422
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -73,9 +73,6 @@
 [submodule "software/plic-interrupts"]
 	path = software/plic-interrupts
 	url = https://github.com/sifive/example-plic-interrupts.git
-[submodule "software/clic-vector-interrupts"]
-	path = software/clic-vector-interrupts
-	url = https://github.com/sifive/example-clic-vector-interrupts.git
 [submodule "software/clic-selective-vector-interrupts"]
 	path = software/clic-selective-vector-interrupts
 	url = https://github.com/sifive/example-clic-selective-vector-interrupts.git
@@ -139,3 +136,6 @@
 [submodule "scripts/esdk-settings-generator"]
 	path = scripts/esdk-settings-generator
 	url = https://github.com/sifive/esdk-settings-generator.git
+[submodule "software/clic-nonvector-interrupts"]
+	path = software/clic-nonvector-interrupts
+	url = https://github.com/sifive/example-clic-nonvector-interrupts.git
diff --git a/doc/sphinx/contents.rst b/doc/sphinx/contents.rst
@@ -188,7 +188,7 @@ The example programs can be found under the ``software/`` directory.
     The tests are designed to work on SiFive CPU designs in RTL simulation or on the
     Arty FPGA board. 
 
-- clic-vector-interrupts
+- clic-nonvector-interrupts
 
   - A simple example demonstrating how to use CLIC non vector interrupts
 
@@ -200,6 +200,10 @@ The example programs can be found under the ``software/`` directory.
 
   - A simple example demonstrating the use of CLIC hardware vector interrupts
 
+- clic-nested-interrupts
+
+  - A simple example demonstrating how to use CLIC preemptive vector interrupts
+
 - minimal-boot
 
   - Demonstrates how to replace the Metal constructors and replace them with your own.

diff --git a/software/clic-nonvector-interrupts b/software/clic-nonvector-interrupts
diff --git a/software/clic-selective-vector-interrupts b/software/clic-selective-vector-interrupts
diff --git a/software/clic-vector-interrupts b/software/clic-vector-interrupts
diff --git a/wit-manifest.json b/wit-manifest.json
@@ -60,14 +60,14 @@
         "source": "git@github.com:sifive/example-clic-hardware-vector-interrupts.git"
     },
     {
-        "commit": "f88ddeebc5ecd84989b685082951e6e9ad3a7655",
+        "commit": "f9e82a7274b7168629a800df67b3d50919256d4e",
         "name": "example-clic-selective-vector-interrupts",
         "source": "git@github.com:sifive/example-clic-selective-vector-interrupts.git"
     },
     {
-        "commit": "557e83049d6d515885c7fb1f4f22924316ec9a98",
-        "name": "example-clic-vector-interrupts",
-        "source": "git@github.com:sifive/example-clic-vector-interrupts.git"
+        "commit": "0d9e0833492948f44a4abf1bac677329c4b9f336",
+        "name": "example-clic-nonvector-interrupts",
+        "source": "git@github.com:sifive/example-clic-nonvector-interrupts.git"
     },
     {
         "commit": "e81774503fd4670830cb54508a4607c9a33fbc31",