Mercurial > hg > Members > kono > nitros9-code

changeset 3159:55004ff56395

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mc09 l2: tidy up makefiles: remove ccbkrn, which isn't needed for mc09, and add 'xl' disk variant, with bigger bootfile.
author Neal Crook <foofoobedoo@gmail.com>
date Thu, 06 Apr 2017 21:53:03 +0100
parents 927ba5ebc06e
children b79920779783
files level2/mc09l2/bootfiles/makefile level2/mc09l2/makefile level2/mc09l2/modules/kernel/makefile level2/mc09l2/modules/makefile
diffstat 4 files changed, 79 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/level2/mc09l2/bootfiles/makefile	Thu Apr 06 21:43:58 2017 +0100
+++ b/level2/mc09l2/bootfiles/makefile	Thu Apr 06 21:53:03 2017 +0100
@@ -1,7 +1,8 @@
 include $(NITROS9DIR)/rules.mak
 
-# Module directory
+# Module and cmds directories
 MD		= ../modules
+CM		= ../cmds
 
 DEPENDS		= ./makefile
 
@@ -35,7 +36,16 @@
 		$(PIPE) \
 		$(CLOCK50HZMC09)
 
-BOOTFILES	= bootfile_mc09sd
+BOOTFILE_MC09SDXL = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MC09SDC_80D) \
+		$(MD)/scf.mn \
+		$(TERM_MC09) \
+		$(PIPE) \
+		$(CLOCK50HZMC09) $(MD)/sysgo_dd $(CM)/shell
+
+
+BOOTFILES	= bootfile_mc09sd bootfile_mc09sdxl
 KERNELS		= kernel_mc09sd
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
@@ -45,6 +55,9 @@
 bootfile_mc09sd: $(BOOTFILE_MC09SD) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_MC09SD)>$@
 
+bootfile_mc09sdxl: $(BOOTFILE_MC09SDXL) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_MC09SDXL)>$@
+
 kernel_mc09sd: $(KERNEL_MC09SD) $(DEPENDS)
 	$(MERGE) $(KERNEL_MC09SD)>$@
 
--- a/level2/mc09l2/makefile	Thu Apr 06 21:43:58 2017 +0100
+++ b/level2/mc09l2/makefile	Thu Apr 06 21:53:03 2017 +0100
@@ -3,6 +3,8 @@
 DISTRO		= $(CPU)L$(LEVEL)
 DISTRONAME	= nos9$(CPU)l$(LEVEL)
 DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+# Big BOOTFILE for 80D (720K) virtual drive on SD, 50Hz timer interrupt, extra modules and commands
+BOOTFILE_MC09SDXL = bootfiles/bootfile_mc09sdxl
 # The BOOTFILE is for 80D (720K) virtual drive on SD, 50Hz timer interrupt
 BOOTFILE_MC09SD	= bootfiles/bootfile_mc09sd
 KERNELFILE	= bootfiles/kernel_mc09sd
@@ -30,10 +32,12 @@
 
 DSK720K		= $(DISTROVER)_80d.dsk
 LDSK720K	= $(DISTRONAME)_80d.dsk
+DSK720KXL	= $(DISTROVER)_80dxl.dsk
+LDSK720KXL	= $(DISTRONAME)_80dxl.dsk
 TESTDSK		= test.dsk
 
-DSKS		= $(DSK720K)
-LDSKS		= $(LDSK720K)
+DSKS		= $(DSK720K) $(DSK720KXL)
+LDSKS		= $(LDSK720K) $(LDSK720KXL)
 
 # Make all components
 all:
@@ -108,9 +112,63 @@
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
 	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
-	$(RM) $(LDSK720K_50HZ)
+	$(RM) $(LDSK720K)
 	$(SOFTLINK) $@ $(LDSK720K)
 
+$(DSK720KXL):
+	$(RM) $@
+	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
+	$(OS9GEN) $@ -b=$(BOOTFILE_MC09SDXL) -t=$(KERNELFILE)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEFS
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(SYSGO) $@,sysgo
+	$(OS9ATTR_EXEC) $@,sysgo
+	$(CD) cmds; $(OS9COPY) $(sort $(CMDS) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS) $(CMDS_D2)),$@,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) defs; $(CPL) $(DEFS) ../$@,DEFS
+	$(OS9ATTR_TEXT) $(foreach file,$(DEFS),$@,DEFS/$(file))
+	$(CPL) $(STARTUP) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
+	$(MAKDIR) $@,NITROS9
+	$(MAKDIR) $@,NITROS9/$(DISTRO)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(MODULECMDS),$@,NITROS9/$(DISTRO)/CMDS/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(OS9ATTR_EXEC) $(foreach file,$(BOOTTRACK),$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(OS9ATTR_EXEC) $(foreach file,$(KERNEL),$@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(OS9ATTR_EXEC) $(foreach file,$(SYSMODS),$@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(OS9ATTR_EXEC) $(foreach file,$(CLOCKS),$@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(OS9ATTR_EXEC) $(foreach file,$(RBF),$@,NITROS9/$(DISTRO)/MODULES/RBF/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(OS9ATTR_EXEC) $(foreach file,$(SCF),$@,NITROS9/$(DISTRO)/MODULES/SCF/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(OS9ATTR_EXEC) $(foreach file,$(PIPE),$@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
+	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
+	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
+	$(RM) $(LDSK720KXL)
+	$(SOFTLINK) $@ $(LDSK720KXL)
+
 info:
 	@$(ECHO) "*** NitrOS-9/$(CPU) Level $(LEVEL) for the $(MACHINE) ***"
 	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
--- a/level2/mc09l2/modules/kernel/makefile	Thu Apr 06 21:43:58 2017 +0100
+++ b/level2/mc09l2/modules/kernel/makefile	Thu Apr 06 21:53:03 2017 +0100
@@ -7,7 +7,6 @@
 AFLAGS		+= -I$(LEVEL2)/modules/kernel -I$(LEVEL1)/modules/kernel
 
 KERNEL		= krn
-KERNEL_CCB	= ccbkrn
 KERNEL_MC09     = krnmc09
 KERNELP2	= krnp2
 SYSCALLS	= fallimg.asm fallram.asm falltsk.asm faproc.asm fcmpnam.asm \
@@ -20,8 +19,7 @@
 		fid.asm fmapblk.asm fmem.asm fsend.asm fsleep.asm fsprior.asm \
 		fsswi.asm fstime.asm fsuser.asm funlink.asm funload.asm
 
-ALLOBJS		= $(KERNEL) $(KERNEL_CCB) $(KERNELP2) $(KERNEL_MC09)
-#ALLOBJS		= $(KERNEL) $(KERNELP2)
+ALLOBJS		= $(KERNEL) $(KERNELP2) $(KERNEL_MC09)
 
 all:	$(ALLOBJS)
 
@@ -29,8 +27,6 @@
 
 $(KERNEL_MC09):	krnmc09.asm $(SYSCALLS) fsrqmem.asm
 
-$(KERNEL_CCB):	ccbkrn.asm $(SYSCALLS) ccbfsrqmem.asm
-
 $(KERNELP2):	krnp2.asm $(SYSCALLS)
 
 clean:
--- a/level2/mc09l2/modules/makefile	Thu Apr 06 21:43:58 2017 +0100
+++ b/level2/mc09l2/modules/makefile	Thu Apr 06 21:53:03 2017 +0100
@@ -24,7 +24,8 @@
 
 BOOTERS		= boot_sdc
 BOOTTRACK	= rel_80 $(BOOTERS) krn
-KERNEL		= krnp2 krnp3_perr krnp4_regdump ccbkrn
+
+KERNEL		= krnp2 krnp3_perr krnp4_regdump
 SYSMODS		= ioman init sysgo_dd rominfo vectors
 CLOCKS		= clock_50hz clock2_soft clock2_dw mc09clock_50hz
 
@@ -238,9 +239,6 @@
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3
 
 # Clocks
-clock_60hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=60
-
 clock_50hz: clock.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=50