From 58dd2e9725b7ba05238f12a4432a83740eff7511 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sun, 1 Oct 2023 02:47:29 -0600
Subject: Makefile: set proper paths for linux boot

---
 .gitignore     |  1 +
 Makefile       |  2 +-
 sim/gdbstub.py | 10 ++++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 353ae87..4f678cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ hps_sdram_p0_summary.csv
 vcd/
 cov/
 obj/
+build/
 .qsys_edit/
 platform/
 platform.sopcinfo
diff --git a/Makefile b/Makefile
index 0423c5e..1292b22 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ sim/%: $(SIM_DIR)/sim.py $(TB_SIM_DIR)/%.py exe/$(TOP) $(SIM_OBJ_DIR)/%.bin
 		$(if $(DISABLE_COV),,$(SIM_OBJ_DIR)/$*.cov)
 
 vmlaunch: $(SIM_DIR)/sim.py $(SIM_DIR)/gdbstub.py exe/$(TOP)
-	@$< $(SIM_DIR)/gdbstub.py $(OBJ_DIR)/$(TOP)/V$(TOP) u-boot/build/taller/u-boot-dtb.bin
+	@$< $(SIM_DIR)/gdbstub.py $(OBJ_DIR)/$(TOP)/V$(TOP) build/u-boot.bin
 
 ifndef DISABLE_COV
 $(COV_DIR): $(OBJ_DIR)/$(TOP)/cov.info
diff --git a/sim/gdbstub.py b/sim/gdbstub.py
index e7791bc..3bd078c 100644
--- a/sim/gdbstub.py
+++ b/sim/gdbstub.py
@@ -1,7 +1,12 @@
 import sys, socket, traceback
 
+loads = {0x0100000: 'build/uImage',
+         0x1000000: 'build/initrd.img',
+        }
+
 cycles = None
 enable_tty = True
+enable_video = True
 start_halted = True
 sock, client = None, None
 
@@ -23,10 +28,7 @@ def fatal():
 def do_output(text):
     if text is None:
         return not is_halted()
-
-    print(text, file=sys.stderr, end='')
-
-    if not client:
+    elif not client:
         return False
 
     reply(b'O' + hexout(text.encode('ascii')))
-- 
cgit v1.2.3