Mercurial > hg > Members > kono > nitros9-code
changeset 1705:bd792517eea1
Updated makefiles for 50Hz distributions
author | boisy |
---|---|
date | Tue, 10 Aug 2004 22:04:53 +0000 |
parents | 96c41740ce69 |
children | 6b23465701c0 |
files | level2/coco3/bootfiles/makefile level2/coco3/bootfiles/makefile.cust level2/coco3_6309/bootfiles/makefile level2/coco3_6309/bootfiles/makefile.cust level2/makefile level2/modules/makefile |
diffstat | 6 files changed, 240 insertions(+), 213 deletions(-) [+] |
line wrap: on
line diff
--- a/level2/coco3/bootfiles/makefile Wed Aug 04 16:24:39 2004 +0000 +++ b/level2/coco3/bootfiles/makefile Tue Aug 10 22:04:53 2004 +0000 @@ -8,35 +8,10 @@ DEPENDS = ./makefile KERNEL_1773 = $(MD)/rel_80 $(MD)/boot_1773_6ms $(MD)/krn +KERNEL_1773_50HZ = $(MD)/rel_80_50hz $(MD)/boot_1773_6ms $(MD)/krn # OS-9 disk bootfile to allow booting from WD1773 disk controller -BOOTFILE_VDG = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ - $(MD)/rbf.mn \ - $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \ - $(MD)/ddd0_40d.dd \ - $(MD)/scf.mn $(MD)/cc3io.dr \ - $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ - $(MD)/windint.io $(MD)/vdgint.io \ - $(MD)/term_vdg.dt \ - $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \ - $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ - $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ - $(MD)/clock_60hz $(MD)/clock2_soft - -BOOTFILE_WIN40 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ - $(MD)/rbf.mn \ - $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \ - $(MD)/ddd0_40d.dd \ - $(MD)/scf.mn $(MD)/cc3io.dr \ - $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ - $(MD)/windint.io $(MD)/vdgint.io \ - $(MD)/term_win40.dt \ - $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \ - $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ - $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ - $(MD)/clock_60hz $(MD)/clock2_soft - -BOOTFILE_WIN80 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ +BOOTFILE_40D = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \ $(MD)/ddd0_40d.dd \ @@ -49,68 +24,7 @@ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft -BOOTFILES = bootfile_vdg bootfile_win40 bootfile_win80 \ - bootfile_vdg_ds80 bootfile_win40_ds80 bootfile_win80_ds80 -KERNELS = kernel_1773 - -ALLOBJS = $(BOOTFILES) $(KERNELS) - -all: $(ALLOBJS) - -# Bootfiles -bootfile_vdg: $(BOOTFILE_VDG) $(DEPENDS) - $(MERGE) $(BOOTFILE_VDG)>$@ - -bootfile_win40: $(BOOTFILE_WIN40) $(DEPENDS) - $(MERGE) $(BOOTFILE_WIN40)>$@ - -bootfile_win80: $(BOOTFILE_WIN80) $(DEPENDS) - $(MERGE) $(BOOTFILE_WIN80)>$@ - -bootfile_vdg_ds80: $(BOOTFILE_VDG_DS80) $(DEPENDS) - $(MERGE) $(BOOTFILE_VDG_DS80)>$@ - -bootfile_win40_ds80: $(BOOTFILE_WIN40_DS80) $(DEPENDS) - $(MERGE) $(BOOTFILE_WIN40_DS80)>$@ - -bootfile_win80_ds80: $(BOOTFILE_WIN80_DS80) $(DEPENDS) - $(MERGE) $(BOOTFILE_WIN80_DS80)>$@ - -# Kernels -kernel_1773: $(KERNEL_1773) $(DEPENDS) - $(MERGE) $(KERNEL_1773)>$@ - -clean: - $(RM) $(ALLOBJS) - -# OS-9 disk bootfile to allow booting from WD1773 disk controller -BOOTFILE_VDG_DS80 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ - $(MD)/rbf.mn \ - $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \ - $(MD)/ddd0_80d.dd \ - $(MD)/scf.mn $(MD)/cc3io.dr \ - $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ - $(MD)/windint.io $(MD)/vdgint.io \ - $(MD)/term_vdg.dt \ - $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \ - $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ - $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ - $(MD)/clock_60hz $(MD)/clock2_soft - -BOOTFILE_WIN40_DS80 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ - $(MD)/rbf.mn \ - $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \ - $(MD)/ddd0_80d.dd \ - $(MD)/scf.mn $(MD)/cc3io.dr \ - $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ - $(MD)/windint.io $(MD)/vdgint.io \ - $(MD)/term_win40.dt \ - $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \ - $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ - $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ - $(MD)/clock_60hz $(MD)/clock2_soft - -BOOTFILE_WIN80_DS80 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ +BOOTFILE_80D = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \ $(MD)/ddd0_80d.dd \ @@ -122,3 +36,60 @@ $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft + +BOOTFILE_40D_50HZ = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ + $(MD)/rbf.mn \ + $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \ + $(MD)/ddd0_40d.dd \ + $(MD)/scf.mn $(MD)/cc3io.dr \ + $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ + $(MD)/windint.io $(MD)/vdgint.io \ + $(MD)/term_win80.dt \ + $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \ + $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ + $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ + $(MD)/clock_50hz $(MD)/clock2_soft + +BOOTFILE_80D_50HZ = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ + $(MD)/rbf.mn \ + $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \ + $(MD)/ddd0_80d.dd \ + $(MD)/scf.mn $(MD)/cc3io.dr \ + $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ + $(MD)/windint.io $(MD)/vdgint.io \ + $(MD)/term_win80.dt \ + $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \ + $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ + $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ + $(MD)/clock_50hz $(MD)/clock2_soft + +BOOTFILES = bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz +KERNELS = kernel_1773 kernel_1773_50hz + +ALLOBJS = $(BOOTFILES) $(KERNELS) + +all: $(ALLOBJS) + +# Bootfiles +bootfile_40d: $(BOOTFILE_40D) $(DEPENDS) + $(MERGE) $(BOOTFILE_40D)>$@ + +bootfile_40d_50hz: $(BOOTFILE_40D_50HZ) $(DEPENDS) + $(MERGE) $(BOOTFILE_40D_50HZ)>$@ + +bootfile_80d: $(BOOTFILE_80D) $(DEPENDS) + $(MERGE) $(BOOTFILE_80D)>$@ + +bootfile_80d_50hz: $(BOOTFILE_80D_50HZ) $(DEPENDS) + $(MERGE) $(BOOTFILE_80D_50HZ)>$@ + +# Kernels +kernel_1773: $(KERNEL_1773) $(DEPENDS) + $(MERGE) $(KERNEL_1773)>$@ + +kernel_1773_50hz: $(KERNEL_1773_50HZ) $(DEPENDS) + $(MERGE) $(KERNEL_1773_50HZ)>$@ + +clean: + $(RM) $(ALLOBJS) +
--- a/level2/coco3/bootfiles/makefile.cust Wed Aug 04 16:24:39 2004 +0000 +++ b/level2/coco3/bootfiles/makefile.cust Tue Aug 10 22:04:53 2004 +0000 @@ -116,11 +116,11 @@ $(C9)/Products/SuperDrivers/software/6809l2/s6_tc3.dd \ $(C9)/Products/SuperDrivers/software/6809l2/s7_tc3.dd \ $(C9)/Products/SuperDrivers/software/6809l2/sh_tc3.dd \ - $(C9)/Products/SuperDrivers/software/6809l2/lldw.dr \ - $(C9)/Products/SuperDrivers/software/6809l2/ddx0.dd \ - $(C9)/Products/SuperDrivers/software/6809l2/x1.dd \ - $(C9)/Products/SuperDrivers/software/6809l2/x2.dd \ - $(C9)/Products/SuperDrivers/software/6809l2/x3.dd \ + $(C9)/Products/DriveWire/software/6809l2/drivewire.dr \ + $(C9)/Products/DriveWire/software/6809l2/ddx0.dd \ + $(C9)/Products/DriveWire/software/6809l2/x1.dd \ + $(C9)/Products/DriveWire/software/6809l2/x2.dd \ + $(C9)/Products/DriveWire/software/6809l2/x3.dd \ $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \ $(MD)/scf.mn $(MD)/cc3io.dr \ $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ @@ -132,11 +132,11 @@ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz \ $(C9)/Products/DriveWire/software/6809l2/clock2_dw -# $(C9)/Products/DriveWire/software/6809l2/drivewire.dr \ -# $(C9)/Products/DriveWire/software/6809l2/ddx0.dd \ -# $(C9)/Products/DriveWire/software/6809l2/x1.dd \ -# $(C9)/Products/DriveWire/software/6809l2/x2.dd \ -# $(C9)/Products/DriveWire/software/6809l2/x3.dd \ +# $(C9)/Products/SuperDrivers/software/6809l2/lldw.dr \ +# $(C9)/Products/SuperDrivers/software/6809l2/ddx0.dd \ +# $(C9)/Products/SuperDrivers/software/6809l2/x1.dd \ +# $(C9)/Products/SuperDrivers/software/6809l2/x2.dd \ +# $(C9)/Products/SuperDrivers/software/6809l2/x3.dd \ BOOTFILES = bootfile_1773 bootfile_cust
--- a/level2/coco3_6309/bootfiles/makefile Wed Aug 04 16:24:39 2004 +0000 +++ b/level2/coco3_6309/bootfiles/makefile Tue Aug 10 22:04:53 2004 +0000 @@ -8,35 +8,10 @@ DEPENDS = ./makefile KERNEL_1773 = $(MD)/rel_80 $(MD)/boot_1773_6ms $(MD)/krn +KERNEL_1773_50HZ = $(MD)/rel_80_50hz $(MD)/boot_1773_6ms $(MD)/krn # OS-9 disk bootfile to allow booting from WD1773 disk controller -BOOTFILE_VDG = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ - $(MD)/rbf.mn \ - $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \ - $(MD)/ddd0_40d.dd \ - $(MD)/scf.mn $(MD)/cc3io.dr \ - $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ - $(MD)/windint.io $(MD)/vdgint.io \ - $(MD)/term_vdg.dt \ - $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \ - $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ - $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ - $(MD)/clock_60hz $(MD)/clock2_soft - -BOOTFILE_WIN40 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ - $(MD)/rbf.mn \ - $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \ - $(MD)/ddd0_40d.dd \ - $(MD)/scf.mn $(MD)/cc3io.dr \ - $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ - $(MD)/windint.io $(MD)/vdgint.io \ - $(MD)/term_win40.dt \ - $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \ - $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ - $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ - $(MD)/clock_60hz $(MD)/clock2_soft - -BOOTFILE_WIN80 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ +BOOTFILE_40D = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \ $(MD)/ddd0_40d.dd \ @@ -49,68 +24,7 @@ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft -BOOTFILES = bootfile_vdg bootfile_win40 bootfile_win80 \ - bootfile_vdg_ds80 bootfile_win40_ds80 bootfile_win80_ds80 -KERNELS = kernel_1773 - -ALLOBJS = $(BOOTFILES) $(KERNELS) - -all: $(ALLOBJS) - -# Bootfiles -bootfile_vdg: $(BOOTFILE_VDG) $(DEPENDS) - $(MERGE) $(BOOTFILE_VDG)>$@ - -bootfile_win40: $(BOOTFILE_WIN40) $(DEPENDS) - $(MERGE) $(BOOTFILE_WIN40)>$@ - -bootfile_win80: $(BOOTFILE_WIN80) $(DEPENDS) - $(MERGE) $(BOOTFILE_WIN80)>$@ - -bootfile_vdg_ds80: $(BOOTFILE_VDG_DS80) $(DEPENDS) - $(MERGE) $(BOOTFILE_VDG_DS80)>$@ - -bootfile_win40_ds80: $(BOOTFILE_WIN40_DS80) $(DEPENDS) - $(MERGE) $(BOOTFILE_WIN40_DS80)>$@ - -bootfile_win80_ds80: $(BOOTFILE_WIN80_DS80) $(DEPENDS) - $(MERGE) $(BOOTFILE_WIN80_DS80)>$@ - -# Kernels -kernel_1773: $(KERNEL_1773) $(DEPENDS) - $(MERGE) $(KERNEL_1773)>$@ - -clean: - $(RM) $(ALLOBJS) - -# OS-9 disk bootfile to allow booting from WD1773 disk controller -BOOTFILE_VDG_DS80 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ - $(MD)/rbf.mn \ - $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \ - $(MD)/ddd0_80d.dd \ - $(MD)/scf.mn $(MD)/cc3io.dr \ - $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ - $(MD)/windint.io $(MD)/vdgint.io \ - $(MD)/term_vdg.dt \ - $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \ - $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ - $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ - $(MD)/clock_60hz $(MD)/clock2_soft - -BOOTFILE_WIN40_DS80 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ - $(MD)/rbf.mn \ - $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \ - $(MD)/ddd0_80d.dd \ - $(MD)/scf.mn $(MD)/cc3io.dr \ - $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ - $(MD)/windint.io $(MD)/vdgint.io \ - $(MD)/term_win40.dt \ - $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \ - $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ - $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ - $(MD)/clock_60hz $(MD)/clock2_soft - -BOOTFILE_WIN80_DS80 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ +BOOTFILE_80D = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \ $(MD)/ddd0_80d.dd \ @@ -122,3 +36,60 @@ $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft + +BOOTFILE_40D_50HZ = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ + $(MD)/rbf.mn \ + $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \ + $(MD)/ddd0_40d.dd \ + $(MD)/scf.mn $(MD)/cc3io.dr \ + $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ + $(MD)/windint.io $(MD)/vdgint.io \ + $(MD)/term_win80.dt \ + $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \ + $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ + $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ + $(MD)/clock_50hz $(MD)/clock2_soft + +BOOTFILE_80D_50HZ = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ + $(MD)/rbf.mn \ + $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \ + $(MD)/ddd0_80d.dd \ + $(MD)/scf.mn $(MD)/cc3io.dr \ + $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ + $(MD)/windint.io $(MD)/vdgint.io \ + $(MD)/term_win80.dt \ + $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \ + $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \ + $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ + $(MD)/clock_50hz $(MD)/clock2_soft + +BOOTFILES = bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz +KERNELS = kernel_1773 kernel_1773_50hz + +ALLOBJS = $(BOOTFILES) $(KERNELS) + +all: $(ALLOBJS) + +# Bootfiles +bootfile_40d: $(BOOTFILE_40D) $(DEPENDS) + $(MERGE) $(BOOTFILE_40D)>$@ + +bootfile_40d_50hz: $(BOOTFILE_40D_50HZ) $(DEPENDS) + $(MERGE) $(BOOTFILE_40D_50HZ)>$@ + +bootfile_80d: $(BOOTFILE_80D) $(DEPENDS) + $(MERGE) $(BOOTFILE_80D)>$@ + +bootfile_80d_50hz: $(BOOTFILE_80D_50HZ) $(DEPENDS) + $(MERGE) $(BOOTFILE_80D_50HZ)>$@ + +# Kernels +kernel_1773: $(KERNEL_1773) $(DEPENDS) + $(MERGE) $(KERNEL_1773)>$@ + +kernel_1773_50hz: $(KERNEL_1773_50HZ) $(DEPENDS) + $(MERGE) $(KERNEL_1773_50HZ)>$@ + +clean: + $(RM) $(ALLOBJS) +
--- a/level2/coco3_6309/bootfiles/makefile.cust Wed Aug 04 16:24:39 2004 +0000 +++ b/level2/coco3_6309/bootfiles/makefile.cust Tue Aug 10 22:04:53 2004 +0000 @@ -116,11 +116,11 @@ $(C9)/Products/SuperDrivers/software/6809l2/s6_tc3.dd \ $(C9)/Products/SuperDrivers/software/6809l2/s7_tc3.dd \ $(C9)/Products/SuperDrivers/software/6809l2/sh_tc3.dd \ - $(C9)/Products/SuperDrivers/software/6809l2/lldw.dr \ - $(C9)/Products/SuperDrivers/software/6809l2/ddx0.dd \ - $(C9)/Products/SuperDrivers/software/6809l2/x1.dd \ - $(C9)/Products/SuperDrivers/software/6809l2/x2.dd \ - $(C9)/Products/SuperDrivers/software/6809l2/x3.dd \ + $(C9)/Products/DriveWire/software/6809l2/drivewire.dr \ + $(C9)/Products/DriveWire/software/6809l2/ddx0.dd \ + $(C9)/Products/DriveWire/software/6809l2/x1.dd \ + $(C9)/Products/DriveWire/software/6809l2/x2.dd \ + $(C9)/Products/DriveWire/software/6809l2/x3.dd \ $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \ $(MD)/scf.mn $(MD)/cc3io.dr \ $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \ @@ -132,11 +132,11 @@ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz \ $(C9)/Products/DriveWire/software/6809l2/clock2_dw -# $(C9)/Products/DriveWire/software/6809l2/drivewire.dr \ -# $(C9)/Products/DriveWire/software/6809l2/ddx0.dd \ -# $(C9)/Products/DriveWire/software/6809l2/x1.dd \ -# $(C9)/Products/DriveWire/software/6809l2/x2.dd \ -# $(C9)/Products/DriveWire/software/6809l2/x3.dd \ +# $(C9)/Products/SuperDrivers/software/6809l2/lldw.dr \ +# $(C9)/Products/SuperDrivers/software/6809l2/ddx0.dd \ +# $(C9)/Products/SuperDrivers/software/6809l2/x1.dd \ +# $(C9)/Products/SuperDrivers/software/6809l2/x2.dd \ +# $(C9)/Products/SuperDrivers/software/6809l2/x3.dd \ BOOTFILES = bootfile_1773 bootfile_cust
--- a/level2/makefile Wed Aug 04 16:24:39 2004 +0000 +++ b/level2/makefile Tue Aug 10 22:04:53 2004 +0000 @@ -3,9 +3,12 @@ CPU = 6809 DISTRO = $(CPU)L2 RELEASE = nos9$(CPU)l2v030204 -BOOTFILE = bootfiles/bootfile_win80 -BOOTFILE_DS80 = bootfiles/bootfile_win80_ds80 +BOOTFILE_40D = bootfiles/bootfile_40d +BOOTFILE_80D = bootfiles/bootfile_80d +BOOTFILE_40D_50HZ = bootfiles/bootfile_40d_50hz +BOOTFILE_80D_50HZ = bootfiles/bootfile_80d_50hz KERNELFILE = bootfiles/kernel_1773 +KERNELFILE_50HZ = bootfiles/kernel_1773_50hz DIRS = cmds modules defs sys bootfiles CMDS = $(shell $(CD) cmds; make showobjs) @@ -25,9 +28,11 @@ SYSGO = sysgo_dd PACKAGENAME = $(RELEASE).zip -DSK360K_1 = $(RELEASE)_ds40_1.dsk -DSK360K_2 = $(RELEASE)_ds40_2.dsk -DSK720K = $(RELEASE)_ds80.dsk +DSK360K_1 = $(RELEASE)_40d_1.dsk +DSK360K_1_50HZ = $(RELEASE)_40d_1_50hz.dsk +DSK360K_2 = $(RELEASE)_40d_2.dsk +DSK720K = $(RELEASE)_80d.dsk +DSK720K_50HZ = $(RELEASE)_80d_50hz.dsk TESTDSK = test.dsk @@ -45,23 +50,43 @@ $(foreach dir, $(DIRS), ($(CD) $(dir); make clean);) dskclean: - -$(RM) $(PACKAGENAME) $(DSK360K_1) $(DSK360K_2) $(DSK720K) + -$(RM) $(PACKAGENAME) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ) dsk: all $(PACKAGENAME) dskcopy: dsk - $(CP) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(PACKAGENAME) $(DSKDIR) + $(CP) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(PACKAGENAME) $(DSKDIR) $(DSK720K_50HZ) scp: dsk scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html -$(PACKAGENAME): $(DSK360K_1) $(DSK360K_2) $(DSK720K) ReadMe ChangeLog +$(PACKAGENAME): $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ) ReadMe ChangeLog $(ARCHIVE) $@ $^ $(DSK360K_1): -$(RM) $@ $(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1" - $(OS9GEN) $@ -b=$(BOOTFILE) -t=$(KERNELFILE) + $(OS9GEN) $@ -b=$(BOOTFILE_40D) -t=$(KERNELFILE) + $(MAKDIR) $@,CMDS + $(MAKDIR) $@,SYS + $(MAKDIR) $@,DEFS + $(CP) modules/$(SYSGO) $@,sysgo + $(OS9ATTR_EXEC) $@,sysgo + $(CD) cmds; $(CP) $(CMDS) ../$@,CMDS + $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);) + $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS + $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) + $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS + $(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);) + $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS + $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) + $(CPL) $(ROOTFILES) $@,. + $(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);) + +$(DSK360K_1_50HZ): + -$(RM) $@ + $(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1" + $(OS9GEN) $@ -b=$(BOOTFILE_40D_50HZ) -t=$(KERNELFILE_50HZ) $(MAKDIR) $@,CMDS $(MAKDIR) $@,SYS $(MAKDIR) $@,DEFS @@ -115,8 +140,59 @@ $(DSK720K): -$(RM) $@ - $(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/6809 Level 2" - $(OS9GEN) $@ -b=$(BOOTFILE_DS80) -t=$(KERNELFILE) + $(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 2" + $(OS9GEN) $@ -b=$(BOOTFILE_80D) -t=$(KERNELFILE) + $(MAKDIR) $@,CMDS + $(MAKDIR) $@,SYS + $(MAKDIR) $@,DEFS + $(CP) modules/$(SYSGO) $@,sysgo + $(OS9ATTR_EXEC) $@,sysgo + $(CD) cmds; $(CP) $(CMDS) ../$@,CMDS + $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);) + $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS + $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) + $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS + $(foreach file, $(SYSTEXT), $(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/$(DISTRO) + $(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS + $(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS + $(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);) + $(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES + $(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK + $(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK + $(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);) + $(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL + $(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL + $(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);) + $(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS + $(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS + $(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);) + $(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS + $(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS + $(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);) + $(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF + $(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF + $(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);) + $(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF + $(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF + $(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);) + $(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE + $(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE + $(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,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 + +$(DSK720K_50HZ): + -$(RM) $@ + $(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 2" + $(OS9GEN) $@ -b=$(BOOTFILE_80D_50HZ) -t=$(KERNELFILE_50HZ) $(MAKDIR) $@,CMDS $(MAKDIR) $@,SYS $(MAKDIR) $@,DEFS
--- a/level2/modules/makefile Wed Aug 04 16:24:39 2004 +0000 +++ b/level2/modules/makefile Tue Aug 10 22:04:53 2004 +0000 @@ -18,7 +18,7 @@ BOOTERS = boot_1773_6ms boot_1773_30ms \ boot_burke boot_rampak boot_wd1002 -BOOTTRACK = rel_32 rel_40 rel_80 $(BOOTERS) krn +BOOTTRACK = rel_32 rel_40 rel_80 rel_32_50hz rel_40_50hz rel_80_50hz $(BOOTERS) krn KERNEL = krnp2 krnp3_perr krnp4_regdump SYSMODS = ioman init sysgo_h0 sysgo_dd CLOCKS = clock_60hz clock_50hz \ @@ -72,9 +72,6 @@ $(CP) kernel/$@ . # Special cases -rel_32: rel.asm - $(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=32 - grfint.io: windint.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -aGrfInt=1 @@ -84,12 +81,24 @@ rb1773_scii_ff58.dr: rb1773.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -aSCII=1 -aSCIIALT=1 +rel_32: rel.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=32 + rel_40: rel.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=40 rel_80: rel.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=80 +rel_32_50hz: rel.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=32 -aTkPerSec=50 + +rel_40_50hz: rel.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=40 -aTkPerSec=50 + +rel_80_50hz: rel.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=80 -aTkPerSec=50 + boot_1773_6ms: boot_1773.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -aSTEP=0