Skip to content

Hardware QSPI flash controller #936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0xa000 wants to merge 15 commits into
base: development
Choose a base branch
from
Open

Hardware QSPI flash controller #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e42790f
Extract QSPI flash controller and sector buffer from sdcardio.vhdl.
0xa000 Mar 26, 2026
8b331b2
Replace extracted QPI controller.
0xa000 Mar 28, 2026
755cccc
Rename qspi_flash to include the supported flash model numbers.
0xa000 Mar 28, 2026
69fda96
Fix supported erase block sizes; update sensitivity list.
0xa000 Mar 29, 2026
88c50e0
Add QSPI flash controller implementation for S25FLXXXS models.
0xa000 Mar 29, 2026
3d60986
Update megaflash to use the new QSPI hardware controller.
0xa000 Mar 29, 2026
a38ba0a
Remove obsolete software QSPI device drivers.
0xa000 Mar 29, 2026
37b5bc7
Add other erase block sizes and renumber QSPI actions.
0xa000 Mar 29, 2026
ab2a824
Fix whitespace.
0xa000 Mar 29, 2026
9aea2d8
Remove bit-bang support.
0xa000 Mar 29, 2026
9e84690
Update Makefile.
0xa000 Mar 29, 2026
23490a6
Add sector buffer and new QSPI controller to current targets.
0xa000 Mar 29, 2026
19c9f44
Remove now obsolete files.
0xa000 Apr 10, 2026
dc04d16
QSPI: fix transfer size to 512 bytes, move status register to $D6C1.
0xa000 May 14, 2026
7a5e1de
QSPI: fix busy polling, unify error reporting, refactor error states.
0xa000 May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 31 additions & 88 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,9 +455,8 @@ MEMVHDL= $(VHDLSRCDIR)/ghdl_chipram8bit.vhdl \
$(VHDLSRCDIR)/ghdl_videobuffer.vhdl \
$(VHDLSRCDIR)/ghdl_ram36x1k.vhdl \
$(VHDLSRCDIR)/asym_ram.vhdl \
$(VHDLSRCDIR)/shadowram-s25flxlno.vhdl \
$(VHDLSRCDIR)/shadowram-s25flxsno.vhdl \
$(VHDLSRCDIR)/shadowram-s25flxs.vhdl
$(VHDLSRCDIR)/shadowram-no-attic.vhdl \
$(VHDLSRCDIR)/shadowram-attic.vhdl

NEXYSVHDL= $(VHDLSRCDIR)/slowram.vhdl \
$(VHDLSRCDIR)/sdcard.vhdl \
Expand Down Expand Up @@ -910,11 +909,7 @@ $(SDCARD_DIR)/ONBOARD.M65: $(UTILDIR)/onboard.c $(UTILDIR)/version.s $(MEG
MFUTILDIR=$(UTILDIR)/megaflash

MFLASH_QSPI_H = \
$(MFUTILDIR)/qspiflash.h \
$(MFUTILDIR)/s25flxxxl.h \
$(MFUTILDIR)/s25flxxxs.h \
$(MFUTILDIR)/qspihwassist.h \
$(MFUTILDIR)/qspibitbash.h
$(MFUTILDIR)/qspiflash.h

MFLASH_BASE_H = \
$(UTILDIR)/version.h \
Expand Down Expand Up @@ -947,54 +942,31 @@ MFLASH_SOLO_H = \
$(MFUTILDIR)/mf_hlflash.h \
$(MFLASH_BASE_H)

MFLASH_CORE_S25FLXLNO_OBJ = \
MFLASH_CORE_NO_ATTIC_OBJ = \
$(MFUTILDIR)/mf_screens.o \
$(MFUTILDIR)/mf_hlflash_s25flxlno.o \
$(MFUTILDIR)/qspiflash_s25flxlno.o \
$(MFUTILDIR)/s25flxxxl_s25flxlno.o \
$(MFUTILDIR)/qspihwassist_s25flxlno.o \
$(MFUTILDIR)/qspibitbash_s25flxlno.o \
$(MFUTILDIR)/mf_hlflash_no_attic.o \
$(MFUTILDIR)/qspiflash.o \
$(MFLASH_BASE_OBJ)

MFLASH_CORE_S25FLXSNO_OBJ = \
MFLASH_CORE_ATTIC_OBJ = \
$(MFUTILDIR)/mf_screens.o \
$(MFUTILDIR)/mf_hlflash_s25flxsno.o \
$(MFUTILDIR)/qspiflash_s25flxsno.o \
$(MFUTILDIR)/s25flxxxs_s25flxsno.o \
$(MFUTILDIR)/qspihwassist_s25flxsno.o \
$(MFUTILDIR)/qspibitbash_s25flxsno.o \
$(MFLASH_BASE_OBJ)

MFLASH_CORE_S25FLXS_OBJ = \
$(MFUTILDIR)/mf_screens.o \
$(MFUTILDIR)/mf_hlflash_s25flxs.o \
$(MFUTILDIR)/qspiflash_s25flxs.o \
$(MFUTILDIR)/s25flxxxs_s25flxs.o \
$(MFUTILDIR)/qspihwassist_s25flxs.o \
$(MFUTILDIR)/qspibitbash_s25flxs.o \
$(MFUTILDIR)/mf_hlflash.o \
$(MFUTILDIR)/qspiflash.o \
$(MFLASH_BASE_OBJ)

MFLASH_SOLO_OBJ = \
$(MFUTILDIR)/mf_screens_solo.o \
$(MFUTILDIR)/mf_hlflash_sa.o \
$(MFUTILDIR)/qspiflash_sa.o \
$(MFUTILDIR)/s25flxxxl_sa.o \
$(MFUTILDIR)/s25flxxxs_sa.o \
$(MFUTILDIR)/qspihwassist_sa.o \
$(MFUTILDIR)/qspibitbash_sa.o \
$(MFLASH_BASE_OBJ)

# version for the MEGA65 PCBs, using S25FLXXXS flash chips
MFLASH_CORE_S25FLXS_REQ = $(MFLASH_QSPI_H) $(MFLASH_CORE_H) $(MFLASH_CORE_S25FLXS_OBJ)
MFLASH_CORE_S25FLXS_LINK = $(MFLASH_CORE_S25FLXS_OBJ)
# version for the MEGA65 PCBs, with ATTIC RAM
MFLASH_CORE_ATTIC_REQ = $(MFLASH_QSPI_H) $(MFLASH_CORE_H) $(MFLASH_CORE_ATTIC_OBJ)
MFLASH_CORE_ATTIC_LINK = $(MFLASH_CORE_ATTIC_OBJ)

# version for the Nexys DevBoards, using S25FLXXXS flash chips and no ATTIC
MFLASH_CORE_S25FLXSNO_REQ = $(MFLASH_QSPI_H) $(MFLASH_CORE_H) $(MFLASH_CORE_S25FLXSNO_OBJ)
MFLASH_CORE_S25FLXSNO_LINK = $(MFLASH_CORE_S25FLXSNO_OBJ)

# version for WUKONG, using S25FLXXXL flash chips and no ATTIC
MFLASH_CORE_S25FLXLNO_REQ = $(MFLASH_QSPI_H) $(MFLASH_CORE_H) $(MFLASH_CORE_S25FLXLNO_OBJ)
MFLASH_CORE_S25FLXLNO_LINK = $(MFLASH_CORE_S25FLXLNO_OBJ)
# version for Nexys DevBoards and Wukong, without ATTIC RAM
MFLASH_CORE_NO_ATTIC_REQ = $(MFLASH_QSPI_H) $(MFLASH_CORE_H) $(MFLASH_CORE_NO_ATTIC_OBJ)
MFLASH_CORE_NO_ATTIC_LINK = $(MFLASH_CORE_NO_ATTIC_OBJ)

# autodetection and debugging standalone version
MFLASH_SOLO_REQ = $(MFLASH_QSPI_H) $(MFLASH_SOLO_H) $(MFLASH_SOLO_OBJ)
Expand All @@ -1013,32 +985,18 @@ $(MFUTILDIR)/%.o: $(MFUTILDIR)/%.c $(MFLASH_CORE_H) $(MFLASH_SOLO_H)
$(CC65) $(MEGA65LIBCINC) -O -o $(MFUTILDIR)/work/$*.s $<
$(CA65) -o $@ --listing $(MFUTILDIR)/$*.list $(MFUTILDIR)/work/$*.s

$(MFUTILDIR)/%_s25flxlno.o: $(MFUTILDIR)/%.c $(MFLASH_CORE_H) $(MFLASH_SOLO_H)
$(MFUTILDIR)/%_no_attic.o: $(MFUTILDIR)/%.c $(MFLASH_CORE_H) $(MFLASH_SOLO_H)
@if [ ! -e $(MFUTILDIR)/work ]; then \
mkdir $(MFUTILDIR)/work; \
fi
$(CC65) $(MEGA65LIBCINC) -DQSPI_HW_ASSIST -DQSPI_NO_BIT_BASH -DQSPI_S25FLXXXL -DNO_ATTIC -O -o $(MFUTILDIR)/work/$*_s25flxlno.s $<
$(CA65) -o $@ --listing $(MFUTILDIR)/$*_s25flxlno.list $(MFUTILDIR)/work/$*_s25flxlno.s

$(MFUTILDIR)/%_s25flxsno.o: $(MFUTILDIR)/%.c $(MFLASH_CORE_H) $(MFLASH_SOLO_H)
@if [ ! -e $(MFUTILDIR)/work ]; then \
mkdir $(MFUTILDIR)/work; \
fi
$(CC65) $(MEGA65LIBCINC) -DQSPI_HW_ASSIST -DQSPI_NO_BIT_BASH -DQSPI_S25FLXXXS -DNO_ATTIC -O -o $(MFUTILDIR)/work/$*_s25flxsno.s $<
$(CA65) -o $@ --listing $(MFUTILDIR)/$*_s25flxsno.list $(MFUTILDIR)/work/$*_s25flxsno.s

$(MFUTILDIR)/%_s25flxs.o: $(MFUTILDIR)/%.c $(MFLASH_CORE_H) $(MFLASH_SOLO_H)
@if [ ! -e $(MFUTILDIR)/work ]; then \
mkdir $(MFUTILDIR)/work; \
fi
$(CC65) $(MEGA65LIBCINC) -DQSPI_HW_ASSIST -DQSPI_NO_BIT_BASH -DQSPI_S25FLXXXS -O -o $(MFUTILDIR)/work/$*_s25flxs.s $<
$(CA65) -o $@ --listing $(MFUTILDIR)/$*_s25flxs.list $(MFUTILDIR)/work/$*_s25flxs.s
$(CC65) $(MEGA65LIBCINC) -DNO_ATTIC -O -o $(MFUTILDIR)/work/$*_no_attic.s $<
$(CA65) -o $@ --listing $(MFUTILDIR)/$*_no_attic.list $(MFUTILDIR)/work/$*_no_attic.s

$(MFUTILDIR)/%_sa.o: $(MFUTILDIR)/%.c $(MFLASH_CORE_H) $(MFLASH_SOLO_H)
@if [ ! -e $(MFUTILDIR)/work ]; then \
mkdir $(MFUTILDIR)/work; \
fi
$(CC65) $(MEGA65LIBCINC) -DSTANDALONE -DFLASH_INSPECT -DQSPI_VERBOSE -DQSPI_HW_ASSIST -O -o $(MFUTILDIR)/work/$*_sa.s $<
$(CC65) $(MEGA65LIBCINC) -DSTANDALONE -DFLASH_INSPECT -DQSPI_VERBOSE -O -o $(MFUTILDIR)/work/$*_sa.s $<
# $(CC65) $(MEGA65LIBCINC) -DQSPI_STANDALONE -DFLASH_INSPECT -DQSPI_VERBOSE -DQSPI_HW_ASSIST -DNO_ATTIC -O -o $(MFUTILDIR)/work/$*_sa.s $<
$(CA65) -o $@ --listing $(MFUTILDIR)/$*_sa.list $(MFUTILDIR)/work/$*_sa.s

Expand All @@ -1047,34 +1005,24 @@ $(MFUTILDIR)/%_sa.o: $(MFUTILDIR)/%.c $(MFLASH_CORE_H) $(MFLASH_SOLO_H)
# in addition util-core.cfg is used to move BSS and stack behind HYPPE starting at C000
# all string data is placed into upper memory (see shadowram entry)
#
$(MFUTILDIR)/megaflash-s25flxlno.prg: $(MFUTILDIR)/megaflash.c $(MFLASH_CORE_S25FLXLNO_REQ) $(MEGA65LIBCLIB) $(CC65_DEPEND)
$(call mbuild_header,$@)
$(CL65NC) --config $(UTILDIR)/util-core.cfg \
$(MEGA65LIBCINC) -O --add-source \
-o $*.prg \
-Ln $*.label --listing $*.list --mapfile $*.map \
-DFIRMWARE_UPGRADE -DTAB_FOR_MENU $< \
$(MFLASH_CORE_S25FLXLNO_LINK) $(MEGA65LIBCLIB)
$(call mbuild_sizecheck,30719,$@)

$(MFUTILDIR)/megaflash-s25flxsno.prg: $(MFUTILDIR)/megaflash.c $(MFLASH_CORE_S25FLXSNO_REQ) $(MEGA65LIBCLIB) $(CC65_DEPEND)
$(MFUTILDIR)/megaflash-no-attic.prg: $(MFUTILDIR)/megaflash.c $(MFLASH_CORE_NO_ATTIC_REQ) $(MEGA65LIBCLIB) $(CC65_DEPEND)
$(call mbuild_header,$@)
$(CL65NC) --config $(UTILDIR)/util-core.cfg \
$(MEGA65LIBCINC) -O --add-source \
-o $*.prg \
-Ln $*.label --listing $*.list --mapfile $*.map \
-DFIRMWARE_UPGRADE $< \
$(MFLASH_CORE_S25FLXSNO_LINK) $(MEGA65LIBCLIB)
$(MFLASH_CORE_NO_ATTIC_LINK) $(MEGA65LIBCLIB)
$(call mbuild_sizecheck,30719,$@)

$(MFUTILDIR)/megaflash-s25flxs.prg: $(MFUTILDIR)/megaflash.c $(MFLASH_CORE_S25FLXS_REQ) $(MEGA65LIBCLIB) $(CC65_DEPEND)
$(MFUTILDIR)/megaflash-attic.prg: $(MFUTILDIR)/megaflash.c $(MFLASH_CORE_ATTIC_REQ) $(MEGA65LIBCLIB) $(CC65_DEPEND)
$(call mbuild_header,$@)
$(CL65NC) --config $(UTILDIR)/util-core.cfg \
$(MEGA65LIBCINC) -O --add-source \
-o $*.prg \
-Ln $*.label --listing $*.list --mapfile $*.map \
-DFIRMWARE_UPGRADE $< \
$(MFLASH_CORE_S25FLXS_LINK) $(MEGA65LIBCLIB)
$(MFLASH_CORE_ATTIC_LINK) $(MEGA65LIBCLIB)
$(call mbuild_sizecheck,30719,$@)

# The following is a megaflash that can be started on the system (dip switch 3 on!), mainly for debugging, but also for production and recovery
Expand All @@ -1088,7 +1036,7 @@ $(MFUTILDIR)/mflash.prg: $(MFUTILDIR)/megaflash.c $(MFLASH_SOLO_REQ) $(MEG
$(MFLASH_SOLO_LINK) $(MEGA65LIBCLIB)
$(call mbuild_sizecheck,43000,$@)

megaflash: $(MFUTILDIR)/megaflash-s25flxlno.prg $(MFUTILDIR)/megaflash-s25flxsno.prg $(MFUTILDIR)/megaflash-s25flxs.prg $(MFUTILDIR)/mflash.prg
megaflash: $(MFUTILDIR)/megaflash-no-attic.prg $(MFUTILDIR)/megaflash-attic.prg $(MFUTILDIR)/mflash.prg

#-----------------------------------------------------------------------------
# OLD MEGAFLASH BUILD, not working
Expand Down Expand Up @@ -1215,22 +1163,17 @@ $(SRCDIR)/open-roms/assets/8x8font.png:
# available address is calculates by screenbuilder, see megaflash.scr header
# for definition.
#
# The difference in shadowram is the hardcoded driver in MEGAFLASH
# - s25flxlno for wukong
# - s25flxsno for nexys
# - s25flxs for m65pcbs
# The difference in shadowram is whether the board has ATTIC RAM or not
# - no-attic for wukong and nexys
# - attic for mega65 PCBs
#
$(VHDLSRCDIR)/shadowram-s25flxlno.vhdl: $(TOOLDIR)/mempacker/mempacker_new $(SDCARD_DIR)/BANNER.M65 $(ASSETS)/alphatest.bin Makefile $(SDCARD_DIR)/FREEZER.M65 $(SRCDIR)/open-roms/bin/mega65.rom $(SDCARD_DIR)/ONBOARD.M65 $(MFUTILDIR)/megaflash-s25flxlno.prg $(MFUTILDIR)/mf_screens.adr $(MFUTILDIR)/mf_screens.bin
mkdir -p $(SDCARD_DIR)
$(TOOLDIR)/mempacker/mempacker_new -n shadowram -s 393215 -f $(VHDLSRCDIR)/shadowram-s25flxlno.vhdl $(SDCARD_DIR)/BANNER.M65@57D00 $(SDCARD_DIR)/FREEZER.M65@12000 $(SRCDIR)/open-roms/bin/mega65.rom@20000 $(SDCARD_DIR)/ONBOARD.M65@40000 $(MFUTILDIR)/mf_screens.bin@`cat $(MFUTILDIR)/mf_screens.adr` $(MFUTILDIR)/megaflash-s25flxlno.prg@50000

$(VHDLSRCDIR)/shadowram-s25flxsno.vhdl: $(TOOLDIR)/mempacker/mempacker_new $(SDCARD_DIR)/BANNER.M65 $(ASSETS)/alphatest.bin Makefile $(SDCARD_DIR)/FREEZER.M65 $(SRCDIR)/open-roms/bin/mega65.rom $(SDCARD_DIR)/ONBOARD.M65 $(MFUTILDIR)/megaflash-s25flxsno.prg $(MFUTILDIR)/mf_screens.adr $(MFUTILDIR)/mf_screens.bin
$(VHDLSRCDIR)/shadowram-no-attic.vhdl: $(TOOLDIR)/mempacker/mempacker_new $(SDCARD_DIR)/BANNER.M65 $(ASSETS)/alphatest.bin Makefile $(SDCARD_DIR)/FREEZER.M65 $(SRCDIR)/open-roms/bin/mega65.rom $(SDCARD_DIR)/ONBOARD.M65 $(MFUTILDIR)/megaflash-no-attic.prg $(MFUTILDIR)/mf_screens.adr $(MFUTILDIR)/mf_screens.bin
mkdir -p $(SDCARD_DIR)
$(TOOLDIR)/mempacker/mempacker_new -n shadowram -s 393215 -f $(VHDLSRCDIR)/shadowram-s25flxsno.vhdl $(SDCARD_DIR)/BANNER.M65@57D00 $(SDCARD_DIR)/FREEZER.M65@12000 $(SRCDIR)/open-roms/bin/mega65.rom@20000 $(SDCARD_DIR)/ONBOARD.M65@40000 $(MFUTILDIR)/mf_screens.bin@`cat $(MFUTILDIR)/mf_screens.adr` $(MFUTILDIR)/megaflash-s25flxsno.prg@50000
$(TOOLDIR)/mempacker/mempacker_new -n shadowram -s 393215 -f $(VHDLSRCDIR)/shadowram-no-attic.vhdl $(SDCARD_DIR)/BANNER.M65@57D00 $(SDCARD_DIR)/FREEZER.M65@12000 $(SRCDIR)/open-roms/bin/mega65.rom@20000 $(SDCARD_DIR)/ONBOARD.M65@40000 $(MFUTILDIR)/mf_screens.bin@`cat $(MFUTILDIR)/mf_screens.adr` $(MFUTILDIR)/megaflash-no-attic.prg@50000

$(VHDLSRCDIR)/shadowram-s25flxs.vhdl: $(TOOLDIR)/mempacker/mempacker_new $(SDCARD_DIR)/BANNER.M65 $(ASSETS)/alphatest.bin Makefile $(SDCARD_DIR)/FREEZER.M65 $(SRCDIR)/open-roms/bin/mega65.rom $(SDCARD_DIR)/ONBOARD.M65 $(MFUTILDIR)/megaflash-s25flxs.prg $(MFUTILDIR)/mf_screens.adr $(MFUTILDIR)/mf_screens.bin
$(VHDLSRCDIR)/shadowram-attic.vhdl: $(TOOLDIR)/mempacker/mempacker_new $(SDCARD_DIR)/BANNER.M65 $(ASSETS)/alphatest.bin Makefile $(SDCARD_DIR)/FREEZER.M65 $(SRCDIR)/open-roms/bin/mega65.rom $(SDCARD_DIR)/ONBOARD.M65 $(MFUTILDIR)/megaflash-attic.prg $(MFUTILDIR)/mf_screens.adr $(MFUTILDIR)/mf_screens.bin
mkdir -p $(SDCARD_DIR)
$(TOOLDIR)/mempacker/mempacker_new -n shadowram -s 393215 -f $(VHDLSRCDIR)/shadowram-s25flxs.vhdl $(SDCARD_DIR)/BANNER.M65@57D00 $(SDCARD_DIR)/FREEZER.M65@12000 $(SRCDIR)/open-roms/bin/mega65.rom@20000 $(SDCARD_DIR)/ONBOARD.M65@40000 $(MFUTILDIR)/mf_screens.bin@`cat $(MFUTILDIR)/mf_screens.adr` $(MFUTILDIR)/megaflash-s25flxs.prg@50000
$(TOOLDIR)/mempacker/mempacker_new -n shadowram -s 393215 -f $(VHDLSRCDIR)/shadowram-attic.vhdl $(SDCARD_DIR)/BANNER.M65@57D00 $(SDCARD_DIR)/FREEZER.M65@12000 $(SRCDIR)/open-roms/bin/mega65.rom@20000 $(SDCARD_DIR)/ONBOARD.M65@40000 $(MFUTILDIR)/mf_screens.bin@`cat $(MFUTILDIR)/mf_screens.adr` $(MFUTILDIR)/megaflash-attic.prg@50000

$(VHDLSRCDIR)/shadowram-cpusim.vhdl: $(TOOLDIR)/mempacker/mempacker_new $(UTILDIR)/cpusim.prg
mkdir -p $(SDCARD_DIR)
Expand Down
9 changes: 0 additions & 9 deletions src/utilities/megaflash/megaflash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,6 @@ void draw_edit_slot(uint8_t selected_slot, uint8_t loaded)
// make attic ram selection switchable
mhx_write_xy(0, 1, "<M-A> ATTICRAM", mfhf_attic_disabled?MHX_A_MGREY:MHX_A_YELLOW);
mhx_write_xy(15, 1, mfhf_attic_disabled?"OFF":" ON", mfhf_attic_disabled?MHX_A_MGREY:MHX_A_YELLOW);
mhx_write_xy(22, 1, "<M-B> HWACCCEL", qspi_force_bitbash?MHX_A_MGREY:MHX_A_YELLOW);
mhx_write_xy(37, 1, qspi_force_bitbash?"OFF":" ON", qspi_force_bitbash?MHX_A_MGREY:MHX_A_YELLOW);
#endif

mhx_draw_rect(0, 2, 38, 2, " Current ", MHX_A_NOCOLOR, 0);
Expand Down Expand Up @@ -489,13 +487,6 @@ uint8_t edit_slot(uint8_t selected_slot)
draw_edit_slot(selected_slot, loaded);
continue;
}

// M-B toggles BITBASH
if (mhx_lastkey.code.key == 0xc2) {
qspi_force_bitbash ^= 1;
draw_edit_slot(selected_slot, loaded);
continue;
}
#endif

// F3 loads a core
Expand Down
Loading