From 4b35d3f19a5e23bfa2316c689816ab0fe8ba994d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carsten=20Elton=20S=C3=B8rensen?= <cso@rift.dk>
Date: Sat, 15 Apr 2023 09:10:32 +0200
Subject: [PATCH] Updated to GLaBIOS v0.2.4

---
 GBN8.BAT      | 2 +-
 GBNV.BAT      | 2 +-
 Makefile      | 8 ++------
 README.md     | 2 --
 glabios       | 2 +-
 glabios.patch | 8 --------
 6 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 glabios.patch

diff --git a/GBN8.BAT b/GBN8.BAT
index 9b5dd90..0cfd0b3 100644
--- a/GBN8.BAT
+++ b/GBN8.BAT
@@ -3,6 +3,6 @@
 REM Make (G)La(B)IOS (N)uXT (8)088
 
 cd glabios/src
-MASM /DARCH_TYPE='F' /DCPU_TYPE='8' GLABIOS,GLANUXT8;
+MASM /DARCH_TYPE='F' /DARCH_SUB_TYPE='M' GLABIOS,GLANUXT8;
 LINK GLANUXT8;
 GLA2ROM\GLA2ROM GLANUXT8.EXE GLANUXT8.ROM
diff --git a/GBNV.BAT b/GBNV.BAT
index 40bba95..1776081 100644
--- a/GBNV.BAT
+++ b/GBNV.BAT
@@ -3,6 +3,6 @@
 REM Make (G)La(B)IOS (N)uXT (V)20
 
 cd glabios/src
-MASM /DARCH_TYPE='F' /DCPU_TYPE='V' GLABIOS,GLANUXTV;
+MASM /DARCH_TYPE='F' /DARCH_SUB_TYPE='M' /DCPU_TYPE='V' GLABIOS,GLANUXTV;
 LINK GLANUXTV;
 GLA2ROM\GLA2ROM GLANUXTV.EXE GLANUXTV.ROM
diff --git a/Makefile b/Makefile
index b401f3d..684f5a7 100644
--- a/Makefile
+++ b/Makefile
@@ -32,14 +32,10 @@ $(XUB_DIR)/Build/ide_xt.bin:
 	$(MAKE) -C $(XUB_DIR) AS=nasm xt
 	perl $(XUB_DIR)/../Tools/checksum.pl $(XUB_DIR)/Build/ide_xt.bin 8192
 
-$(GLABIOS_DIR)/_patched: $(GLABIOS_DIR)/GLABIOS.ASM glabios.patch
-	-patch -r /dev/null -N $(GLABIOS_DIR)/GLABIOS.ASM glabios.patch
-	touch $@
-
-$(GLABIOS_DIR)/GLANUXT8.ROM: $(GLABIOS_DIR)/GLABIOS.ASM $(GLABIOS_DIR)/_patched
+$(GLABIOS_DIR)/GLANUXT8.ROM: $(GLABIOS_DIR)/GLABIOS.ASM
 	dosbox GBN8.BAT -exit -c "MOUNT D \"masm5\"" -c "PATH D:;Z:"
 
-$(GLABIOS_DIR)/GLANUXTV.ROM: $(GLABIOS_DIR)/GLABIOS.ASM $(GLABIOS_DIR)/_patched
+$(GLABIOS_DIR)/GLANUXTV.ROM: $(GLABIOS_DIR)/GLABIOS.ASM
 	dosbox GBNV.BAT -exit -c "MOUNT D \"masm5\"" -c "PATH D:;Z:"
 
 $(GLATICK_DIR)/_patched: $(GLATICK_SRC) rtc.patch
diff --git a/README.md b/README.md
index 1bebf6d..0b8ff37 100644
--- a/README.md
+++ b/README.md
@@ -65,8 +65,6 @@ To build the V20 optimized option `USE_NEC_V=1` is passed to `make`.
 ## GLaBIOS
 GLaBIOS is built using `masm` 5.0, this is included in the `masm5` directory. DOSBox is used to do the build.
 
-GLaBIOS is patched to target NuXT hardware and to support IBM Cassette BASIC in `Makefile` using the `glabios.patch` file.
-
 Two DOS `.BAT` files are used to control the build process, `GBN8.BAT` (for (G)La(B)IOS (N)uXT (8)088) passes `/DARCH_TYPE='F' /DCPU_TYPE='8'` to `masm` for targeting Faraday FE2010A and 8088. `GBNV.BAT` (for (G)La(B)IOS (N)uXT (V)20) passes `/DARCH_TYPE='F' /DCPU_TYPE='V'` to target V20 instead.
 
 ## GLaTICK
diff --git a/glabios b/glabios
index 90efb1f..6f6b0fc 160000
--- a/glabios
+++ b/glabios
@@ -1 +1 @@
-Subproject commit 90efb1ff909f2347963b5ef1fda646f98b2ce81d
+Subproject commit 6f6b0fc4d5717396e274a7c76024835a97f665ca
diff --git a/glabios.patch b/glabios.patch
deleted file mode 100644
index bb9599e..0000000
--- a/glabios.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-291c291
-< BASIC_ROM		= 	0			; disable to free code space
----
-> BASIC_ROM		= 	1			; disable to free code space
-300c300
-< MICRO_8088		=	0			; build for micro_8088 / NuXT
----
-> MICRO_8088		=	1			; build for micro_8088 / NuXT