From eb0e4df5ea4d1aec92e46dae8ac6217167f9fba8 Mon Sep 17 00:00:00 2001
From: logicog <git@logicog.de>
Date: Sun, 26 Oct 2025 14:20:30 +0100
Subject: [PATCH] Fix reset after image upload

---
 rtlplayground.c | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/rtlplayground.c b/rtlplayground.c
index b3c77fd..5b59d75 100644
--- a/rtlplayground.c
+++ b/rtlplayground.c
@@ -1044,6 +1044,7 @@ void sleep(uint16_t t)
 void reset_chip(void)
 {
 	REG_SET(RTL837X_REG_RESET, 1);
+	while(1);
 }
 
 
@@ -1703,6 +1704,24 @@ void bootloader(void)
 	print_string("  Flash controller\n");
 	flash_init(0);
 
+	// Reset NIC
+	reg_bit_set(0x24, 2);
+	do {
+		reg_read(0x24);
+	} while (SFR_DATA_0 & 0x4);
+	print_string("NIC reset\n");
+
+	uip_ipaddr(&uip_hostaddr, ownIP[0], ownIP[1], ownIP[2], ownIP[3]);
+	uip_ipaddr(&uip_draddr, gatewayIP[0], gatewayIP[1], gatewayIP[2], gatewayIP[3]);
+	uip_ipaddr(&uip_netmask, netmask[0], netmask[1], netmask[2], netmask[3]);
+
+	REG_SET(0x7f94, 0x0);
+	if (isRTL8373)
+		rtl8373_init();
+	else
+		rtl8372_init();
+	delay(1000);
+
 	// Check update in progress and move blocks
 	flash_region.addr = FIRMWARE_UPLOAD_START;
 	flash_region.len = 0x100;
@@ -1722,10 +1741,13 @@ void bootloader(void)
 			flash_region.len = 0x200;
 			flash_read_bulk(flash_buf);
 			bptr = flash_buf;
-			for (j = 0; j < 0x200; j++)
+			for (j = 0; j < 0x200; j++) {
+				print_byte(*bptr); write_char(' ');
 				crc16(bptr++);
+				print_short(crc_value); write_char(':');
+			}
 			source += 0x200;
-			print_short(crc_value); write_char(' ');
+			write_char('\n'); print_short(crc_value); write_char(' ');
 		}
 		if (crc_value == 0xb001) {
 			print_string("Checksum OK\n");
@@ -1770,24 +1792,6 @@ void bootloader(void)
 		}
 	}
 
-	// Reset NIC
-	reg_bit_set(0x24, 2);
-	do {
-		reg_read(0x24);
-	} while (SFR_DATA_0 & 0x4);
-	print_string("NIC reset\n");
-
-	uip_ipaddr(&uip_hostaddr, ownIP[0], ownIP[1], ownIP[2], ownIP[3]);
-	uip_ipaddr(&uip_draddr, gatewayIP[0], gatewayIP[1], gatewayIP[2], gatewayIP[3]);
-	uip_ipaddr(&uip_netmask, netmask[0], netmask[1], netmask[2], netmask[3]);
-
-	REG_SET(0x7f94, 0x0);
-	if (isRTL8373)
-		rtl8373_init();
-	else
-		rtl8372_init();
-	delay(1000);
-
 #ifdef DEBUG
 	// This register seems to work on the RTL8373 only if also the SDS
 	// Is correctly configured. Therefore, we can test it, here...