Mercurial > hg > Members > kono > nitros9-code

changeset 3121:96f1d18ce8cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mc09: Tidy up makefiles and scripts further Remove unneeded stuff from makefiles. Fix up makefile targets to be more sensible. Fix booter in scripts.
author Neal Crook <foofoobedoo@gmail.com>
date Mon, 05 Dec 2016 17:34:33 +0000
parents aa8ba93eff2d
children 35fb39e4b218
files level1/mc09/bootfiles/makefile level1/mc09/makefile level1/mc09/scripts/mb.floppy
diffstat 3 files changed, 15 insertions(+), 383 deletions(-) [+]
line wrap: on
line diff
--- a/level1/mc09/bootfiles/makefile	Sun Dec 06 23:29:05 2015 +0000
+++ b/level1/mc09/bootfiles/makefile	Mon Dec 05 17:34:33 2016 +0000
@@ -7,59 +7,17 @@
 
 DEPENDS		= ./makefile
 
-KERNEL_1773	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		$(MD)/boot_1773_6ms
-
-ifeq ($(PORT),coco1)
-KERNEL_DW	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		$(MD)/boot_dw_coco1
-else
-KERNEL_DW	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		$(MD)/boot_dw
-endif
-
-KERNEL_BECKER	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		$(MD)/boot_dw_becker
-
-KERNEL_ARDUINO	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		$(MD)/boot_dw_arduino
-#[NAC HACK 2015Sep02] used for mc09
-KERNEL_COCOSDC	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
+KERNEL_MC09SD	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		$(MD)/boot_sdc
 
-IDE		= $(3PD)/ide
-SCSI		= $(3PD)/scsisys
-
-FLOPPY_40D	= $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd 
-
-FLOPPY_80D	= $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd 
-
 MC09SDC_80D	= $(MD)/mc09sdc.dr $(MD)/s0_80d.dd $(MD)/s1_80d.dd $(MD)/s2_80d.dd $(MD)/s3_80d.dd
 
 TERM_MC09       = $(MD)/mc6850.dr $(MD)/term_mc6850.dt $(MD)/term_mc6850_t0.dt $(MD)/term_mc6850_t1.dt
-VTIO_COVDG	= $(MD)/vtio.dr $(MD)/covdg.io $(MD)/term_vdg.dt
-VTIO_COHR	= $(MD)/vtio.dr $(MD)/cohr.io $(MD)/term_hr.dt
-VTIO_CO80	= $(MD)/vtio.dr $(MD)/co80.io $(MD)/term_80.dt
 PIPE		= $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd
 CLOCK50HZMC09	= $(MD)/mc09clock_50hz $(MD)/clock2_soft
-CLOCK60HZ	= $(MD)/clock_60hz $(MD)/clock2_soft
-CLOCK60HZDW	= $(MD)/clock_60hz $(MD)/clock2_dw
-ifeq ($(PORT),coco1)
-RBDW		= $(MD)/rbdw.dr $(MD)/dwio_coco1.sb \
-		$(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd
-else
+CLOCK50HZMC09DW	= $(MD)/mc09clock_50hz $(MD)/clock2_dw
 RBDW		= $(MD)/rbdw.dr $(MD)/dwio.sb \
 		$(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd
-endif
-RBBECKER	= $(MD)/rbdw.dr $(MD)/dwio_becker.sb \
-		$(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd
-
-RBARDUINO	= $(MD)/rbdw.dr $(MD)/dwio_arduino.sb \
-		$(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd
-
-RBCOCOSDC	= $(MD)/rbsuper.dr $(MD)/llcocosdc.dr \
-		$(MD)/sd0_cocosdc.dd $(MD)/sd1_cocosdc.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 \
 		$(MD)/n6_scdwv.dd $(MD)/n7_scdwv.dd $(MD)/n8_scdwv.dd \
@@ -67,176 +25,10 @@
 		$(MD)/n12_scdwv.dd $(MD)/n13_scdwv.dd $(MD)/midi_scdwv.dd
 SCDWV_WIN  = $(MD)/z1_scdwv.dd $(MD)/z2_scdwv.dd $(MD)/z3_scdwv.dd \
 		$(MD)/z4_scdwv.dd $(MD)/z5_scdwv.dd $(MD)/z6_scdwv.dd \
-		$(MD)/z7_scdwv.dd 
+		$(MD)/z7_scdwv.dd
 SCDWP     = $(MD)/scdwp.dr $(MD)/p_scdwp.dd
 
-BOOTFILE_COVDG	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(MD)/ddd0_40d.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COVDG) \
-		$(MD)/scbbp.dr $(MD)/p_scbbp.dd \
-		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
-		$(PIPE) \
-		$(CLOCK60HZ) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COHR	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(MD)/ddd0_40d.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COHR) \
-		$(MD)/scbbp.dr $(MD)/p_scbbp.dd \
-		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
-		$(PIPE) \
-		$(CLOCK60HZ) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_CO80	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(MD)/ddd0_40d.dd \
-		$(MD)/scf.mn \
-		$(VTIO_CO80) \
-		$(MD)/scbbp.dr $(MD)/p_scbbp.dd \
-		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
-		$(PIPE) \
-		$(CLOCK60HZ) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_DW_HEADLESS	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(RBDW) \
-		$(MD)/ddx0.dd \
-		$(MD)/scf.mn \
-		$(MD)/scdwv.dr \
-		$(MD)/term_scdwv.dt \
-		$(SCDWV_NET) \
-		$(SCDWV_WIN) \
-		$(SCDWP) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_BECKER_HEADLESS	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(RBBECKER) \
-		$(MD)/ddx0.dd \
-		$(MD)/scf.mn \
-		$(MD)/scdwv.dr \
-		$(MD)/term_scdwv.dt \
-		$(SCDWV_NET) \
-		$(SCDWV_WIN) \
-		$(SCDWP) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_ARDUINO_HEADLESS	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(RBARDUINO) \
-		$(MD)/ddx0.dd \
-		$(MD)/scf.mn \
-		$(MD)/scdwv.dr \
-		$(MD)/term_scdwv.dt \
-		$(SCDWV_NET) \
-		$(SCDWV_WIN) \
-		$(SCDWP) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COVDG_DW	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(RBDW) \
-		$(MD)/ddx0.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COVDG) \
-		$(MD)/scdwv.dr \
-		$(SCDWV_NET) \
-		$(SCDWV_WIN) \
-		$(SCDWP) \
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COVDG_DW_GAME	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(RBDW) \
-		$(MD)/ddx0.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COVDG) \
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd \
-		$(CMDSDIR)/shell_21
-
-BOOTFILE_COVDG_BECKER	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(RBBECKER) \
-		$(FLOPPY_40D) \
-		$(MD)/ddx0.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COVDG) \
-		$(MD)/scdwv.dr \
-		$(SCDWV_NET) \
-		$(SCDWV_WIN) \
-		$(SCDWP) \
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COVDG_BECKER_GAME	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(RBBECKER) \
-		$(MD)/ddx0.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COVDG) \
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd \
-		$(CMDSDIR)/shell_21
-
-BOOTFILE_COVDG_ARDUINO	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(RBARDUINO) \
-		$(MD)/ddx0.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COVDG) \
-		$(MD)/scdwv.dr \
-		$(SCDWV_NET) \
-		$(SCDWV_WIN) \
-		$(SCDWP) \
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COVDG_ARDUINO_GAME	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(RBARDUINO) \
-		$(MD)/ddx0.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COVDG) \
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd \
-		$(CMDSDIR)/shell_21
-
-BOOTFILE_COVDG_DS80	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_80D) \
-		$(MD)/ddd0_80d.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COVDG) \
-		$(MD)/scbbp.dr $(MD)/p_scbbp.dd \
-		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
-		$(PIPE) \
-		$(CLOCK60HZ) \
-		$(MD)/sysgo_dd
-
-# [NAC HACK 2015Aug31] used for mc09
-BOOTFILE_COVDG_SD80	= $(MD)/ioman \
+BOOTFILE_MC09SD	= $(MD)/ioman \
 		$(MD)/rbf.mn \
 		$(MD)/dds0_80d.dd \
 		$(MC09SDC_80D) \
@@ -246,179 +38,18 @@
 		$(CLOCK50HZMC09) \
 		$(MD)/sysgo_dd
 
-BOOTFILE_COVDG_COCOSDC	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(RBCOCOSDC) \
-		$(MD)/ddsd0_cocosdc.dd \
-		$(FLOPPY_40D) \
-		$(MD)/scf.mn \
-		$(VTIO_COVDG) \
-		$(MD)/scbbp.dr $(MD)/p_scbbp.dd \
-		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
-		$(PIPE) \
-		$(CLOCK60HZ) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COVDG_COCOSDC_GAME	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(RBCOCOSDC) \
-		$(MD)/ddsd0_cocosdc.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COVDG) \
-		$(PIPE) \
-		$(CLOCK60HZ) \
-		$(MD)/sysgo_dd \
-		$(CMDSDIR)/shell_21
-
-BOOTFILE_COHR_DW	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(RBDW) \
-		$(MD)/ddx0.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COHR) \
-		$(MD)/scdwv.dr \
-		$(SCDWV_NET) \
-		$(SCDWP)\
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COHR_BECKER	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(RBBECKER) \
-		$(MD)/ddx0.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COHR) \
-		$(MD)/scdwv.dr \
-		$(SCDWV_NET) \
-		$(SCDWP) \
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COHR_ARDUINO	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(RBARDUINO) \
-		$(MD)/ddx0.dd \
-		$(MD)/scf.mn \
-		$(VTIO_COHR) \
-		$(MD)/scdwv.dr \
-		$(SCDWV_NET) \
-		$(SCDWP) \
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COHR_DS80	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_80D) \
-		$(MD)/ddd0_80d.dd \
-		$(MD)/scf.mn \
-		$(VTIO_CO80) \
-		$(MD)/scbbp.dr $(MD)/p_scbbp.dd \
-		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
-		$(PIPE) \
-		$(CLOCK60HZ) \
-		$(MD)/sysgo_dd
-
-BOOTFILES	= bootfile_covdg bootfile_cohr bootfile_covdg_dw \
-		bootfile_dw_headless bootfile_covdg_becker \
-		bootfile_covdg_becker_game bootfile_covdg_dw_game \
-		bootfile_covdg_cocosdc bootfile_covdg_cocosdc_game \
-		bootfile_cohr_dw bootfile_covdg_ds80 bootfile_covdg_sd80 bootfile_cohr_ds80 \
-		bootfile_cohr_becker bootfile_becker_headless \
-		bootfile_covdg_arduino bootfile_arduino_headless \
-		bootfile_cohr_arduino bootfile_covdg_arduino_game 
-
-KERNELS		= kernel_1773 kernel_dw kernel_becker kernel_arduino kernel_cocosdc
+BOOTFILES	= bootfile_mc09sd
+KERNELS		= kernel_mc09sd
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
 all:	$(ALLOBJS)
 
-bootfile_covdg: $(BOOTFILE_COVDG) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG)>$@
-
-bootfile_cohr: $(BOOTFILE_COHR) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COHR)>$@
-
-bootfile_co80: $(BOOTFILE_CO80) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_CO80)>$@
-
-bootfile_covdg_ds80: $(BOOTFILE_COVDG_DS80) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_DS80)>$@
-
-bootfile_covdg_sd80: $(BOOTFILE_COVDG_SD80) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_SD80)>$@
-
-bootfile_dw_headless: $(BOOTFILE_DW_HEADLESS) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_DW_HEADLESS)>$@
-
-bootfile_becker_headless: $(BOOTFILE_BECKER_HEADLESS) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_BECKER_HEADLESS)>$@
-
-bootfile_arduino_headless: $(BOOTFILE_ARDUINO_HEADLESS) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_ARDUINO_HEADLESS)>$@
-
-bootfile_covdg_dw: $(BOOTFILE_COVDG_DW) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_DW)>$@
-
-bootfile_covdg_dw_game: $(BOOTFILE_COVDG_DW_GAME) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_DW_GAME)>$@
-
-bootfile_covdg_becker: $(BOOTFILE_COVDG_BECKER) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_BECKER)>$@
-
-bootfile_covdg_becker_game: $(BOOTFILE_COVDG_BECKER_GAME) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_BECKER_GAME)>$@
-
-bootfile_covdg_arduino: $(BOOTFILE_COVDG_ARDUINO) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_ARDUINO)>$@
+bootfile_mc09sd: $(BOOTFILE_MC09SD) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_MC09SD)>$@
 
-bootfile_covdg_arduino_game: $(BOOTFILE_COVDG_ARDUINO_GAME) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_ARDUINO_GAME)>$@
-
-bootfile_covdg_cocosdc: $(BOOTFILE_COVDG_COCOSDC) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_COCOSDC)>$@
-
-bootfile_covdg_cocosdc_game: $(BOOTFILE_COVDG_COCOSDC_GAME) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_COCOSDC_GAME)>$@
-
-bootfile_cohr_ds80: $(BOOTFILE_COHR_DS80) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COHR_DS80)>$@
-
-bootfile_cohr_dw: $(BOOTFILE_COHR_DW) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COHR_DW)>$@
-
-bootfile_cohr_becker: $(BOOTFILE_COHR_BECKER) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COHR_BECKER)>$@
-
-bootfile_cohr_arduino: $(BOOTFILE_COHR_ARDUINO) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COHR_ARDUINO)>$@
-
-# WD1773 Kernel
-kernel_1773: $(KERNEL_1773) $(DEPENDS)
-	$(MERGE) $(KERNEL_1773)>$@
-	$(PADROM) 4608 $@
-
-# DriveWire 3 Kernel
-kernel_dw: $(KERNEL_DW) $(DEPENDS)
-	$(MERGE) $(KERNEL_DW)>$@
-	$(PADROM) 4608 $@
-
-kernel_becker: $(KERNEL_BECKER) $(DEPENDS)
-	$(MERGE) $(KERNEL_BECKER)>$@
-	$(PADROM) 4608 $@
-
-kernel_arduino: $(KERNEL_ARDUINO) $(DEPENDS)
-	$(MERGE) $(KERNEL_ARDUINO)>$@
-	$(PADROM) 4608 $@
-
-kernel_cocosdc: $(KERNEL_COCOSDC) $(DEPENDS) 
-	$(MERGE) $(KERNEL_COCOSDC)>$@
+kernel_mc09sd: $(KERNEL_MC09SD) $(DEPENDS)
+	$(MERGE) $(KERNEL_MC09SD)>$@
 	$(PADROM) 4608 $@
 
 clean:
--- a/level1/mc09/makefile	Sun Dec 06 23:29:05 2015 +0000
+++ b/level1/mc09/makefile	Mon Dec 05 17:34:33 2016 +0000
@@ -7,8 +7,9 @@
 DISTRO		= $(CPU)L$(LEVEL)
 DISTRONAME	= nos9$(CPU)l$(LEVEL)
 DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
-BOOTFILE_COVDG_SD80	= bootfiles/bootfile_covdg_sd80
-KERNELFILE_COCOSDC	= bootfiles/kernel_cocosdc
+# The BOOTFILE is for 80D (720K) virtual drive on SD, 50Hz timer interrupt
+BOOTFILE_MC09SD	= bootfiles/bootfile_mc09sd
+KERNELFILE	= bootfiles/kernel_mc09sd
 DIRS		= cmds modules defs sys bootfiles wwwroot
 
 
@@ -67,7 +68,7 @@
 $(DSK720K):
 	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
-	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_SD80) -t=$(KERNELFILE_COCOSDC)
+	$(OS9GEN) $@ -b=$(BOOTFILE_MC09SD) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
--- a/level1/mc09/scripts/mb.floppy	Sun Dec 06 23:29:05 2015 +0000
+++ b/level1/mc09/scripts/mb.floppy	Mon Dec 05 17:34:33 2016 +0000
@@ -15,7 +15,7 @@
 echo *
 echo * Step 2: Create a custom boot track
 del bttemp
-merge ../MODULES/BOOTTRACK/rel ../MODULES/KERNEL/krn ../MODULES/KERNEL/krnp2 ../MODULES/SYSMODS/init ../MODULES/BOOTTRACK/boot_1773_6ms>bttemp
+merge ../MODULES/BOOTTRACK/rel ../MODULES/KERNEL/krn ../MODULES/KERNEL/krnp2 ../MODULES/SYSMODS/init ../MODULES/BOOTTRACK/boot_sdc>bttemp
 echo *
 echo * Step 3: Create the bootfile and boot track
 os9gen /d0 -t=bttemp<../BOOTLISTS/standard.bl