arch-msx/msxbuild
2
0
Fork 0
Code Issues Pull requests 3 Actions Activity

Fixed nextor boot, by using updated device.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 2s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-25 12:00:35 +02:00
parent d66976afaf
commit a9da661dc0
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/make/mb_openmsx.mk
View file

@ -3,7 +3,9 @@ MB_OPENMSX_BOOT_TIMEOUT ?= 25
MB_OPENMSX_MACHINE ?= Philips_NMS_8250 MB_OPENMSX_MACHINE ?= Philips_NMS_8250
MB_OPENMSX_SPEED ?= $(if $(findstring turboR,$(MB_OPENMSX_MACHINE)),100,333) MB_OPENMSX_SPEED ?= $(if $(findstring turboR,$(MB_OPENMSX_MACHINE)),100,333)
MB_OPENMSX_EXTS ?= MB_OPENMSX_EXTS ?=
MB_OPENMSX_EXTRA_SLOT ?= -ext slotexpander
MB_OPENMSX_EXTRA_MEM ?= -ext ram4mb MB_OPENMSX_EXTRA_MEM ?= -ext ram4mb
MB_OPENMSX_EXTRA_IDE ?= -ext ide-nextor
MB_OPENMSX_JOYPORTA ?= MB_OPENMSX_JOYPORTA ?=
MB_OPENMSX_JOYPORTB ?= MB_OPENMSX_JOYPORTB ?=
MB_OPENMSX_SCALE_FACTOR ?= 3 MB_OPENMSX_SCALE_FACTOR ?= 3
@ -11,7 +13,10 @@ MB_OPENMSX_THROTTLE ?= off
MB_OPENMSX_RENDERER ?= MB_OPENMSX_RENDERER ?=
MB_OPENMSX_ARGS = \ MB_OPENMSX_ARGS = \
-machine $(MB_OPENMSX_MACHINE) \ -machine $(MB_OPENMSX_MACHINE) \
-ext slotexpander -ext ide $(MB_OPENMSX_EXTRA_MEM) $(MB_OPENMSX_EXTS) \ $(MB_OPENMSX_EXTRA_SLOT) \
$(MB_OPENMSX_EXTRA_IDE) \
$(MB_OPENMSX_EXTRA_MEM) \
$(MB_OPENMSX_EXTS) \
-script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_env.tcl \ -script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_env.tcl \
-script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_hdd.tcl \ -script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_hdd.tcl \
-script $(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl \ -script $(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl \

2
lib/make/mb_packages.mk
View file

@ -15,9 +15,7 @@ define mb_package_dos2
$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/MSXDOS2.SYS) $(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/MSXDOS2.SYS)
$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/COMMAND2.COM) $(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/COMMAND2.COM)
endef endef
# TODO: remove MSXDOS2.SYS...
define mb_package_nextor define mb_package_nextor
$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/MSXDOS2.SYS)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTOR.SYS) $(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTOR.SYS)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/COMMAND2.COM) $(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/COMMAND2.COM)
endef endef