From b458f365959764f1f4ee1e98af5a3651aa02bf06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Thu, 8 Oct 2020 18:51:53 +0200 Subject: [PATCH] Doesn't make sense for board to have hardcoded device tree address. Expose method to generate device tree to some address instead. --- src/main/java/li/cil/oc2/client/gui/RISCVTestScreen.java | 1 + src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/li/cil/oc2/client/gui/RISCVTestScreen.java b/src/main/java/li/cil/oc2/client/gui/RISCVTestScreen.java index 13dc8fe0..f7ca21f8 100644 --- a/src/main/java/li/cil/oc2/client/gui/RISCVTestScreen.java +++ b/src/main/java/li/cil/oc2/client/gui/RISCVTestScreen.java @@ -199,6 +199,7 @@ public final class RISCVTestScreen extends Screen { loadProgramFile(memory, Buildroot.getLinuxImage()); loadProgramFile(rom, Buildroot.getFirmware()); + board.installDeviceTree(0x80000000 + 0x02200000); runner = new ConsoleRunner(board); } diff --git a/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java b/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java index a5a3bad3..80c73cf3 100644 --- a/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java +++ b/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java @@ -208,6 +208,7 @@ public final class ComputerTileEntity extends TileEntity implements ITickableTil } virtualMachine.board.reset(); + virtualMachine.board.installDeviceTree(0x80000000 + 0x02200000); runner = new ConsoleRunner(virtualMachine); }