diff --git a/lagarto-ox.nix b/lagarto-ox.nix index b160dda..3e89bc2 100644 --- a/lagarto-ox.nix +++ b/lagarto-ox.nix @@ -189,19 +189,13 @@ echo 'booti ''${kernel_addr_r} ''${ramdisk_addr_r}:''${ramdisk_size} ''${fdtcontroladdr}' >> $out ''; - # Lagarto OX doesn't work with newer versions of OpenSBI (1.3, 1.4), not - # sure why. opensbi = prev.opensbi.overrideAttrs (old: rec { - version = "1.2"; # ok - #version = "1.3"; # bad - #version = "1.4"; # bad + version = "1.4"; src = prev.fetchFromGitHub { owner = "riscv-software-src"; repo = "opensbi"; rev = "v${version}"; - hash = "sha256-Zcl+SE2nySMycV/ozsl4AvGipRsMblA5mt3oVZ81Z44="; #1.2 - #hash = "sha256-Dr16fVUGLYGnGYHkjAyqpJxt8p95F0CJIU9ESGWKGWo="; #1.3 - #hash = "sha256-T8ZeAzjM9aeTXitjE7s+m+jjGGtDo2jK1qO5EuKiVLU="; #1.4 + hash = "sha256-T8ZeAzjM9aeTXitjE7s+m+jjGGtDo2jK1qO5EuKiVLU="; }; #NIX_DEBUG=5; makeFlags = [ diff --git a/ox-alveo-platform-plic.patch b/ox-alveo-platform-plic.patch index d906a6f..cd54047 100644 --- a/ox-alveo-platform-plic.patch +++ b/ox-alveo-platform-plic.patch @@ -42,7 +42,7 @@ new file mode 100644 index 0000000..a359b34 --- /dev/null +++ b/platform/fpga/ox_alveo/platform.c -@@ -0,0 +1,121 @@ +@@ -0,0 +1,122 @@ +#include +#include +#include @@ -162,5 +162,6 @@ index 0000000..a359b34 + .features = SBI_PLATFORM_DEFAULT_FEATURES, + .hart_count = OX_ALVEO_HART_COUNT, + .hart_stack_size = SBI_PLATFORM_DEFAULT_HART_STACK_SIZE, ++ .heap_size = SBI_PLATFORM_DEFAULT_HEAP_SIZE(OX_ALVEO_HART_COUNT), + .platform_ops_addr = (unsigned long)&ox_alveo_ops +};