From 3c168be4b34d368352569a2f169e54d853e25332 Mon Sep 17 00:00:00 2001 From: Bunnaroath Sou Date: Mon, 30 Mar 2020 18:30:06 -0700 Subject: [PATCH 1/3] Remove clic-vector-interrupts --- .gitmodules | 3 --- software/clic-vector-interrupts | 1 - 2 files changed, 4 deletions(-) delete mode 160000 software/clic-vector-interrupts diff --git a/.gitmodules b/.gitmodules index ad47d7790..a30c4fd67 100644 --- 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 diff --git a/software/clic-vector-interrupts b/software/clic-vector-interrupts deleted file mode 160000 index 557e83049..000000000 --- a/software/clic-vector-interrupts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 557e83049d6d515885c7fb1f4f22924316ec9a98 From c94982cb73495dfc61a4f6179676ee592e0c1370 Mon Sep 17 00:00:00 2001 From: Bunnaroath Sou Date: Mon, 30 Mar 2020 18:40:02 -0700 Subject: [PATCH 2/3] ReAdd clic-vector-interrupts as clic-nonvector-interrupts --- .gitmodules | 3 +++ software/clic-nonvector-interrupts | 1 + 2 files changed, 4 insertions(+) create mode 160000 software/clic-nonvector-interrupts diff --git a/.gitmodules b/.gitmodules index a30c4fd67..b37a33ea6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -136,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/software/clic-nonvector-interrupts b/software/clic-nonvector-interrupts new file mode 160000 index 000000000..557e83049 --- /dev/null +++ b/software/clic-nonvector-interrupts @@ -0,0 +1 @@ +Subproject commit 557e83049d6d515885c7fb1f4f22924316ec9a98 From 37fc38bb12b012c3ecbca33771b665d4a8d1a92c Mon Sep 17 00:00:00 2001 From: Bunnaroath Sou Date: Mon, 30 Mar 2020 19:54:31 -0700 Subject: [PATCH 3/3] Bump for clic-nonvector-interrupts and clic-selective-vector-interrupts --- doc/sphinx/contents.rst | 6 +++++- software/clic-nonvector-interrupts | 2 +- software/clic-selective-vector-interrupts | 2 +- wit-manifest.json | 8 ++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/doc/sphinx/contents.rst b/doc/sphinx/contents.rst index cfc228e98..d49528719 100644 --- 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 index 557e83049..0d9e08334 160000 --- a/software/clic-nonvector-interrupts +++ b/software/clic-nonvector-interrupts @@ -1 +1 @@ -Subproject commit 557e83049d6d515885c7fb1f4f22924316ec9a98 +Subproject commit 0d9e0833492948f44a4abf1bac677329c4b9f336 diff --git a/software/clic-selective-vector-interrupts b/software/clic-selective-vector-interrupts index f88ddeebc..f9e82a727 160000 --- a/software/clic-selective-vector-interrupts +++ b/software/clic-selective-vector-interrupts @@ -1 +1 @@ -Subproject commit f88ddeebc5ecd84989b685082951e6e9ad3a7655 +Subproject commit f9e82a7274b7168629a800df67b3d50919256d4e diff --git a/wit-manifest.json b/wit-manifest.json index 54bb32ef2..535a77ef2 100644 --- 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",