Mercurial > hg > Members > kono > nitros9-code

changeset 3151:d5c884d63e53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
coco3fpga: Build boot files and disk images with RAM disk and RTC support Amend "coco3/bootfiles/makefile" to make bootfiles including "ramd_coco3fpga.dr", "r0_ramd_coco3fpga.dd", & "clock2_coco3fpga" Added two new disks to the "coco3fpga/makefile" disk definitions for bootdisks supporting the Coco3FPGA ramdisk and RTC.
author Bill Pierce <merlinious999@gmail.com>
date Mon, 06 Feb 2017 22:25:15 +0100
parents 37737e5ec640
children fa678706a97c
files level2/coco3/bootfiles/makefile level2/coco3fpga/makefile
diffstat 2 files changed, 160 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/level2/coco3/bootfiles/makefile	Mon Feb 06 22:25:15 2017 +0100
+++ b/level2/coco3/bootfiles/makefile	Mon Feb 06 22:25:15 2017 +0100
@@ -54,7 +54,8 @@
 RBDWBECKER = $(MD)/rbdw.dr $(MD)/dwio_becker.sb \
 		$(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd
 RBCOCO3FPGA = $(MD)/rbsuper.dr $(MD)/llcoco3fpga.dr \
-		$(MD)/sd1_coco3fpga.dd
+		$(MD)/sd1_coco3fpga.dd $(MD)/ramd_coco3fpga.dr \
+		$(MD)/r0_ramd_coco3fpga.dd
 
 SCDWV_NET  = $(MD)/n_scdwv.dd $(MD)/n1_scdwv.dd $(MD)/n2_scdwv.dd \
 		$(MD)/n3_scdwv.dd $(MD)/n4_scdwv.dd $(MD)/n5_scdwv.dd \
@@ -69,6 +70,7 @@
 CLOCK50HZ  = $(MD)/clock_50hz $(MD)/clock2_soft
 CLOCK60HZ  = $(MD)/clock_60hz $(MD)/clock2_soft
 CLOCK60HZDW = $(MD)/clock_60hz $(MD)/clock2_dw
+CLOCK60HZCC3FPGA = $(MD)/clock_60hz $(MD)/clock2_coco3fpga
 
 # NitrOS-9 disk bootfile to allow booting from DriveWire server
 # on a DE1 or Xilinx using Gary Becker's CoCo 3 FGPA
@@ -102,6 +104,21 @@
 	$(PIPE) \
 	$(CLOCK60HZDW)
 
+BOOTFILE_COCO3FPGA_SD_RTC = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+	$(MD)/rbf.mn \
+	$(RBDWBECKER) \
+	$(MD)/x0.dd \
+	$(RBCOCO3FPGA) \
+	$(MD)/ddsd0_coco3fpga.dd\
+	$(MD)/scf.mn \
+	$(VTIO_COWIN_80) \
+	$(MD)/scdwv.dr \
+	$(SCDWV_NET) \
+	$(SCDWV_WIN) \
+	$(SCDWP) \
+	$(PIPE) \
+	$(CLOCK60HZCC3FPGA)
+
 BOOTFILE_COCO3FPGA_ROM = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 	$(MD)/rbf.mn \
 	$(RBDWBECKER) \
@@ -132,6 +149,21 @@
 	$(PIPE) \
 	$(CLOCK60HZDW)
 
+BOOTFILE_COCO3FPGA_ROM_RTC = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+	$(MD)/rbf.mn \
+	$(RBDWBECKER) \
+	$(MD)/x0.dd \
+	$(RBCOCO3FPGA) \
+	$(MD)/ddsd0_coco3fpga.dd\
+	$(MD)/scf.mn \
+	$(VTIO_COWIN_80) \
+	$(MD)/scdwv.dr \
+	$(SCDWV_NET) \
+	$(SCDWV_WIN) \
+	$(SCDWP) \
+	$(PIPE) \
+	$(CLOCK60HZCC3FPGA)
+
 BOOTFILE_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(RBDWBECKER) \
@@ -288,8 +320,8 @@
 		bootfile_80d_50hz bootfile_dw bootfile_dw_headless \
 		bootfile_becker bootfile_arduino bootfile_becker_headless \
 		bootfile_arduino_headless bootfile_cocosdc bootfile_ide \
-		bootfile_coco3fpga bootfile_coco3fpga_sd \
-		bootfile_coco3fpga_rom bootfile_coco3fpga_rom_dw
+		bootfile_coco3fpga bootfile_coco3fpga_sd bootfile_coco3fpga_sd_rtc \
+		bootfile_coco3fpga_rom bootfile_coco3fpga_rom_dw bootfile_coco3fpga_rom_rtc
 
 KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw kernel_becker \
 		kernel_arduino kernel_cocosdc kernel_ide kernel_dide
@@ -305,12 +337,18 @@
 bootfile_coco3fpga_sd: $(BOOTFILE_COCO3FPGA_SD) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COCO3FPGA_SD)>$@
 
+bootfile_coco3fpga_sd_rtc: $(BOOTFILE_COCO3FPGA_SD_RTC) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COCO3FPGA_SD_RTC)>$@
+
 bootfile_coco3fpga_rom: $(BOOTFILE_COCO3FPGA_ROM) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COCO3FPGA_ROM)>$@
 
 bootfile_coco3fpga_rom_dw: $(BOOTFILE_COCO3FPGA_ROM_DW) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COCO3FPGA_ROM_DW)>$@
 
+bootfile_coco3fpga_rom_rtc: $(BOOTFILE_COCO3FPGA_ROM_RTC) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COCO3FPGA_ROM_RTC)>$@
+
 bootfile_becker: $(BOOTFILE_BECKER) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_BECKER)>$@
 
--- a/level2/coco3fpga/makefile	Mon Feb 06 22:25:15 2017 +0100
+++ b/level2/coco3fpga/makefile	Mon Feb 06 22:25:15 2017 +0100
@@ -10,8 +10,10 @@
 DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
 BOOTFILE_COCO3FPGA = bootfiles/bootfile_coco3fpga
 BOOTFILE_COCO3FPGA_SD = bootfiles/bootfile_coco3fpga_sd
+BOOTFILE_COCO3FPGA_SD_RTC = bootfiles/bootfile_coco3fpga_sd_rtc
 BOOTFILE_COCO3FPGA_ROM = bootfiles/bootfile_coco3fpga_rom
 BOOTFILE_COCO3FPGA_ROM_DW = bootfiles/bootfile_coco3fpga_rom_dw
+BOOTFILE_COCO3FPGA_ROM_RTC = bootfiles/bootfile_coco3fpga_rom_rtc
 KERNELFILE_BECKER	= bootfiles/kernel_becker
 DIRS		= cmds modules defs sys bootfiles wwwroot
 
@@ -41,17 +43,21 @@
 
 DSKCOCO3FPGADW	= $(DISTROVER)_becker.dsk
 DSKCOCO3FPGADWSD	= $(DISTROVER)_becker_sd.dsk
+DSKCOCO3FPGADWSDRTC	= $(DISTROVER)_becker_sd_rtc.dsk
 DSKCOCO3FPGAROM	= $(DISTROVER)_bootrom.dsk
 DSKCOCO3FPGAROMDW	= $(DISTROVER)_bootrom_becker.dsk
+DSKCOCO3FPGAROMRTC	= $(DISTROVER)_bootrom_rtc.dsk
 LDSKCOCO3FPGADW	= $(DISTRONAME)_becker.dsk
 LDSKCOCO3FPGADWSD	= $(DISTRONAME)_becker_sd.dsk
+LDSKCOCO3FPGADWSDRTC	= $(DISTRONAME)_becker_sd_rtc.dsk
 LDSKCOCO3FPGAROM	= $(DISTRONAME)_bootrom.dsk
 LDSKCOCO3FPGAROMDW	= $(DISTRONAME)_bootrom_becker.dsk
+LDSKCOCO3FPGAROMRTC	= $(DISTRONAME)_bootrom_rtc.dsk
 
-DSKS		=  $(DSKCOCO3FPGADW) $(DSKCOCO3FPGADWSD) \
-		$(DSKCOCO3FPGAROM) $(DSKCOCO3FPGAROMDW)
-LDSKS	=  $(LDSKCOCO3FPGADW) $(LDSKCOCO3FPGADWSD) \
-		$(LDSKCOCO3FPGAROM) $(LDSKCOCO3FPGAROMDW)
+DSKS		=  $(DSKCOCO3FPGADW) $(DSKCOCO3FPGADWSD) $(DSKCOCO3FPGADWSDRTC) \
+		$(DSKCOCO3FPGAROM) $(DSKCOCO3FPGAROMDW) $(DSKCOCO3FPGAROMRTC)
+LDSKS	=  $(LDSKCOCO3FPGADW) $(LDSKCOCO3FPGADWSD) $(LDSKCOCO3FPGADWSDRTC) \
+		$(LDSKCOCO3FPGAROM) $(LDSKCOCO3FPGAROMDW) $(LDSKCOCO3FPGAROMRTC)
 
 # Make all components
 all:
@@ -183,6 +189,60 @@
 	$(RM) $(LDSKBECKER)
 	$(SOFTLINK) $@ $(LDSKCOCO3FPGADWSD)
 
+$(DSKCOCO3FPGADWSDRTC):
+	$(RM) $@
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
+	$(OS9GEN) $@ -b=$(BOOTFILE_COCO3FPGA_SD_RTC) -t=$(KERNELFILE_BECKER)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEFS
+	$(OS9COPY) modules/$(SYSGOBD) $@,sysgo
+	$(OS9ATTR_EXEC) $@,sysgo
+	$(CD) cmds; $(OS9COPY) $(CMDS_DW) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_DW),$@,CMDS/$(file))
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
+	$(OS9ATTR_TEXT) $(foreach file,$(SYSBIN),$@,SYS/$(file))
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
+	$(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file))
+	$(CD) sys; $(CPL) $(SYSGOSYSTEXT) ../$@,SYS
+	$(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSGOSYSTEXT)),$@,SYS/$(file))
+	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
+	$(OS9ATTR_TEXT) $(foreach file,$(DEFS),$@,DEFS/$(file))
+	$(CPL) $(STARTUP_FPGADW) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
+	$(MAKDIR) $@,NITROS9
+	$(MAKDIR) $@,NITROS9/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(MODULECMDS),$@,NITROS9/CMDS/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES
+	$(MAKDIR) $@,NITROS9/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/MODULES/BOOTTRACK
+	$(OS9ATTR_EXEC) $(foreach file,$(BOOTTRACK),$@,NITROS9/MODULES/BOOTTRACK/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/MODULES/KERNEL
+	$(OS9ATTR_EXEC) $(foreach file,$(KERNEL),$@,NITROS9/MODULES/KERNEL/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/MODULES/SYSMODS
+	$(OS9ATTR_EXEC) $(foreach file,$(SYSMODS),$@,NITROS9/MODULES/SYSMODS/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/MODULES/CLOCKS
+	$(OS9ATTR_EXEC) $(foreach file,$(CLOCKS),$@,NITROS9/MODULES/CLOCKS/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/MODULES/RBF
+	$(OS9ATTR_EXEC) $(foreach file,$(RBF),$@,NITROS9/MODULES/RBF/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/MODULES/SCF
+	$(OS9ATTR_EXEC) $(foreach file,$(SCF),$@,NITROS9/MODULES/SCF/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/MODULES/PIPE
+	$(OS9ATTR_EXEC) $(foreach file,$(PIPE),$@,NITROS9/MODULES/PIPE/$(file))
+	$(MAKDIR) $@,NITROS9/BOOTLISTS
+	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/BOOTLISTS
+	$(MAKDIR) $@,NITROS9/SCRIPTS
+	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/SCRIPTS
+	$(RM) $(LDSKBECKER)
+	$(SOFTLINK) $@ $(LDSKCOCO3FPGADWSDRTC)
+
 $(DSKCOCO3FPGAROM):
 	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
@@ -293,6 +353,61 @@
 	$(RM) $(LDSKBECKER)
 	$(SOFTLINK) $@ $(LDSKCOCO3FPGAROMDW)
 
+$(DSKCOCO3FPGAROMRTC):
+	$(RM) $@
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
+	$(OS9GEN) $@ -b=$(BOOTFILE_COCO3FPGA_ROM_RTC) -t=$(KERNELFILE_BECKER)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEFS
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(SYSGOBD) $@,sysgo
+	$(OS9ATTR_EXEC) $@,sysgo
+	$(CD) cmds; $(OS9COPY) $(CMDS_DW) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_DW),$@,CMDS/$(file))
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
+	$(OS9ATTR_TEXT) $(foreach file,$(SYSBIN),$@,SYS/$(file))
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
+	$(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file))
+	$(CD) sys; $(CPL) $(SYSGOSYSTEXT) ../$@,SYS
+	$(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSGOSYSTEXT)),$@,SYS/$(file))
+	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
+	$(OS9ATTR_TEXT) $(foreach file,$(DEFS),$@,DEFS/$(file))
+	$(CPL) $(STARTUP_FPGADW) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
+	$(MAKDIR) $@,NITROS9
+	$(MAKDIR) $@,NITROS9/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(MODULECMDS),$@,NITROS9/CMDS/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES
+	$(MAKDIR) $@,NITROS9/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/MODULES/BOOTTRACK
+	$(OS9ATTR_EXEC) $(foreach file,$(BOOTTRACK),$@,NITROS9/MODULES/BOOTTRACK/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/MODULES/KERNEL
+	$(OS9ATTR_EXEC) $(foreach file,$(KERNEL),$@,NITROS9/MODULES/KERNEL/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/MODULES/SYSMODS
+	$(OS9ATTR_EXEC) $(foreach file,$(SYSMODS),$@,NITROS9/MODULES/SYSMODS/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/MODULES/CLOCKS
+	$(OS9ATTR_EXEC) $(foreach file,$(CLOCKS),$@,NITROS9/MODULES/CLOCKS/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/MODULES/RBF
+	$(OS9ATTR_EXEC) $(foreach file,$(RBF),$@,NITROS9/MODULES/RBF/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/MODULES/SCF
+	$(OS9ATTR_EXEC) $(foreach file,$(SCF),$@,NITROS9/MODULES/SCF/$(file))
+	$(MAKDIR) $@,NITROS9/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/MODULES/PIPE
+	$(OS9ATTR_EXEC) $(foreach file,$(PIPE),$@,NITROS9/MODULES/PIPE/$(file))
+	$(MAKDIR) $@,NITROS9/BOOTLISTS
+	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/BOOTLISTS
+	$(MAKDIR) $@,NITROS9/SCRIPTS
+	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/SCRIPTS
+	$(RM) $(LDSKBECKER)
+	$(SOFTLINK) $@ $(LDSKCOCO3FPGAROMRTC)
+
 info:
 	@$(ECHO) "*** NitrOS-9/$(CPU) Level $(LEVEL) for the $(MACHINE) ***"
 	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)