From c41b655d40f0efd57b00b9f4c8842488415c2b7f Mon Sep 17 00:00:00 2001
From: Romain Dolbeau <romain@dolbeau.org>
Date: Sat, 23 Sep 2023 10:07:51 +0200
Subject: [PATCH] cleanup, missing accel in do

---
 sbus-to-ztex-gateware-migen/cg6_accel.py  |  4 ++--
 sbus-to-ztex-gateware-migen/do_V1.3       |  2 +-
 sbus-to-ztex-gateware-migen/prom_V1_3.fth | 17 +++++++++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/sbus-to-ztex-gateware-migen/cg6_accel.py b/sbus-to-ztex-gateware-migen/cg6_accel.py
index 982ef08..c82bcaf 100644
--- a/sbus-to-ztex-gateware-migen/cg6_accel.py
+++ b/sbus-to-ztex-gateware-migen/cg6_accel.py
@@ -267,8 +267,8 @@ class CG6Accel(Module): # AutoCSR ?
         #timeout_rst = 0xFFFFFFF
         #timeout = Signal(28, reset = timeout_rst)
 
-        pad_SBUS_DATA_OE_LED = platform.request("SBUS_DATA_OE_LED")
-        self.comb += pad_SBUS_DATA_OE_LED.eq(~local_reset)
+        #pad_SBUS_DATA_OE_LED = platform.request("SBUS_DATA_OE_LED")
+        #self.comb += pad_SBUS_DATA_OE_LED.eq(~local_reset)
         #self.comb += pad_SBUS_DATA_OE_LED.eq(fbc_r5_cmd[1]) # blitting
         #self.comb += pad_SBUS_DATA_OE_LED.eq(fbc_pm != 0) # planemasking
         #self.comb += pad_SBUS_DATA_OE_LED.eq(fifo_overflow)
diff --git a/sbus-to-ztex-gateware-migen/do_V1.3 b/sbus-to-ztex-gateware-migen/do_V1.3
index f5873e0..fd8ddb0 100644
--- a/sbus-to-ztex-gateware-migen/do_V1.3
+++ b/sbus-to-ztex-gateware-migen/do_V1.3
@@ -3,7 +3,7 @@ source /opt/Xilinx/Vivado/2020.1/settings64.sh
 export LD_LIBRARY_PATH=/opt/Xilinx/Vivado/2020.1/lib/lnx64.o/SuSE
 export PYTHONPATH=deps/gateware:$PYTHONPATH
 
-python3 sbus_to_fpga_soc.py --build --csr-csv csr.csv --csr-json csr.json --variant=ztex2.13a --version=V1.3 --sys-clk-freq 100e6 --trng --usb --sdram --i2c --goblin --cg3-res 1920x1080@60Hz
+python3 sbus_to_fpga_soc.py --build --csr-csv csr.csv --csr-json csr.json --variant=ztex2.13a --version=V1.3 --sys-clk-freq 100e6 --trng --usb --sdram --i2c --goblin --cg3-res 1920x1080@60Hz --jareth
 
 ) 2>&1 | tee build_V1_3.log
 # --trng
diff --git a/sbus-to-ztex-gateware-migen/prom_V1_3.fth b/sbus-to-ztex-gateware-migen/prom_V1_3.fth
index 3d92d6f..7ea023d 100644
--- a/sbus-to-ztex-gateware-migen/prom_V1_3.fth
+++ b/sbus-to-ztex-gateware-migen/prom_V1_3.fth
@@ -103,8 +103,21 @@ h# 61a80 encode-int " bus-speed" property
   finish-device
 finish-device
 new-device
-h# -1 constant sfra_jareth-regs
-h# 0 constant goblin-has-jareth
+headers
+-1 instance value goblin_accel-virt
+my-address constant my-sbus-address
+my-space constant my-sbus-space
+: map-in ( adr space size -- virt ) " map-in" $call-parent ;
+: map-out ( virt size -- ) " map-out" $call-parent ;
+: map-in-jareth ( -- )
+my-sbus-address sfra_goblin_accel + my-sbus-space h# 1000 map-in to goblin_accel-virt
+;
+: map-out-jareth ( -- )
+goblin_accel-virt h# 1000 map-out
+;
+h# 1 constant goblin-has-jareth
+fload goblin_jareth_define.fth
+fload goblin_jareth_init.fth
 : openbios-video-width
     h# 780
 ;