Skip to content

Commit 41a4d29

Browse files
authored
Merge pull request #20 from zarhus/simplify-copy
guides: rpi4-crosscon: simplify copying symlinked file
2 parents 86f18eb + 380eb0e commit 41a4d29

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

docs/guides/rpi4-crosscon-hypervisor.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,12 @@ sure to copy the actual kernel, not the symlink):
5151

5252
```bash
5353
cd build/tmp/deploy/images/raspberrypi4-64/
54-
file Image
55-
docker cp Image-1-6.6.22+git0+6a24861d65_c04af98514-r0-raspberrypi4-64-20250226164115.bin crosscon_hv_container:/work/Image
54+
docker cp -L Image crosscon_hv_container:/work/Image
5655
```
5756

5857
!!! note
5958

60-
The `file Image` command is critical here, because the `Image`
61-
file is actually just a symlink. By using that command, it reveals the true
62-
location of the actual kernel file (in this example it was
63-
`Image-1-6.6.22+git0+6a24861d65_c04af98514-r0-raspberrypi4-64-20250226164115.bin`,
64-
but it differs between builds), which is what needs to be copied over
65-
to the container.
59+
`-L` argument is needed to copy underlying file instead of symlink
6660

6761
## The final image
6862

@@ -176,14 +170,14 @@ needs to be applied:
176170
```git
177171
root@565810a48049:/work/crosscon/CROSSCON-Hypervisor# git diff src/arch/armv8/aborts.c
178172
diff --git a/src/arch/armv8/aborts.c b/src/arch/armv8/aborts.c
179-
index a7f5adc..503dc30 100644
173+
index a7f5adc..90e1262 100644
180174
--- a/src/arch/armv8/aborts.c
181175
+++ b/src/arch/armv8/aborts.c
182176
@@ -43,6 +43,7 @@ void internal_abort_handler(uint64_t gprs[]) {
183177
184178
void aborts_data_lower(uint64_t iss, uint64_t far, uint64_t il)
185179
{
186-
+ printk("magic printk\n");
180+
+ printk("\x9D");
187181
if (!(iss & ESR_ISS_DA_ISV_BIT) || (iss & ESR_ISS_DA_FnV_BIT)) {
188182
ERROR("no information to handle data abort (0x%x)", far);
189183
}
@@ -196,7 +190,9 @@ root@565810a48049:/work/crosscon/CROSSCON-Hypervisor#
196190
necessary to use in order to apply this change.
197191

198192
This additional `printk` keeps the UART output going, so that the console can
199-
be accessed. Right now, according to
193+
be accessed. `\x9D` is unprintable character and is used so it doesn't pollute
194+
serial output. It mostly works (sometimes you can see cursor changing position).
195+
Right now, according to
200196
[this issue](https://github.com/crosscon/CROSSCON-Hypervisor-and-TEE-Isolation-Demos/issues/8#issuecomment-2702293550)
201197
this is the only workaround.
202198

0 commit comments

Comments
 (0)