Skip to content

Commit 7f8a69e

Browse files
ziuziakowskaengdoreis
authored andcommitted
[doc] update workshop exercises instructions for v1.1 branch
Signed-off-by: Alice Ziuziakowska <a.ziuziakowska@lowrisc.org>
1 parent 0ad1a59 commit 7f8a69e

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

doc/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Nix can and will build everything from source if it can't find a cached version,
110110
Clone the Sonata software repository, *making sure to recursively clone submodules as well*, then navigate into it.
111111

112112
```sh
113-
git clone --branch v1.0 \
113+
git clone --branch v1.1 \
114114
--recurse-submodule \
115115
https://github.com/lowRISC/sonata-software.git
116116
cd sonata-software

exercises/firmware_auditing/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ To convert the undefined value to a Boolean, we use the `default` keyword, which
4444
We can run this policy on our example firmware using the following command:
4545

4646
```sh
47-
cheriot-audit --board=cheriot-rtos/sdk/boards/sonata.json \
47+
cheriot-audit --board=cheriot-rtos/sdk/boards/sonata-prerelease.json \
4848
--firmware-report=build/cheriot/cheriot/release/firmware_auditing_part_1.json \
4949
--module=exercises/firmware_auditing/part_1/no_sealed_capabilities.rego \
5050
--query='data.no_seal.valid'
@@ -138,7 +138,7 @@ Finally, we create a simple Boolean `valid` rule which combines our two conditio
138138

139139
Now, we can audit the firmware for this exercise by using the following command:
140140
```sh
141-
cheriot-audit --board=cheriot-rtos/sdk/boards/sonata.json \
141+
cheriot-audit --board=cheriot-rtos/sdk/boards/sonata-prerelease.json \
142142
--firmware-report=build/cheriot/cheriot/release/firmware_auditing_part_2.json \
143143
--module=exercises/firmware_auditing/part_2/interrupt_disables.rego \
144144
--query='data.interrupts.valid'
@@ -203,7 +203,7 @@ For this exercise, we decide that all sealed allocator capabilities must be vali
203203

204204
We can audit our firmware using the following command:
205205
```sh
206-
cheriot-audit --board=cheriot-rtos/sdk/boards/sonata.json \
206+
cheriot-audit --board=cheriot-rtos/sdk/boards/sonata-prerelease.json \
207207
--firmware-report=build/cheriot/cheriot/release/firmware_auditing_part_3.json \
208208
--module=exercises/firmware_auditing/part_3/malloc_check.rego \
209209
--query='data.malloc_check.valid'

exercises/hardware_access_control/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ However, when run against the part 1 firmware image's report it will return fals
118118
```sh
119119
# This should return true
120120
cheriot-audit \
121-
--board cheriot-rtos/sdk/boards/sonata-1.1.json \
121+
--board cheriot-rtos/sdk/boards/sonata-prerelease.json \
122122
--module exercises/hardware_access_control/part_3/gpio_access.rego \
123123
--query "data.gpio_access.only_gpio_access_has_access" \
124124
--firmware-report "build/cheriot/cheriot/release/hardware_access_part_2.json"
125125
# This should return false
126126
cheriot-audit \
127-
--board cheriot-rtos/sdk/boards/sonata-1.1.json \
127+
--board cheriot-rtos/sdk/boards/sonata-prerelease.json \
128128
--module exercises/hardware_access_control/part_3/gpio_access.rego \
129129
--query "data.gpio_access.only_gpio_access_has_access" \
130130
--firmware-report "build/cheriot/cheriot/release/hardware_access_part_1.json"
@@ -135,7 +135,7 @@ We can use this to restrict which compartments have access to the GPIO via `gpio
135135

136136
```sh
137137
cheriot-audit \
138-
--board cheriot-rtos/sdk/boards/sonata-1.1.json \
138+
--board cheriot-rtos/sdk/boards/sonata-prerelease.json \
139139
--module exercises/hardware_access_control/part_3/gpio_access.rego \
140140
--query "data.gpio_access.whitelisted_compartments_only" \
141141
--firmware-report "build/cheriot/cheriot/release/hardware_access_part_2.json"

0 commit comments

Comments
 (0)