Merge branch 'mi_dev' into mcs-support

rel4team · Nov 28, 2024 · 4f629aa · 4f629aa
2 parents 0cd19f2 + 33d8cca
commit 4f629aa
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -15,6 +15,7 @@ jobs:
     strategy:
       matrix:
         arch: [riscv64, aarch64]
+        mcs: [OFF, ON]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -34,7 +35,7 @@ jobs:
       - name: Make rel4_kernel
         run: cd rel4_kernel/kernel && make ARCH=${{ matrix.arch }} run
       - name: Build kernel
-        run: cd kernel && cmake cmake -DCROSS_COMPILER_PREFIX=${{ matrix.arch }}-linux-gnu- -C kernel-settings-${{ matrix.arch }}.cmake -G Ninja -S . -B build
+        run: cd kernel && cmake cmake -DCROSS_COMPILER_PREFIX=${{ matrix.arch }}-linux-gnu- -DMCS=${{matrix.mcs}} -C kernel-settings-${{ matrix.arch }}.cmake -G Ninja -S . -B build
       - name: Build Kernel
         run: cd kernel && ninja -C build
   sel4-test:
@@ -43,6 +44,7 @@ jobs:
     strategy:
       matrix:
         platform: [spike, qemu-arm-virt]
+        mcs: [off, on]
         include:
           - platform: qemu-arm-virt
             arch: aarch64
@@ -76,10 +78,11 @@ jobs:
         env:
           ARCH: ${{ matrix.arch  }}
           PLATFORM: ${{ matrix.platform }}
+          MCS: ${{ matrix.mcs }}
         run: |
           echo $ARCH
           echo $PLATFORM
-          cd rel4_kernel && ./build.py -p $PLATFORM
+          cd rel4_kernel && ./build.py -p $PLATFORM -m $MCS
       - name: simulate
         env:
           ARCH: ${{ matrix.arch  }}

diff --git a/driver-collect/.gitrepo b/driver-collect/.gitrepo
@@ -7,6 +7,6 @@
 	remote = git@github.com:rel4team/driver-collect.git
 	branch = mi_dev
 	commit = 3667ef6ab3d6c4831680310e4b8f0947258569ae
- 	parent = 038099532c29c681c9500b3091b3bdd3ac05db85
+ 	parent = 6512a99b1402ff340b2b71a2f95a33b6a16e4bc3
 	method = merge
 	cmdver = 0.4.9
diff --git a/kernel/.gitrepo b/kernel/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = git@github.com:rel4team/rel4_kernel.git
 	branch = mi_dev
-	commit = 2e4bfee939a1658e8effb04e42a91bcfb8f2d947
- 	parent = 038099532c29c681c9500b3091b3bdd3ac05db85
+	commit = d07224af0b20f91fd6101db86649dffee3c4faca
+ 	parent = 6512a99b1402ff340b2b71a2f95a33b6a16e4bc3
 	method = merge
 	cmdver = 0.4.9
diff --git a/sel4_common/.gitrepo b/sel4_common/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = git@github.com:rel4team/sel4_common.git
 	branch = mi_dev
-	commit = 831ca7d4bb0f53f524a05fe0207151c3300ad50f
- 	parent = 038099532c29c681c9500b3091b3bdd3ac05db85
+	commit = 5cb7cb109b1675aacf732f765e402f54fefe41e6
+ 	parent = 6512a99b1402ff340b2b71a2f95a33b6a16e4bc3
 	method = merge
 	cmdver = 0.4.9
diff --git a/sel4_cspace/.gitrepo b/sel4_cspace/.gitrepo
@@ -7,6 +7,6 @@
 	remote = git@github.com:rel4team/sel4_cspace.git
 	branch = mi_dev
 	commit = 59b7edaa7893ec1bd485b84f7648b82c1cff589a
- 	parent = 038099532c29c681c9500b3091b3bdd3ac05db85
+ 	parent = 6512a99b1402ff340b2b71a2f95a33b6a16e4bc3
 	method = merge
 	cmdver = 0.4.9
diff --git a/sel4_ipc/.gitrepo b/sel4_ipc/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = git@github.com:rel4team/sel4_ipc.git
 	branch = mi_dev
-	commit = f49b85f55b5552575e808fa2f1ad42421cf163cf
- 	parent = 038099532c29c681c9500b3091b3bdd3ac05db85
+	commit = f972a4d89213e98f5a870d647c1477c9403a4c2d
+ 	parent = 6512a99b1402ff340b2b71a2f95a33b6a16e4bc3
 	method = merge
 	cmdver = 0.4.9
diff --git a/sel4_task/.gitrepo b/sel4_task/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = git@github.com:rel4team/sel4_task.git
 	branch = mi_dev
-	commit = 09f051669f0d347d06fdfad41e86acff0a4ae311
- 	parent = 038099532c29c681c9500b3091b3bdd3ac05db85
+	commit = f572c8c066aa1dc877e27970c6896d6a2a480f02
+ 	parent = 6512a99b1402ff340b2b71a2f95a33b6a16e4bc3
 	method = merge
 	cmdver = 0.4.9
diff --git a/sel4_vspace/.gitrepo b/sel4_vspace/.gitrepo
@@ -7,6 +7,6 @@
 	remote = git@github.com:rel4team/sel4_vspace.git
 	branch = mi_dev
 	commit = aa09a5551f4590c2aac6ab311f89a1727f21b18c
- 	parent = 038099532c29c681c9500b3091b3bdd3ac05db85
+ 	parent = 6512a99b1402ff340b2b71a2f95a33b6a16e4bc3
 	method = merge
 	cmdver = 0.4.9
diff --git a/serial-frame/.gitrepo b/serial-frame/.gitrepo
@@ -7,6 +7,6 @@
 	remote = git@github.com:rel4team/serial-frame.git
 	branch = mi_dev
 	commit = 84501a7640813af351464cbb915ba1f63a9f68fe
- 	parent = 038099532c29c681c9500b3091b3bdd3ac05db85
+ 	parent = 6512a99b1402ff340b2b71a2f95a33b6a16e4bc3
 	method = merge
 	cmdver = 0.4.9
diff --git a/serial-impl/pl011/.gitrepo b/serial-impl/pl011/.gitrepo
@@ -7,6 +7,6 @@
 	remote = git@github.com:rel4team/serial-impl-pl011.git
 	branch = mi_dev
 	commit = 83e073e19e74420a877b7b099e02c7667e6d6244
- 	parent = 038099532c29c681c9500b3091b3bdd3ac05db85
+ 	parent = 6512a99b1402ff340b2b71a2f95a33b6a16e4bc3
 	method = merge
 	cmdver = 0.4.9
diff --git a/serial-impl/sbi/.gitrepo b/serial-impl/sbi/.gitrepo
@@ -7,6 +7,6 @@
 	remote = git@github.com:rel4team/serial-impl-sbi.git
 	branch = mi_dev
 	commit = 4face963815d4a453f47589ced43cdf9068fde7b
- 	parent = 038099532c29c681c9500b3091b3bdd3ac05db85
+ 	parent = 6512a99b1402ff340b2b71a2f95a33b6a16e4bc3
 	method = merge
 	cmdver = 0.4.9