Mercurial > hg > Members > kono > nitros9-code
changeset 2101:56f966b82dc4
Update for new build system
| author | afra |
|---|---|
| date | Sun, 24 Sep 2006 22:44:36 +0000 |
| parents | e44dad61db50 |
| children | add5c02385a7 |
| files | level1/d64/bootfiles/makefile level1/d64/makefile level1/d64/modules/makefile level1/d64/startup level1/dalpha/bootfiles/makefile level1/dalpha/defsfile level1/dalpha/makefile level1/dalpha/modules/makefile level1/dalpha/startup |
| diffstat | 9 files changed, 426 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/level1/d64/bootfiles/makefile Wed Sep 13 03:25:22 2006 +0000 +++ b/level1/d64/bootfiles/makefile Sun Sep 24 22:44:36 2006 +0000 @@ -27,7 +27,7 @@ DEPENDS = ./makefile -KERNEL_1773 = $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \ +KERNEL_DRAGON = $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \ $(MD)/boot_d64 IDE = $(3PD)/ide @@ -35,54 +35,81 @@ BOOTFILE_COVDG_DS40 = $(MD)/ioman \ - $(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \ $(MD)/rbf.mn $(MD)/ddisk.dr \ $(MD)/ddd0_40d.dd \ $(MD)/d0_40d.dd $(MD)/d1_40d.dd \ - $(MD)/d2_40d.dd \ + $(MD)/d2_40d.dd $(MD)/d3_40d.dd\ $(MD)/scf.mn \ + $(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \ $(MD)/scdpp.dr $(MD)/p_dpp.dd \ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft \ $(MD)/sysgo_dd BOOTFILE_COHR_DS40 = $(MD)/ioman \ - $(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \ $(MD)/rbf.mn $(MD)/ddisk.dr \ $(MD)/ddd0_40d.dd \ $(MD)/d0_40d.dd $(MD)/d1_40d.dd \ - $(MD)/d2_40d.dd \ + $(MD)/d2_40d.dd $(MD)/d3_40d.dd\ $(MD)/scf.mn \ + $(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \ $(MD)/scdpp.dr $(MD)/p_dpp.dd \ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft \ + $(MD)/sysgo_dd BOOTFILE_COVDG_DS80 = $(MD)/ioman \ - $(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \ $(MD)/rbf.mn $(MD)/ddisk.dr \ $(MD)/ddd0_80d.dd \ $(MD)/d0_80d.dd $(MD)/d1_80d.dd \ - $(MD)/d2_80d.dd \ + $(MD)/d2_80d.dd $(MD)/d3_80d.dd \ $(MD)/scf.mn \ + $(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \ $(MD)/scdpp.dr $(MD)/p_dpp.dd \ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft \ $(MD)/sysgo_dd BOOTFILE_COHR_DS80 = $(MD)/ioman \ - $(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \ $(MD)/rbf.mn $(MD)/ddisk.dr \ $(MD)/ddd0_80d.dd \ $(MD)/d0_80d.dd $(MD)/d1_80d.dd \ - $(MD)/d2_80d.dd \ + $(MD)/d2_80d.dd $(MD)/d3_80d.dd\ $(MD)/scf.mn \ + $(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \ $(MD)/scdpp.dr $(MD)/p_dpp.dd \ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft \ $(MD)/sysgo_dd +BOOTFILE_COVDG_SS40 = $(MD)/ioman \ + $(MD)/rbf.mn $(MD)/ddisk.dr \ + $(MD)/ddd0_40d.dd \ + $(MD)/d0_40s.dd $(MD)/d1_40s.dd \ + $(MD)/d2_40s.dd $(MD)/d3_40s.dd\ + $(MD)/scf.mn \ + $(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \ + $(MD)/scdpp.dr $(MD)/p_dpp.dd \ + $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ + $(MD)/clock_60hz $(MD)/clock2_soft \ + $(MD)/sysgo_dd + +BOOTFILE_COHR_SS40 = $(MD)/ioman \ + $(MD)/rbf.mn $(MD)/ddisk.dr \ + $(MD)/ddd0_40d.dd \ + $(MD)/d0_40s.dd $(MD)/d1_40s.dd \ + $(MD)/d2_40s.dd $(MD)/d3_40s.dd\ + $(MD)/scf.mn \ + $(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \ + $(MD)/scdpp.dr $(MD)/p_dpp.dd \ + $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ + $(MD)/clock_60hz $(MD)/clock2_soft \ + $(MD)/sysgo_dd + + BOOTFILES = bootfile_cohr_ds40 bootfile_covdg_ds40 \ - bootfile_cohr_ds80 bootfile_covdg_ds80 + bootfile_cohr_ds80 bootfile_covdg_ds80 \ + bootfile_cohr_ss40 bootfile_covdg_ss40 KERNELS = kernel @@ -105,8 +132,14 @@ bootfile_cohr_ds80: $(BOOTFILE_COHR_DS80) $(DEPENDS) $(MERGE) $(BOOTFILE_COHR_DS80)>$@ -kernel: $(KERNEL_1773) $(DEPENDS) - $(MERGE) $(KERNEL_1773)>$@ +bootfile_covdg_ss40: $(BOOTFILE_COVDG_SS40) $(DEPENDS) + $(MERGE) $(BOOTFILE_COVDG_SS40)>$@ + +bootfile_cohr_ss40: $(BOOTFILE_COHR_SS40) $(DEPENDS) + $(MERGE) $(BOOTFILE_COHR_SS40)>$@ + +kernel: $(KERNEL_DRAGON) $(DEPENDS) + $(MERGE) $(KERNEL_DRAGON)>$@ $(PADROM) 4096 $@ clean:
--- a/level1/d64/makefile Wed Sep 13 03:25:22 2006 +0000 +++ b/level1/d64/makefile Sun Sep 24 22:44:36 2006 +0000 @@ -1,9 +1,57 @@ +# +#level1/d64/makefile +# +# 2005-04-24, P.Harvey-Smith. +# Brought into line with CoCo makefile, for generating disk +# names baded on CPU/Level/Release number. +# +# +# 2005-05-31, P.Harvey-Smith. +# Added options to specify the step rate of the created +# floppy devices. +# +# 2006-01-08, P.Harvey-Smith. +# Added option to compile for a Dragon 32 that has been upgraded +# to 64K, this is almost the same as the 64, except that it lacks +# a serial port. +# +# 2006-01-08, P.Harvey-Smith. +# Determined experementally the correct step rate for Dragon Data +# 5.25" drives, which is 12ms, this is over half the time of the +# value determined by using dmode under Dragon OS9. It seems that +# the Dragon OS9 dis driver ignored the value set for stp, and always +# used 12ms !!!! +# +# 2006-01-18, P.Harvey-Smith. +# Updates to support Tano Dragon 64, using RS-DOS controler. +# +# 2006-07-06, P.Harvey-Smith. +# Updated to use new build system, for multiple supported platforms. +# + PORT = d64 include $(NITROS9DIR)/rules.mak CPU = 6809 LEVEL = 1 +# TERMWIDTH can be either VDG or HR, for 32x16 or 51x24 respectivly +#NOTE must be lower case. +TERMWIDTH = hr + + +#Default step rate for floppy drives +#Step can be one of : 0=30ms, 1=20ms, 2=12ms, 3=6ms +#Note old drives often require 30ms +#After experimenting with a real Dragon Data 5.25" drive I +#have determined that the drive will cope with 12ms step. +#Therefore setting this as the default for 32/64 also. +STEP = 2 + +#Is this machine a real 64, or a 32, upgraded to 64K. +#Set to 1 for upgraded machine. +UPGRADED32 = 0 + # Level 1 - Specify which shell should be used #WHICHSHELL = shellplus WHICHSHELL = shell_21 @@ -11,15 +59,28 @@ DISTRO = $(CPU)L$(LEVEL) DISTRONAME = nos9$(CPU)l$(LEVEL) DISTROVER = $(DISTRONAME)$(NITROS9VER)$(PORT) -BOOTFILE_COVDG = bootfiles/bootfile_covdg_ds40 -BOOTFILE_COHR = bootfiles/bootfile_cohr_ds40 + +BOOTFILE_COVDG = bootfiles/bootfile_covdg_ds40 +BOOTFILE_COHR = bootfiles/bootfile_cohr_ds40 BOOTFILE_COVDG_DS80 = bootfiles/bootfile_covdg_ds80 BOOTFILE_COHR_DS80 = bootfiles/bootfile_cohr_ds80 +BOOTFILE_COVDG_SS40 = bootfiles/bootfile_covdg_ss40 +BOOTFILE_COHR_SS40 = bootfiles/bootfile_cohr_ss40 + +BOOTFILE_DS40 = bootfiles/bootfile_co$(TERMWIDTH)_ds40 +BOOTFILE_DS80 = bootfiles/bootfile_co$(TERMWIDTH)_ds80 +BOOTFILE_SS40 = bootfiles/bootfile_co$(TERMWIDTH)_ss40 + KERNELFILE = bootfiles/kernel DIRS = cmds modules defs sys bootfiles +#DIRS = cmds sys +#modules bootfiles +#DDIRS = modules bootfiles defs CMDS = $(shell $(CD) cmds; make showcocoobjs) +CMDS525 = $(shell $(CD) cmds; make showdragon525objs) +CMDS525_2 = $(shell $(CD) cmds; make showdragon525objs2) BOOTTRACK = $(shell $(CD) modules; make showboottrack) KERNEL = $(shell $(CD) modules; make showkernel) SYSMODS = $(shell $(CD) modules; make showsysmods) @@ -40,6 +101,9 @@ LDSK360K_2 = $(DISTRONAME)_40d_2.dsk DSK720K = $(DISTROVER)_80d.dsk LDSK720K = $(DISTRONAME)_80d.dsk +#These are for the original SS40 Dragon drives, which still seem to be the most comon :( +DSK180K_1 = $(DISTROVER)_40s_1.dsk +DSK180K_2 = $(DISTROVER)_40s_2.dsk # Make all components @@ -49,32 +113,35 @@ @$(ECHO) "* NitrOS-9/6809 Level 1 Dragon 64 Port *" @$(ECHO) "* *" @$(ECHO) "**************************************************" - $(foreach dir, $(DIRS), ($(CD) $(dir); make);) + $(foreach dir, $(DIRS), ($(CD) $(dir); make STEP=$(STEP) UPGRADED32=$(UPGRADED32));) # Clean all components clean: dskclean $(foreach dir, $(DIRS), ($(CD) $(dir); make clean);) - + dskclean: -$(RM) $(PACKAGENAME) $(DSK360K_1) $(LDSK360K_1) \ - $(DSK360K_2) $(LDSK360K_2) $(DSK720K) $(LDSK720K) + $(DSK360K_2) $(LDSK360K_2) $(DSK720K) $(LDSK720K) \ + $(DSK180K_1) $(DSK180K_2) dsk: all $(PACKAGENAME) dskcopy: dsk - $(CP) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(PACKAGENAME) $(DSKDIR) + $(CP) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(DSK180K_1) $(DSK180K_2) $(PACKAGENAME) $(DSKDIR) scp: dsk scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html -$(PACKAGENAME): $(DSK360K_1) $(DSK360K_2) $(DSK720K) ReadMe ChangeLog +$(PACKAGENAME): $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(DSK180K_1) $(DSK180K_2) ReadMe ChangeLog $(ARCHIVE) $@ $^ +#Dragon 64/32+ + $(DSK360K_1): $(RM) $@ - $(OS9FORMAT_DS40) -q -dr $@ -n"NitrOS-9/6809 Level 1 Disk 1" - $(OS9GEN) $@ -d -b=$(BOOTFILE_COVDG) -t=$(KERNELFILE) + $(OS9FORMAT_DS40) -q -dr $@ -n"NitrOS-9/6809 Dragon Level 1 Disk 1" + $(OS9GEN) $@ -d -b=$(BOOTFILE_DS40) -t=$(KERNELFILE) $(MAKDIR) $@,CMDS $(MAKDIR) $@,SYS $(CD) cmds; $(CP) $(CMDS) ../$@,CMDS @@ -92,7 +159,7 @@ $(DSK360K_2): $(RM) $@ - $(OS9FORMAT_DS40) -q -dr $@ -n"NitrOS-9/6809 Level 1 Disk 2" + $(OS9FORMAT_DS40) -q -dr $@ -n"NitrOS-9/6809 Dragon Level 1 Disk 2" $(MAKDIR) $@,NITROS9 $(MAKDIR) $@,NITROS9/6809L1 $(MAKDIR) $@,NITROS9/6809L1/CMDS @@ -130,8 +197,8 @@ $(DSK720K): $(RM) $@ - $(OS9FORMAT_DS80) -q -dr $@ -n"NitrOS-9/6809 Level 1" - $(OS9GEN) $@ -d -b=$(BOOTFILE_COVDG_DS80) -t=$(KERNELFILE) + $(OS9FORMAT_DS80) -q -dr -c2 $@ -n"NitrOS-9/6809 Dragon Level 1" + $(OS9GEN) $@ -d -b=$(BOOTFILE_DS80) -t=$(KERNELFILE) $(MAKDIR) $@,CMDS $(MAKDIR) $@,SYS $(MAKDIR) $@,DEFS @@ -180,3 +247,29 @@ $(SOFTLINK) $@ $(LDSK720K) +$(DSK180K_1): + $(RM) $@ + $(OS9FORMAT_SS40) -e -dr -q $@ -n"NitrOS-9/6809/Dragon Level 1 Disk 1" + $(OS9GEN) $@ -d -b=$(BOOTFILE_SS40) -t=$(KERNELFILE) + $(MAKDIR) $@,CMDS + $(MAKDIR) $@,SYS + $(CD) cmds; $(CP) $(CMDS525) ../$@,CMDS + $(foreach file, $(CMDS525), $(OS9ATTR_EXEC) $@,CMDS/$(file);) + $(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell + $(CD) sys; $(CPL) $(SYS) ../$@,SYS + $(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);) + $(MAKDIR) $@,DEFS + $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS + $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) + $(CPL) $(ROOTFILES) $@,. + $(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);) + $(CPL) $(STARTUP) $@,startup + $(OS9ATTR_TEXT) $@,startup + +$(DSK180K_2): + $(RM) $@ + $(OS9FORMAT_SS40) -e -dr -q $@ -n"NitrOS-9/6809/Dragon Level 1 Disk 2" + $(MAKDIR) $@,CMDS + $(CD) cmds; $(CP) $(CMDS525_2) ../$@,CMDS + $(foreach file, $(CMDS525_2), $(OS9ATTR_EXEC) $@,CMDS/$(file);) +
--- a/level1/d64/modules/makefile Wed Sep 13 03:25:22 2006 +0000 +++ b/level1/d64/modules/makefile Sun Sep 24 22:44:36 2006 +0000 @@ -25,7 +25,7 @@ vpath %.asm $(LEVEL1)/modules -AFLAGS += -I$(LEVEL1)/modules +AFLAGS += -I$(LEVEL1)/modules CLOCKELIM = -aRTCElim=1 CLOCKDISTO2 = -aRTCDsto2=1 @@ -81,7 +81,7 @@ $(CP) kernel/$@ . boot_d64: boot_d64.asm - $(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=0 + $(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=$(STEP) # Clocks clock_60hz: clock.asm @@ -96,17 +96,18 @@ clock2_cloud9: clock2_ds1315.asm $(AS) $(AFLAGS) $(ASOUT)$@ $< -aCLOUD9=1 + # Floppy descriptors SSDD35 = -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \ -aInterlv=2 -aSAS=8 -aDensity=1 -aStep=0 SSDD40 = -aCyls=40 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \ - -aInterlv=2 -aSAS=8 -aDensity=1 -aStep=0 + -aInterlv=2 -aSAS=8 -aDensity=1 -aStep=$(STEP) DSDD40 = -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \ - -aInterlv=2 -aSAS=8 -aDensity=1 -aStep=0 + -aInterlv=2 -aSAS=8 -aDensity=1 -aStep=$(STEP) SSDD80 = -aCyls=80 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \ - -aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=0 + -aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=$(STEP) DSDD80 = -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \ - -aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=0 + -aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=$(STEP) #Dragon 64 #Dragon 64 Drives can be double or single sided, but assume
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/level1/d64/startup Sun Sep 24 22:44:36 2006 +0000 @@ -0,0 +1,7 @@ +* Echo welcome message +echo * Welcome to NitrOS-9 Level 1 * +echo * on the Dragon 64 * +* Start system time from keyboard +setime </term +date -t +
--- a/level1/dalpha/bootfiles/makefile Wed Sep 13 03:25:22 2006 +0000 +++ b/level1/dalpha/bootfiles/makefile Sun Sep 24 22:44:36 2006 +0000 @@ -1,5 +1,5 @@ # -#bootfiles/makefile +#level1/dalpha/bootfiles/makefile # # 2005-04-24, P.Harvey-Smith. # Added kernels for both DS40 and DS80 disks for Dragon 64
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/level1/dalpha/defsfile Sun Sep 24 22:44:36 2006 +0000 @@ -0,0 +1,7 @@ +Level equ 1 + + use os9defs + use scfdefs + use rbfdefs + use systype + use dgndefs \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/level1/dalpha/makefile Sun Sep 24 22:44:36 2006 +0000 @@ -0,0 +1,239 @@ +# +#level1/dalpha/makefile +# +# 2005-04-24, P.Harvey-Smith. +# Brought into line with CoCo makefile, for generating disk +# names baded on CPU/Level/Release number. +# +# +# 2005-05-31, P.Harvey-Smith. +# Added options to specify the step rate of the created +# floppy devices. +# +# 2006-01-08, P.Harvey-Smith. +# Added option to compile for a Dragon 32 that has been upgraded +# to 64K, this is almost the same as the 64, except that it lacks +# a serial port. +# +# 2006-01-08, P.Harvey-Smith. +# Determined experementally the correct step rate for Dragon Data +# 5.25" drives, which is 12ms, this is over half the time of the +# value determined by using dmode under Dragon OS9. It seems that +# the Dragon OS9 dis driver ignored the value set for stp, and always +# used 12ms !!!! +# +# 2006-01-18, P.Harvey-Smith. +# Updates to support Tano Dragon 64, using RS-DOS controler. +# +# 2006-07-06, P.Harvey-Smith. +# Updated to use new build system, for multiple supported platforms. +# + +PORT = dalpha +include $(NITROS9DIR)/rules.mak + +CPU = 6809 +LEVEL = 1 + +# TERMWIDTH can be either VDG or HR, for 32x16 or 51x24 respectivly +#NOTE must be lower case. +TERMWIDTH = hr + + +#Default step rate for floppy drives +#Step can be one of : 0=30ms, 1=20ms, 2=12ms, 3=6ms +#Note old drives often require 30ms +#After experimenting with a real Dragon Data 5.25" drive I +#have determined that the drive will cope with 12ms step. +#Therefore setting this as the default for 32/64 also. +STEP = 2 + +#Is this machine a real 64, or a 32, upgraded to 64K. +#Set to 1 for upgraded machine. +UPGRADED32 = 0 + +# Level 1 - Specify which shell should be used +#WHICHSHELL = shellplus +WHICHSHELL = shell_21 + +DISTRO = $(CPU)L$(LEVEL) +DISTRONAME = nos9$(CPU)l$(LEVEL) +DISTROVER = $(DISTRONAME)$(NITROS9VER)$(PORT) + +BOOTFILE_COVDG = bootfiles/bootfile_covdg_ss80 +BOOTFILE_COHR = bootfiles/bootfile_cohr_ss80 +BOOTFILE_COVDG_DS80 = bootfiles/bootfile_covdg_ds80 +BOOTFILE_COHR_DS80 = bootfiles/bootfile_cohr_ds80 + +BOOTFILE_SS80 = bootfiles/bootfile_co$(TERMWIDTH)_ss80 +BOOTFILE_DS80 = bootfiles/bootfile_co$(TERMWIDTH)_ds80 + +KERNELFILE = bootfiles/kernel +DIRS = cmds modules defs sys bootfiles + +#DIRS = cmds sys +#modules bootfiles +#DDIRS = modules bootfiles defs + +CMDS = $(shell $(CD) cmds; make showcocoobjs) +BOOTTRACK = $(shell $(CD) modules; make showboottrack) +KERNEL = $(shell $(CD) modules; make showkernel) +SYSMODS = $(shell $(CD) modules; make showsysmods) +CLOCKS = $(shell $(CD) modules; make showclocks) +RBF = $(shell $(CD) modules; make showrbf) +SCF = $(shell $(CD) modules; make showscf) +PIPE = $(shell $(CD) modules; make showpipe) +MODULECMDS = $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode + +SYS = $(shell $(CD) sys; make showobjs) +DEFS = $(shell $(CD) defs; make showobjs) +ROOTFILES = startup + +PACKAGENAME = $(DISTROVER).zip +DSK360K_1 = $(DISTROVER)_80s_1.dsk +LDSK360K_1 = $(DISTRONAME)_80s_1.dsk +DSK360K_2 = $(DISTROVER)_80s_2.dsk +LDSK360K_2 = $(DISTRONAME)_80s_2.dsk +DSK720K = $(DISTROVER)_80d.dsk +LDSK720K = $(DISTRONAME)_80d.dsk + +# Make all components +all: + @$(ECHO) "**************************************************" + @$(ECHO) "* *" + @$(ECHO) "* NitrOS-9/6809 Level 1 Dragon 64 Port *" + @$(ECHO) "* *" + @$(ECHO) "**************************************************" + $(foreach dir, $(DIRS), ($(CD) $(dir); make STEP=$(STEP) UPGRADED32=$(UPGRADED32));) + +# Clean all components +clean: dskclean + $(foreach dir, $(DIRS), ($(CD) $(dir); make clean);) + +dskclean: + -$(RM) $(PACKAGENAME) $(DSK360K_1) $(LDSK360K_1) \ + $(DSK360K_2) $(LDSK360K_2) $(DSK720K) $(LDSK720K) \ + + + +dsk: all $(PACKAGENAME) + +dskcopy: dsk + $(CP) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(PACKAGENAME) $(DSKDIR) + +scp: dsk + scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html + +$(PACKAGENAME): $(DSK360K_1) $(DSK360K_2) $(DSK720K) ReadMe ChangeLog + $(ARCHIVE) $@ $^ + +#Dragon Alpha internal drives are Single sided 80 track + +$(DSK360K_1): + $(RM) $@ + $(OS9FORMAT_SS80) -q -dr $@ -n"NitrOS-9/6809 Dragon Alpha Level 1 Disk 1" + $(OS9GEN) $@ -d -b=$(BOOTFILE_SS80) -t=$(KERNELFILE) + $(MAKDIR) $@,CMDS + $(MAKDIR) $@,SYS + $(CD) cmds; $(CP) $(CMDS) ../$@,CMDS + $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);) + $(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell + $(CD) sys; $(CPL) $(SYS) ../$@,SYS + $(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);) + $(MAKDIR) $@,DEFS + $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS + $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) + $(CPL) $(ROOTFILES) $@,. + $(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);) + $(RM) $(LDSK360K_1) + $(SOFTLINK) $@ $(LDSK360K_1) + +$(DSK360K_2): + $(RM) $@ + $(OS9FORMAT_SS80) -q -dr $@ -n"NitrOS-9/6809 Dragon Alpha Level 1 Disk 2" + $(MAKDIR) $@,NITROS9 + $(MAKDIR) $@,NITROS9/6809L1 + $(MAKDIR) $@,NITROS9/6809L1/CMDS + $(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS + $(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);) + $(OS9RENAME) $@,NITROS9/6809L1/CMDS//$(WHICHSHELL) shell + $(MAKDIR) $@,NITROS9/6809L1/MODULES + $(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK + $(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK + $(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL + $(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL + $(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS + $(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS + $(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS + $(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS + $(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF + $(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF + $(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF + $(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF + $(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE + $(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE + $(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS + $(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS + $(MAKDIR) $@,NITROS9/6809L1/SCRIPTS + $(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS + $(RM) $(LDSK360K_2) + $(SOFTLINK) $@ $(LDSK360K_2) + +$(DSK720K): + $(RM) $@ + $(OS9FORMAT_DS80) -q -dr -c2 $@ -n"NitrOS-9/6809 Dragon Level 1" + $(OS9GEN) $@ -d -b=$(BOOTFILE_DS80) -t=$(KERNELFILE) + $(MAKDIR) $@,CMDS + $(MAKDIR) $@,SYS + $(MAKDIR) $@,DEFS + $(CD) cmds; $(CP) $(CMDS) ../$@,CMDS + $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);) + $(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell + $(CD) sys; $(CPL) $(SYS) ../$@,SYS + $(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);) + $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS + $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) + $(CPL) $(ROOTFILES) $@,. + $(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);) + $(MAKDIR) $@,NITROS9 + $(MAKDIR) $@,NITROS9/6809L1 + $(MAKDIR) $@,NITROS9/6809L1/CMDS + $(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS + $(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);) + $(OS9RENAME) $@,NITROS9/6809L1/CMDS/$(WHICHSHELL) shell + $(MAKDIR) $@,NITROS9/6809L1/MODULES + $(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK + $(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK + $(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL + $(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL + $(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS + $(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS + $(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS + $(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS + $(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF + $(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF + $(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF + $(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF + $(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE + $(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE + $(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);) + $(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS + $(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS + $(MAKDIR) $@,NITROS9/6809L1/SCRIPTS + $(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS + $(RM) $(LDSK720K) + $(SOFTLINK) $@ $(LDSK720K) +
--- a/level1/dalpha/modules/makefile Wed Sep 13 03:25:22 2006 +0000 +++ b/level1/dalpha/modules/makefile Sun Sep 24 22:44:36 2006 +0000 @@ -1,5 +1,5 @@ # -#modules/makefile +#level1/dalpha/modules/makefile # # 2005-04-24, P.Harvey-Smith, # made descriptors for both 40 & 80 track drives for Dragon 64. @@ -25,7 +25,8 @@ vpath %.asm $(LEVEL1)/modules -AFLAGS += -I$(LEVEL1)/modules +AFLAGS += -I$(LEVEL1)/modules + CLOCKELIM = -aRTCElim=1 CLOCKDISTO2 = -aRTCDsto2=1 CLOCKDISTO4 = -aRTCDsto4=1 @@ -79,7 +80,7 @@ $(CP) kernel/$@ . boot_dalpha: boot_d64.asm - $(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=0 + $(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=$(STEP) # Clocks clock_60hz: clock.asm @@ -98,13 +99,13 @@ SSDD35 = -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \ -aInterlv=2 -aSAS=8 -aDensity=1 -aStep=0 SSDD40 = -aCyls=40 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \ - -aInterlv=2 -aSAS=8 -aDensity=1 -aStep=0 + -aInterlv=2 -aSAS=8 -aDensity=1 -aStep=$(STEP) DSDD40 = -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \ - -aInterlv=2 -aSAS=8 -aDensity=1 -aStep=0 + -aInterlv=2 -aSAS=8 -aDensity=1 -aStep=$(STEP) SSDD80 = -aCyls=80 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \ - -aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=0 + -aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=$(STEP) DSDD80 = -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \ - -aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=0 + -aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=$(STEP) #Dragon Alpha # Internal drives on Alpha are Single Sided 80 track.