From d3779d0f95b1346030d619dd0a6c4788fe9144fe Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Fri, 12 Jul 2024 18:28:43 +0200 Subject: [PATCH] Revert serial address and move FDT --- JOURNAL.md | 5 +++++ lagarto-ox.nix | 2 +- ox-plic.dts | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/JOURNAL.md b/JOURNAL.md index 4f0a2d1..395aac8 100644 --- a/JOURNAL.md +++ b/JOURNAL.md @@ -2450,3 +2450,8 @@ OpenSBI 1.4 generic: Let's try to move the serial region to 0x40000000, although that seems to be wrong. + +Yep, that causes OpenSBI to not emit any message in the console, so let's put it +back in 0x40001000. + +Next, we may want to place the FDT in the previous location, at 0x80017000. diff --git a/lagarto-ox.nix b/lagarto-ox.nix index b03be3d..e25a3c3 100644 --- a/lagarto-ox.nix +++ b/lagarto-ox.nix @@ -322,7 +322,7 @@ # Ensure it doesn't overlap from the 0x80200000 where the kernel will be # placed. - "FW_PAYLOAD_FDT_ADDR=0x80100000" + "FW_PAYLOAD_FDT_ADDR=0x80017000" ]; patches = [ #./opensbi-timer-debug.patch diff --git a/ox-plic.dts b/ox-plic.dts index 7d33acf..0f41ba0 100644 --- a/ox-plic.dts +++ b/ox-plic.dts @@ -118,9 +118,9 @@ * consoles */ /* The serial for the kernel console */ - uart_console: serial@40000000 { + uart_console: serial@40001000 { compatible = "ns16550"; - reg = <0x0 0x40000000 0x0 0x1000>; + reg = <0x0 0x40001000 0x0 0x1000>; reg-shift = <2>; /* No interrupts for this UART, use console=hvc0 */ /* This clock is the SERIAL_CLK */