Mercurial > hg > Members > kono > nitros9-code

changeset 2920:d0b7780ab4af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dalpha: Use merged modules/makefile from d64 Put all dalpha extras in conditionals in the d64 makefile Also update boot module name in dalpha/bootfiles/makefile correspondingly. And make d64/bootfiles/makefile a bit closer to the dalpha version, for the love of keeping them in sync until we get them merged as well. Mostly whitespace changes.
author Tormod Volden <debian.tormod@gmail.com>
date Fri, 17 Jan 2014 23:08:35 +0100
parents 542da7896526
children ada96e56ab0e
files level1/d64/bootfiles/makefile level1/d64/modules/makefile level1/dalpha/bootfiles/makefile level1/dalpha/modules/makefile
diffstat 4 files changed, 55 insertions(+), 219 deletions(-) [+]
line wrap: on
line diff
--- a/level1/d64/bootfiles/makefile	Fri Jan 17 22:56:23 2014 +0100
+++ b/level1/d64/bootfiles/makefile	Fri Jan 17 23:08:35 2014 +0100
@@ -27,11 +27,9 @@
 
 DEPENDS		= ./makefile
 
-KERNEL_DRAGON	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
+KERNEL		= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		  $(MD)/boot_d64
 
-IDE	= $(3PD)/ide
-SCSI	= $(3PD)/scsisys
 
 
 BOOTFILE_COVDG_DS40 = $(MD)/ioman \
@@ -121,25 +119,25 @@
 	@$(ECHO) $(BOOTFILE_COVDG_DS40)
 
 bootfile_covdg_ds40: 	$(BOOTFILE_COVDG_DS40) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_COVDG_DS40)>$@
+				$(MERGE) $^ > $@
 
 bootfile_cohr_ds40: 	$(BOOTFILE_COHR_DS40) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_COHR_DS40)>$@
+				$(MERGE) $^ > $@
 
 bootfile_covdg_ds80: 	$(BOOTFILE_COVDG_DS80) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_COVDG_DS80)>$@
+				$(MERGE) $^ > $@
 
 bootfile_cohr_ds80: 	$(BOOTFILE_COHR_DS80) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_COHR_DS80)>$@
+				$(MERGE) $^ > $@
 
 bootfile_covdg_ss40: 	$(BOOTFILE_COVDG_SS40) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_COVDG_SS40)>$@
+				$(MERGE) $^ > $@
 
 bootfile_cohr_ss40: 	$(BOOTFILE_COHR_SS40) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_COHR_SS40)>$@
+				$(MERGE) $^ > $@
 
-kernel:	$(KERNEL_DRAGON) $(DEPENDS)
-		$(MERGE) $(KERNEL_DRAGON)>$@
+kernel: $(KERNEL) $(DEPENDS)
+		$(MERGE) $(KERNEL)>$@
 		$(PADROM) 4096 $@
 
 clean:
--- a/level1/d64/modules/makefile	Fri Jan 17 22:56:23 2014 +0100
+++ b/level1/d64/modules/makefile	Fri Jan 17 23:08:35 2014 +0100
@@ -1,5 +1,5 @@
 #
-#modules/makefile
+#modules/makefile for Dragon 64/Alpha/Tano
 #
 # 2005-04-24, P.Harvey-Smith, 
 #	made descriptors for both 40 & 80 track drives for Dragon 64.
@@ -56,9 +56,13 @@
 
 RBF		= rbf.mn \
 		ddisk.dr \
-		ddd0_40d.dd d0_40d.dd d1_40d.dd d2_40d.dd d3_40d.dd \
-		ddd0_40s.dd d0_40s.dd d1_40s.dd d2_40s.dd d3_40s.dd \
 		ddd0_80d.dd d0_80d.dd d1_80d.dd d2_80d.dd d3_80d.dd
+ifeq ($(PORT),dalpha)
+RBF +=		ddd0_80s.dd d0_80s.dd d1_80s.dd d2_80s.dd d3_80s.dd
+else
+RBF +=		ddd0_40d.dd d0_40d.dd d1_40d.dd d2_40d.dd d3_40d.dd \
+		ddd0_40s.dd d0_40s.dd d1_40s.dd d2_40s.dd d3_40s.dd
+endif
 		
 SCF		= scf.mn \
 		vrn.dr scdpp.dr sspak.dr vtio.dr \
@@ -111,7 +115,6 @@
 DSDD80		= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
 		-DInterlv=2 -DSAS=8 -DDensity=1 -DD35 -DSTEP=$(STEP)
 
-#Dragon 64
 #Dragon 64 Drives can be double or single sided, but assume 
 # that /d0 and /d1 are double sided 40 track.
 
@@ -146,19 +149,35 @@
 d3_40s.dd: ddiskdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -DDNum=3
 
+# Internal drives on Alpha are Single Sided 80 track.
+
+ddd0_80s.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=0 -DDD=1
 
 ddd0_80d.dd: ddiskdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0 -DDD=1
 
+d0_80s.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=0
+	
 d0_80d.dd: ddiskdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0
+	
+d1_80s.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=1
 
 d1_80d.dd: ddiskdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=1
 
+d2_80s.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=2
+
 d2_80d.dd: ddiskdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=2
 
+d3_80s.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=3
+
 d3_80d.dd: ddiskdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=3
 
--- a/level1/dalpha/bootfiles/makefile	Fri Jan 17 22:56:23 2014 +0100
+++ b/level1/dalpha/bootfiles/makefile	Fri Jan 17 23:08:35 2014 +0100
@@ -1,5 +1,5 @@
 #
-#level1/dalpha/bootfiles/makefile
+#bootfiles/makefile
 #
 # 2005-04-24, P.Harvey-Smith.
 #	Added kernels for both DS40 and DS80 disks for Dragon 64
@@ -25,61 +25,61 @@
 
 DEPENDS		= ./makefile
 
-KERNEL	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		  $(MD)/boot_dalpha
+KERNEL		= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
+		  $(MD)/boot_d64
 
 #Dragon Alpha Bootfiles
 
 BOOTFILE_COVDG_SS80 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term_vdg.dt \
-		$(MD)/rbf.mn $(MD)/adisk.dr \
+		$(MD)/rbf.mn $(MD)/ddisk.dr \
 		$(MD)/ddd0_80s.dd\
-                $(MD)/d0_80s.dd $(MD)/d1_80s.dd \
-                $(MD)/d2_80s.dd $(MD)/d3_80s.dd \
-                $(MD)/scf.mn \
+		$(MD)/d0_80s.dd $(MD)/d1_80s.dd \
+		$(MD)/d2_80s.dd $(MD)/d3_80s.dd \
+		$(MD)/scf.mn \
+		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term_vdg.dt \
 		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
 BOOTFILE_COHR_SS80 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term_hr.dt \
-		$(MD)/rbf.mn $(MD)/adisk.dr \
+		$(MD)/rbf.mn $(MD)/ddisk.dr \
 		$(MD)/ddd0_80s.dd\
-                $(MD)/d0_80s.dd $(MD)/d1_80s.dd \
-                $(MD)/d2_80s.dd $(MD)/d3_80s.dd \
-                $(MD)/scf.mn \
+		$(MD)/d0_80s.dd $(MD)/d1_80s.dd \
+		$(MD)/d2_80s.dd $(MD)/d3_80s.dd \
+		$(MD)/scf.mn \
+		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term_hr.dt \
 		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
 BOOTFILE_COVDG_DS80 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term_vdg.dt \
-		$(MD)/rbf.mn $(MD)/adisk.dr \
+		$(MD)/rbf.mn $(MD)/ddisk.dr \
 		$(MD)/ddd0_80d.dd \
 		$(MD)/d0_80d.dd $(MD)/d1_80d.dd \
 		$(MD)/d2_80d.dd $(MD)/d3_80d.dd \
-                $(MD)/scf.mn \
+		$(MD)/scf.mn \
+		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term_vdg.dt \
 		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
 BOOTFILE_COHR_DS80 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term_hr.dt \
-		$(MD)/rbf.mn $(MD)/adisk.dr \
+		$(MD)/rbf.mn $(MD)/ddisk.dr \
 		$(MD)/ddd0_80d.dd \
 		$(MD)/d0_80d.dd $(MD)/d1_80d.dd \
 		$(MD)/d2_80d.dd $(MD)/d3_80d.dd \
-                $(MD)/scf.mn \
+		$(MD)/scf.mn \
+		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term_hr.dt \
 		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
 BOOTFILES	= bootfile_covdg_ss80 bootfile_cohr_ss80 \
-			bootfile_covdg_ds80 bootfile_cohr_ds80
+		  bootfile_covdg_ds80 bootfile_cohr_ds80
 		  
 KERNELS		= kernel
 
@@ -105,7 +105,7 @@
 				$(MERGE) $^ > $@
 
 # Dragon Alpha WD2797 Kernel
-kernel: 	$(KERNEL) $(DEPENDS)
+kernel: $(KERNEL) $(DEPENDS)
 		$(MERGE) $(KERNEL)>$@
 		$(PADROM) 4096 $@
 
--- a/level1/dalpha/modules/makefile	Fri Jan 17 22:56:23 2014 +0100
+++ b/level1/dalpha/modules/makefile	Fri Jan 17 23:08:35 2014 +0100
@@ -1,183 +1,2 @@
-#
-#level1/dalpha/modules/makefile
-#
-# 2005-04-24, P.Harvey-Smith, 
-#	made descriptors for both 40 & 80 track drives for Dragon 64.
-# 		
-#
-# 2005-05-31, P.Harvey-Smith,
-# 	Steprate now passed in from ../makefile.dragon or ../makefile.dalpha
-#
-# 2005-12-31, P.Harvey-Smith,
-#	Fixed up for renamed video drivers.
-#
-# 2006-01-08, P.Harvey-Smith.
-#	Added descriptors for original Dragon Data single sided 5.25" drives.
-#	Pass step rate to boot_d64, so that boot module steprate set correctly.
-#
-# 2006-01-18, P.Harvey-Smith,
-#	Added ability to build for the Tano Dragon 64, using an RS-DOS
-#	disk controler and a 60Hz clock.
-#
-
-PORT = dalpha
-include $(NITROS9DIR)/rules.mak
-
-vpath %.asm $(LEVEL1)/modules
-
-AFLAGS		+= -I$(LEVEL1)/modules
-
-CLOCKELIM       = -DRTCElim=1
-CLOCKDISTO2     = -DRTCDsto2=1
-CLOCKDISTO4     = -DRTCDsto4=1
-CLOCKBNB        = -DRTCBB=1
-CLOCKSMART      = -DRTCSmart=1 -DMPIFlag=1
-CLOCKHARRIS     = -DRTCHarrs=1
-CLOCKCLOUD9     = -DRTCCloud9=1
-CLOCKSOFT       = -DRTCSoft=1
-CLOCKMESSEMU    = -DRTCMessEmu=1
-CLOCKJVEMU      = -DRTCJVEmu=1
-
-DEPENDS		= ./makefile
-TPB		= $(3RDPARTY)/booters
-
-BOOTERS		= boot_dalpha
-
-BOOTTRACK	= rel $(BOOTERS)
-KERNEL		= krn krnp2
-SYSMODS		= ioman init sysgo_dd sysgo_h0
-
-CLOCKS          = clock_60hz clock_50hz \
-		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
-                clock2_smart clock2_harris clock2_cloud9 clock2_soft \
-		clock2_messemu clock2_jvemu 
-
-RBF		= rbf.mn \
-		adisk.dr \
-		ddd0_80s.dd ddd0_80d.dd d0_80s.dd d0_80d.dd d1_80s.dd d1_80d.dd \
-		d2_80s.dd d2_80d.dd d3_80s.dd d3_80d.dd
-		
-SCF		= scf.mn \
-		vrn.dr scdpp.dr sspak.dr vtio.dr \
-		covdg.io cohr.io\
-		nil.dd p_dpp.dd pipe.dd ssp.dd \
-		term_sc6551.dt t2_sc6551.dt t3_sc6551.dt \
-		term_vdg.dt term_hr.dt term_80.dt p1_sc6551dragon.dd
-
-PIPE		= pipeman.mn \
-		piper.dr \
-		pipe.dd
-
-ALLOBJS		= $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE) 
-
-all:	$(ALLOBJS)
-
-# Special cases
-
-# Kernel
-krn krnp2:
-	$(CD) kernel; make $@
-	$(OS9COPY) kernel/$@ .
-
-boot_dalpha:	boot_d64.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 -DSTEP=$(STEP)
-
-# Clocks
-clock_60hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=60
-
-clock_50hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=50
-
-clock2_bnb: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DBNB=1
-
-clock2_cloud9: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DCLOUD9=1
-
-# Floppy descriptors
-SSDD35		= -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
-		-DInterlv=2 -DSAS=8 -DDensity=1 -DSTEP=0
-SSDD40		= -DCyls=40 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
-		-DInterlv=2 -DSAS=8 -DDensity=1 -DSTEP=$(STEP)
-DSDD40		= -DCyls=40 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
-		-DInterlv=2 -DSAS=8 -DDensity=1 -DSTEP=$(STEP)
-SSDD80		= -DCyls=80 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
-		-DInterlv=2 -DSAS=8 -DDensity=1 -DD35 -DSTEP=$(STEP)
-DSDD80		= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
-		-DInterlv=2 -DSAS=8 -DDensity=1 -DD35 -DSTEP=$(STEP)
-
-#Dragon Alpha
-# Internal drives on Alpha are Single Sided 80 track.
-
-ddd0_80s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=0 -DDD=1
-
-ddd0_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0 -DDD=1
-
-d0_80s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=0
-	
-d0_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0
-	
-d1_80s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=1
-
-d1_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=1
-
-d2_80s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=2
-
-d2_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=2
-
-d3_80s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=3
-
-d3_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=3
-
-adisk.dr: ddisk.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS)
-
-
-sysgo_dd: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DDD=1
-
-sysgo_h0: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $<
-
-
-clean:
-	$(CD) kernel; make $@
-	$(RM) $(ALLOBJS)
-
-showobjs:
-	@$(ECHO) $(ALLOBJS)
-
-showboottrack:
-	@$(ECHO) $(BOOTTRACK)
-
-showkernel:
-	@$(ECHO) $(KERNEL)
-
-showsysmods:
-	@$(ECHO) $(SYSMODS)
-
-showclocks:
-	@$(ECHO) $(CLOCKS)
-
-showrbf:
-	@$(ECHO) $(RBF)
-
-showscf:
-	@$(ECHO) $(SCF)
-
-showpipe:
-	@$(ECHO) $(PIPE)
-
-identify:
-	$(IDENT_SHORT) $(ALLOBJS)
+PORT=dalpha
+include ../../d64/modules/makefile