Mercurial > hg > Members > kono > nitros9-code

changeset 2058:27b36e424a4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More updates
author boisy
date Mon, 24 Apr 2006 12:59:17 +0000
parents 2e0ac1c2edd9
children 46aa4db8204e
files level1/d64/bootfiles/makefile level1/d64/cmds/makefile level1/d64/defs/makefile level1/d64/makefile level1/d64/modules/kernel/makefile level1/d64/sys/makefile
diffstat 6 files changed, 244 insertions(+), 241 deletions(-) [+]
line wrap: on
line diff
--- a/level1/d64/bootfiles/makefile	Mon Apr 24 11:44:05 2006 +0000
+++ b/level1/d64/bootfiles/makefile	Mon Apr 24 12:59:17 2006 +0000
@@ -17,7 +17,7 @@
 #	disk controler and a 60Hz clock.
 #
 
-PORT = dragon
+PORT = d64
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
@@ -27,267 +27,86 @@
 
 DEPENDS		= ./makefile
 
-KERNEL_D64	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
+KERNEL_1773	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		  $(MD)/boot_d64
 
-KERNEL_D64TANO	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		  $(MD)/boot_1773_tano
-
-KERNEL_DALPHA	= $(MD)/rel_dalpha $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		  $(MD)/boot_dalpha
-
 IDE	= $(3PD)/ide
 SCSI	= $(3PD)/scsisys
 
 
-#Dragon 32+/64 bootfiles.
-
-BOOTFILE_D64_DS40_32 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/rbf.mn $(MD)/ddisk.dr \
-		$(MD)/ddd0_40d_d64.dd \
-		$(MD)/d0_40d_d64.dd $(MD)/d1_40d_d64.dd \
-		$(MD)/d2_40d_d64.dd $(MD)/d3_40d_d64.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_D64_DS40_51 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/ddisk.dr \
-		$(MD)/ddd0_40d_d64.dd \
-		$(MD)/d0_40d_d64.dd $(MD)/d1_40d_d64.dd \
-		$(MD)/d2_40d_d64.dd $(MD)/d3_40d_d64.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_D64_SS40_32 = $(MD)/ioman \
+BOOTFILE_COVDG_DS40 = $(MD)/ioman \
 		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
 		$(MD)/rbf.mn $(MD)/ddisk.dr \
-		$(MD)/ddd0_40s_d64.dd \
-		$(MD)/d0_40s_d64.dd $(MD)/d1_40s_d64.dd \
-		$(MD)/d2_40s_d64.dd $(MD)/d3_40s_d64.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_D64_SS40_51 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/ddisk.dr \
-		$(MD)/ddd0_40s_d64.dd \
-		$(MD)/d0_40s_d64.dd $(MD)/d1_40s_d64.dd \
-		$(MD)/d2_40s_d64.dd $(MD)/d3_40s_d64.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_D64_DS80_32 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/rbf.mn $(MD)/ddisk.dr \
-		$(MD)/ddd0_80_d64.dd \
-		$(MD)/d0_80_d64.dd $(MD)/d1_80_d64.dd \
-		$(MD)/d2_80_d64.dd $(MD)/d3_80_d64.dd \
+		$(MD)/ddd0_40d.dd \
+		$(MD)/d0_40d.dd $(MD)/d1_40d.dd \
+		$(MD)/d2_40d.dd \
 		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_D64_DS80_51 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/ddisk.dr \
-		$(MD)/ddd0_80_d64.dd \
-		$(MD)/d0_80_d64.dd $(MD)/d1_80_d64.dd \
-		$(MD)/d2_80_d64.dd $(MD)/d3_80_d64.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-#Tano Dragon 64, using RS-Dos cartrage and 60Hz clock (NTSC)
-
-BOOTFILE_D64TANO_DS40_32 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_40d_d64tano.dd \
-		$(MD)/d0_40d_d64tano.dd $(MD)/d1_40d_d64tano.dd \
-		$(MD)/d2_40d_d64tano.dd $(MD)/d3_40d_d64tano.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
+		$(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_D64TANO_DS40_51 = $(MD)/ioman \
+BOOTFILE_COHR_DS40 = $(MD)/ioman \
 		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_40d_d64tano.dd \
-		$(MD)/d0_40d_d64tano.dd $(MD)/d1_40d_d64tano.dd \
-		$(MD)/d2_40d_d64tano.dd $(MD)/d3_40d_d64tano.dd \
+		$(MD)/rbf.mn $(MD)/ddisk.dr \
+		$(MD)/ddd0_40d.dd \
+		$(MD)/d0_40d.dd $(MD)/d1_40d.dd \
+		$(MD)/d2_40d.dd \
 		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
+		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 
-BOOTFILE_D64TANO_DS80_32 = $(MD)/ioman \
+BOOTFILE_COVDG_DS80 = $(MD)/ioman \
 		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_80_d64tano.dd \
-		$(MD)/d0_80_d64tano.dd $(MD)/d1_80_d64tano.dd \
-		$(MD)/d2_80_d64tano.dd $(MD)/d3_80_d64tano.dd \
+		$(MD)/rbf.mn $(MD)/ddisk.dr \
+		$(MD)/ddd0_80d.dd \
+		$(MD)/d0_80d.dd $(MD)/d1_80d.dd \
+		$(MD)/d2_80d.dd \
 		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_D64TANO_DS80_51 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_80_d64tano.dd \
-		$(MD)/d0_80_d64tano.dd $(MD)/d1_80_d64tano.dd \
-		$(MD)/d2_80_d64tano.dd $(MD)/d3_80_d64tano.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
+		$(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
 
-#Dragon Alpha Bootfiles
-
-BOOTFILE_DALPHA_SS80_32 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/rbf.mn $(MD)/adisk.dr \
-		$(MD)/ddd0_dalpha.dd\
-                $(MD)/d0_dalpha.dd $(MD)/d1_dalpha.dd \
-                $(MD)/d2_dalpha.dd $(MD)/d3_dalpha.dd \
-                $(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.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)/scf.mn \
+		$(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_DALPHA_SS80_51 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/adisk.dr \
-		$(MD)/ddd0_dalpha.dd\
-                $(MD)/d0_dalpha.dd $(MD)/d1_dalpha.dd \
-                $(MD)/d2_dalpha.dd $(MD)/d3_dalpha.dd \
-                $(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
+		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILE_DALPHA_DS80_32 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/rbf.mn $(MD)/adisk.dr \
-		$(MD)/ddd0_80_d64.dd \
-		$(MD)/d0_80_d64.dd $(MD)/d1_80_d64.dd \
-		$(MD)/d2_80_d64.dd $(MD)/d3_80_d64.dd \
-                $(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_DALPHA_DS80_51 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/adisk.dr \
-		$(MD)/ddd0_80_d64.dd \
-		$(MD)/d0_80_d64.dd $(MD)/d1_80_d64.dd \
-		$(MD)/d2_80_d64.dd $(MD)/d3_80_d64.dd \
-                $(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILES	= bootfile_d64_DS40_51 bootfile_d64_DS40_32 \
-		  bootfile_d64_SS40_51 bootfile_d64_SS40_32 \
-		  bootfile_d64_DS80_51 bootfile_d64_DS80_32 \
-		  bootfile_d64tano_DS40_51 bootfile_d64tano_DS40_32 \
-		  bootfile_d64tano_DS80_51 bootfile_d64tano_DS80_32 \
-		  bootfile_dalpha_SS80_32 bootfile_dalpha_SS80_51 \
-		  bootfile_dalpha_DS80_32 bootfile_dalpha_DS80_51
+BOOTFILES	= bootfile_cohr_ds40 bootfile_covdg_ds40 \
+		  bootfile_cohr_ds80 bootfile_covdg_ds80
 		  
-KERNELS		= kernel_d64 kernel_d64tano kernel_dalpha
+KERNELS		= kernel
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
 all:	$(ALLOBJS)
 
 echo:	
-	@$(ECHO) $(BOOTFILE_D64_DS40_32)
-
-# Dragon64 Disk boot
-bootfile_d64_DS40_32: 	$(BOOTFILE_D64_DS40_32) $(DEPENDS)
-			$(MERGE) $(BOOTFILE_D64_DS40_32)>$@
-
-bootfile_d64_DS40_51: 	$(BOOTFILE_D64_DS40_51) $(DEPENDS)
-			$(MERGE) $(BOOTFILE_D64_DS40_51)>$@
-			
-bootfile_d64_SS40_32: 	$(BOOTFILE_D64_DS40_32) $(DEPENDS)
-			$(MERGE) $(BOOTFILE_D64_DS40_32)>$@
+	@$(ECHO) $(BOOTFILE_COVDG_DS40)
 
-bootfile_d64_SS40_51: 	$(BOOTFILE_D64_DS40_51) $(DEPENDS)
-			$(MERGE) $(BOOTFILE_D64_DS40_51)>$@
-
-bootfile_d64_DS80_32: 	$(BOOTFILE_D64_DS80_32) $(DEPENDS)
-			$(MERGE) $(BOOTFILE_D64_DS80_32)>$@
+bootfile_covdg_ds40: 	$(BOOTFILE_COVDG_DS40) $(DEPENDS)
+				$(MERGE) $(BOOTFILE_COVDG_DS40)>$@
 
-bootfile_d64_DS80_51: 	$(BOOTFILE_D64_DS80_51) $(DEPENDS)
-			$(MERGE) $(BOOTFILE_D64_DS80_51)>$@
-
-#Tano bootfiles
-bootfile_d64tano_DS40_32: 	$(BOOTFILE_D64TANO_DS40_32) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_D64TANO_DS40_32)>$@
-
-bootfile_d64tano_DS40_51: 	$(BOOTFILE_D64TANO_DS40_51) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_D64TANO_DS40_51)>$@
+bootfile_cohr_ds40: 	$(BOOTFILE_COHR_DS40) $(DEPENDS)
+				$(MERGE) $(BOOTFILE_COHR_DS40)>$@
 
-bootfile_d64tano_DS80_32: 	$(BOOTFILE_D64TANO_DS80_32) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_D64TANO_DS80_32)>$@
-
-bootfile_d64tano_DS80_51: 	$(BOOTFILE_D64TANO_DS80_51) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_D64TANO_DS80_51)>$@
-
-# Dragon Alpha Disk boot
-bootfile_dalpha_SS80_32: 	$(BOOTFILE_DALPHA_SS80_32) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_DALPHA_SS80_32)>$@
-
-bootfile_dalpha_SS80_51: 	$(BOOTFILE_DALPHA_SS80_51) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_DALPHA_SS80_51)>$@
-
-bootfile_dalpha_DS80_32: 	$(BOOTFILE_DALPHA_DS80_32) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_DALPHA_DS80_32)>$@
+bootfile_covdg_ds80: 	$(BOOTFILE_COVDG_DS80) $(DEPENDS)
+				$(MERGE) $(BOOTFILE_COVDG_DS80)>$@
 
-bootfile_dalpha_DS80_51: 	$(BOOTFILE_DALPHA_DS80_51) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_DALPHA_DS80_51)>$@
-
-# Dragon 64 WD2797 Kernel
-kernel_d64: 	$(KERNEL_D64) $(DEPENDS)
-		$(MERGE) $(KERNEL_D64)>$@
-		$(PADROM) 4096 $@
+bootfile_cohr_ds80: 	$(BOOTFILE_COHR_DS80) $(DEPENDS)
+				$(MERGE) $(BOOTFILE_COHR_DS80)>$@
 
-# Tano Dragon 64 WD1773 Kernel
-kernel_d64tano:	$(KERNEL_D64TANO) $(DEPENDS)
-		$(MERGE) $(KERNEL_D64TANO)>$@
-		$(PADROM) 4096 $@
-
-# Dragon Alpha WD2797 Kernel
-kernel_dalpha: 	$(KERNEL_D64) $(DEPENDS)
-		$(MERGE) $(KERNEL_DALPHA)>$@
+kernel:	$(KERNEL_1773) $(DEPENDS)
+		$(MERGE) $(KERNEL_1773)>$@
 		$(PADROM) 4096 $@
 
 clean:
--- a/level1/d64/cmds/makefile	Mon Apr 24 11:44:05 2006 +0000
+++ b/level1/d64/cmds/makefile	Mon Apr 24 12:59:17 2006 +0000
@@ -1,7 +1,7 @@
-PORT = dragon
+PORT = d64
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L1)/cmds:$(3RDPARTY)/packages/basic09
+vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
 
 DEPENDS		= ./makefile
 
--- a/level1/d64/defs/makefile	Mon Apr 24 11:44:05 2006 +0000
+++ b/level1/d64/defs/makefile	Mon Apr 24 12:59:17 2006 +0000
@@ -1,4 +1,4 @@
-PORT = dragon
+PORT = d64
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/d64/makefile	Mon Apr 24 12:59:17 2006 +0000
@@ -0,0 +1,182 @@
+PORT = d64
+include $(NITROS9DIR)/rules.mak
+
+CPU		= 6809
+LEVEL		= 1
+
+# 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_ds40
+BOOTFILE_COHR	= bootfiles/bootfile_cohr_ds40
+BOOTFILE_COVDG_DS80	= bootfiles/bootfile_covdg_ds80
+BOOTFILE_COHR_DS80	= bootfiles/bootfile_cohr_ds80
+KERNELFILE	= bootfiles/kernel
+DIRS		= cmds modules defs sys bootfiles
+
+
+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)_40d_1.dsk
+LDSK360K_1      = $(DISTRONAME)_40d_1.dsk
+DSK360K_2       = $(DISTROVER)_40d_2.dsk
+LDSK360K_2      = $(DISTRONAME)_40d_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);)
+
+# 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) $@ $^
+
+$(DSK360K_1):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q -dr $@ -n"NitrOS-9/6809 Level 1 Disk 1"
+	$(OS9GEN) $@ -d -b=$(BOOTFILE_COVDG) -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_DS40) -q -dr $@ -n"NitrOS-9/6809 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 $@ -n"NitrOS-9/6809 Level 1"
+	$(OS9GEN) $@ -d -b=$(BOOTFILE_COVDG_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/d64/modules/kernel/makefile	Mon Apr 24 11:44:05 2006 +0000
+++ b/level1/d64/modules/kernel/makefile	Mon Apr 24 12:59:17 2006 +0000
@@ -1,3 +1,4 @@
+PORT = d64
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
--- a/level1/d64/sys/makefile	Mon Apr 24 11:44:05 2006 +0000
+++ b/level1/d64/sys/makefile	Mon Apr 24 12:59:17 2006 +0000
@@ -1,22 +1,23 @@
-PORT = dragon
+PORT = d64
 include $(NITROS9DIR)/rules.mak
 
+vpath %.hp	$(LEVEL1)/sys
+
 DEPENDS		= ./makefile
-HD		= $(6809L1)/sys
 
 SYSFILES	= errmsg motd password
-HELPFILES	= $(HD)/asm.hp $(HD)/attr.hp $(HD)/backup.hp $(HD)/binex.hp $(HD)/build.hp $(HD)/chd.hp \
-		$(HD)/chx.hp $(HD)/cmp.hp $(HD)/cobbler.hp $(HD)/config.hp $(HD)/copy.hp $(HD)/cputype.hp $(HD)/date.hp \
-		$(HD)/dcheck.hp $(HD)/debug.hp $(HD)/ded.hp $(HD)/deiniz.hp $(HD)/del.hp $(HD)/deldir.hp $(HD)/devs.hp \
-		$(HD)/dir.hp $(HD)/dirsort.hp $(HD)/disasm.hp $(HD)/display.hp $(HD)/dmode.hp $(HD)/dsave.hp $(HD)/dump.hp $(HD)/echo.hp \
-		$(HD)/edit.hp $(HD)/error.hp $(HD)/ex.hp $(HD)/exbin.hp $(HD)/format.hp $(HD)/free.hp $(HD)/gfx.hp \
-		$(HD)/help.hp $(HD)/ident.hp $(HD)/iniz.hp $(HD)/inkey.hp $(HD)/irqs.hp $(HD)/kill.hp $(HD)/link.hp \
-		$(HD)/list.hp $(HD)/load.hp $(HD)/login.hp $(HD)/makdir.hp \
-		$(HD)/mdir.hp $(HD)/megaread.hp $(HD)/merge.hp $(HD)/mpi.hp $(HD)/mfree.hp $(HD)/os9gen.hp \
-		$(HD)/padrom.hp $(HD)/park.hp $(HD)/procs.hp $(HD)/prompt.hp $(HD)/pwd.hp $(HD)/pxd.hp \
-	 	$(HD)/rename.hp $(HD)/save.hp $(HD)/setime.hp \
-		$(HD)/setpr.hp $(HD)/shell.hp $(HD)/sleep.hp $(HD)/tee.hp $(HD)/tmode.hp $(HD)/touch.hp $(HD)/tsmon.hp \
-		$(HD)/tuneport.hp $(HD)/unlink.hp $(HD)/verify.hp $(HD)/xmode.hp
+HELPFILES	= asm.hp attr.hp backup.hp binex.hp build.hp chd.hp \
+		chx.hp cmp.hp cobbler.hp config.hp copy.hp cputype.hp date.hp \
+		dcheck.hp debug.hp ded.hp deiniz.hp del.hp deldir.hp devs.hp \
+		dir.hp dirsort.hp disasm.hp display.hp dmode.hp dsave.hp dump.hp echo.hp \
+		edit.hp error.hp ex.hp exbin.hp format.hp free.hp gfx.hp \
+		help.hp ident.hp iniz.hp inkey.hp irqs.hp kill.hp link.hp \
+		list.hp load.hp login.hp makdir.hp \
+		mdir.hp megaread.hp merge.hp mpi.hp mfree.hp os9gen.hp \
+		padrom.hp park.hp procs.hp prompt.hp pwd.hp pxd.hp \
+	 	rename.hp save.hp setime.hp \
+		setpr.hp shell.hp sleep.hp tee.hp tmode.hp touch.hp tsmon.hp \
+		tuneport.hp unlink.hp verify.hp xmode.hp
 HELPMSG		= helpmsg
 ALLOBJS		= $(SYSFILES) $(HELPMSG)
 
@@ -26,7 +27,7 @@
 alldragon: $(ALLOBJS)
 
 helpmsg: $(HELPFILES)
-	$(MERGE) $(HELPFILES) > $@
+	$(MERGE) $^ > $@
 
 clean:
 	$(RM) $(HELPMSG)