rarias/nixos-riscv
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Don't use DTB in U-Boot, read it from OpenSBI

Browse Source
This commit is contained in:
Rodrigo Arias 2024-07-11 16:00:43 +02:00
parent 5ddea498ca
commit 9f6f8bcddc
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
JOURNAL.md
View File

@ -1393,3 +1393,21 @@ from the host to the serial console to test it.
It may be worth enabling huge pages again, as there didn't seem to have any It may be worth enabling huge pages again, as there didn't seem to have any
effect. effect.
### OBSERVATION: There are extra regions mapped by OpenSBI
In the OpenSBI 1.2 test from buildroot:
Domain0 Region00 : 0x0000000080000000-0x000000008003ffff ()
Domain0 Region01 : 0x0000000000000000-0xffffffffffffffff (R,W,X)
Domain0 Next Address : 0x0000000080200000
Domain0 Next Arg1 : 0x0000000080010000
But with OpenSBI 1.4:
Domain0 Region00 : 0x0000000040000000-0x0000000040000fff M: (I,R,W) S/U: (R,W)
Domain0 Region01 : 0x0000000080020000-0x000000008002ffff M: (R,W) S/U: ()
Domain0 Region02 : 0x0000000080000000-0x000000008001ffff M: (R,X) S/U: ()
Domain0 Region03 : 0x0000000000000000-0xffffffffffffffff M: () S/U: (R,W,X)
Domain0 Next Address : 0x0000000080200000
Domain0 Next Arg1 : 0x0000000080013000

4
lagarto-ox.nix
View File

@ -217,7 +217,7 @@
bootrom = "${final.bitstreams}/lagarto-3-ox/large_bootrom.bin"; bootrom = "${final.bitstreams}/lagarto-3-ox/large_bootrom.bin";
uboot = prev.ubootQemuRiscv64Smode.override { uboot = prev.ubootQemuRiscv64Smode.override {
filesToInstall = [ "u-boot.bin" "u-boot-nodtb.bin" ]; filesToInstall = [ "u-boot-nodtb.bin" ];
#version = "2023.07.02-print-cpu-probe"; #version = "2023.07.02-print-cpu-probe";
#src = builtins.fetchGit { #src = builtins.fetchGit {
# url = "file:///home/Computational/rarias/riscv/u-boot"; # url = "file:///home/Computational/rarias/riscv/u-boot";
@ -319,7 +319,7 @@
#"PLATFORM_RISCV_ISA=rv64imafd" # No compressed instructions #"PLATFORM_RISCV_ISA=rv64imafd" # No compressed instructions
#"PLATFORM_RISCV_ISA=rv64g" # No compressed instructions #"PLATFORM_RISCV_ISA=rv64g" # No compressed instructions
#"PLATFORM_RISCV_ABI=lp64d" #"PLATFORM_RISCV_ABI=lp64d"
"FW_PAYLOAD_PATH=${final.uboot}/u-boot.bin" "FW_PAYLOAD_PATH=${final.uboot}/u-boot-nodtb.bin"
"FW_FDT_PATH=${final.ox-dtb}" "FW_FDT_PATH=${final.ox-dtb}"
]; ];
patches = [ ./ox-alveo-platform-plic.patch ]; patches = [ ./ox-alveo-platform-plic.patch ];