Mercurial > hg > Members > kono > nitros9-code

changeset 2740:48afe2b5de06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added needed information in level1/coco make files to create a NOS9 L1 boot disk.
author drencor-xeen
date Sat, 05 Jan 2013 22:56:05 -0600
parents 7afa11757a81
children d1976224b314
files ChangeLog level1/coco/bootfiles/makefile level1/coco/makefile
diffstat 3 files changed, 106 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jan 04 11:50:24 2013 -0600
+++ b/ChangeLog	Sat Jan 05 22:56:05 2013 -0600
@@ -1,6 +1,15 @@
 NitrOS-9 V3.2.9:
 
 ----------------------------------------------------------
+2013/01/05 David Ladd
+M ChangeLog
+M level1/coco/makefile
+M level1/coco/bootfiles/makefile
+
+Added needed sections to makefile(s) to create a NOS9 L1 Beckeer
+boot disk.
+
+----------------------------------------------------------
 2013/01/04 David Ladd
 List of files changed
 M ChangeLog
--- a/level1/coco/bootfiles/makefile	Fri Jan 04 11:50:24 2013 -0600
+++ b/level1/coco/bootfiles/makefile	Sat Jan 05 22:56:05 2013 -0600
@@ -17,6 +17,9 @@
 KERNEL_DW3_COCO2	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		$(MD)/boot_dw3
 
+KERNEL_BECKER_COCO	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
+		$(MD)/boot_dw3_becker
+
 IDE		= $(3PD)/ide
 SCSI		= $(3PD)/scsisys
 
@@ -137,6 +140,27 @@
 		$(MD)/clock_60hz $(MD)/clock2_dw3 \
 		$(MD)/sysgo_dd
 
+BOOTFILE_COVDG_BECKER_COCO	= $(MD)/ioman \
+		$(MD)/rbf.mn $(MD)/rb1773.dr \
+		$(MD)/d0_80d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd \
+		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb \
+		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
+		$(MD)/scf.mn \
+		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
+		$(MD)/scdwn.dr \
+		$(MD)/n_scdwn.dd $(MD)/n1_scdwn.dd $(MD)/n2_scdwn.dd \
+		$(MD)/n3_scdwn.dd $(MD)/n4_scdwn.dd $(MD)/n5_scdwn.dd \
+		$(MD)/n6_scdwn.dd $(MD)/n7_scdwn.dd $(MD)/n8_scdwn.dd \
+		$(MD)/n9_scdwn.dd $(MD)/n10_scdwn.dd $(MD)/n11_scdwn.dd \
+		$(MD)/n12_scdwn.dd $(MD)/n13_scdwn.dd $(MD)/midi_scdwn.dd \
+		$(MD)/z1_scdwn.dd $(MD)/z2_scdwn.dd $(MD)/z3_scdwn.dd \
+		$(MD)/z4_scdwn.dd $(MD)/z5_scdwn.dd $(MD)/z6_scdwn.dd \
+		$(MD)/z7_scdwn.dd \
+		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
+		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/sysgo_dd
+
 BOOTFILE_COVDG_DS80	= $(MD)/ioman \
 		$(MD)/rbf.mn $(MD)/rb1773.dr \
 		$(MD)/d0_80d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd \
@@ -197,10 +221,12 @@
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILES	= bootfile_covdg bootfile_cohr bootfile_covdg_dw3_coco1 bootfile_covdg_dw3_coco2 \
-		bootfile_headless_dw3_coco1 bootfile_headless_dw3_coco2 \
-		bootfile_cohr_dw3_coco1 bootfile_cohr_dw3_coco2 bootfile_covdg_ds80 bootfile_cohr_ds80
-KERNELS		= kernel_1773 kernel_dw3_coco1 kernel_dw3_coco2
+BOOTFILES	= bootfile_covdg bootfile_cohr bootfile_covdg_dw3_coco1 \
+		bootfile_covdg_dw3_coco2 bootfile_headless_dw3_coco1 \
+		bootfile_headless_dw3_coco2 bootfile_cohr_dw3_coco1 \
+		bootfile_cohr_dw3_coco2 bootfile_covdg_ds80 \
+		bootfile_cohr_ds80 bootfile_covdg_becker_coco
+KERNELS		= kernel_1773 kernel_dw3_coco1 kernel_dw3_coco2 kernel_becker_coco
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
@@ -230,6 +256,9 @@
 bootfile_covdg_dw3_coco2: $(BOOTFILE_COVDG_DW3_COCO2) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_DW3_COCO2)>$@
 
+bootfile_covdg_becker_coco: $(BOOTFILE_COVDG_BECKER_COCO) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COVDG_BECKER_COCO)>$@
+
 bootfile_cohr_ds80: $(BOOTFILE_COHR_DS80) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COHR_DS80)>$@
 
@@ -253,6 +282,10 @@
 	$(MERGE) $(KERNEL_DW3_COCO2)>$@
 	$(PADROM) 4608 $@
 
+kernel_becker_coco: $(KERNEL_BECKER_COCO) $(DEPENDS)
+	$(MERGE) $(KERNEL_BECKER_COCO)>$@
+	$(PADROM) 4608 $@
+
 clean:
 	$(RM) $(ALLOBJS)
 
--- a/level1/coco/makefile	Fri Jan 04 11:50:24 2013 -0600
+++ b/level1/coco/makefile	Sat Jan 05 22:56:05 2013 -0600
@@ -18,12 +18,14 @@
 BOOTFILE_HEADLESS_DW3_COCO2	= bootfiles/bootfile_headless_dw3_coco2
 BOOTFILE_COVDG_DW3_COCO1	= bootfiles/bootfile_covdg_dw3_coco1
 BOOTFILE_COVDG_DW3_COCO2	= bootfiles/bootfile_covdg_dw3_coco2
+BOOTFILE_COVDG_BECKER_COCO	= bootfiles/bootfile_covdg_becker_coco
 BOOTFILE_COHR_DS80	= bootfiles/bootfile_cohr_ds80
 BOOTFILE_COHR_DW3_COCO1	= bootfiles/bootfile_cohr_dw3_coco1
 BOOTFILE_COHR_DW3_COCO2	= bootfiles/bootfile_cohr_dw3_coco2
 KERNELFILE	= bootfiles/kernel_1773
 KERNELFILE_DW3_COCO1	= bootfiles/kernel_dw3_coco1
 KERNELFILE_DW3_COCO2	= bootfiles/kernel_dw3_coco2
+KERNELFILE_BECKER_COCO	= bootfiles/kernel_becker_coco
 DIRS		= cmds modules defs sys bootfiles
 
 
@@ -49,6 +51,8 @@
 LDSKDW3COCO1    = $(DISTRONAME)coco1_dw3.dsk
 DSKDW3COCO2     = $(DISTROVER)2_dw3.dsk
 LDSKDW3COCO2    = $(DISTRONAME)coco2_dw3.dsk
+DSKDW3COCOBECK  = $(DISTROVER)_becker.dsk
+LDSKDW3COCOBECK = $(DISTRONAME)coco_becker.dsk
 DSK360K_1       = $(DISTROVER)_40d_1.dsk
 LDSK360K_1      = $(DISTRONAME)_40d_1.dsk
 DSK360K_2       = $(DISTROVER)_40d_2.dsk
@@ -57,8 +61,8 @@
 LDSK720K        = $(DISTRONAME)_80d.dsk
 
 
-DSKS		= $(DSKDW3COCO1) $(DSKDW3COCO2) $(DSK360K_1) $(DSK360K_2) $(DSK720K)
-LDSKS		= $(LDSKDW3COCO1) $(LDSKDW3COCO2) $(LDSK360K_1) $(LDSK360K_2) $(LDSK720K)
+DSKS		= $(DSKDW3COCO1) $(DSKDW3COCO2) $(DSKDW3COCOBECK) $(DSK360K_1) $(DSK360K_2) $(DSK720K)
+LDSKS		= $(LDSKDW3COCO1) $(LDSKDW3COCO2) $(LDSKDW3COCOBECK) $(LDSK360K_1) $(LDSK360K_2) $(LDSK720K)
 
 # Make all components
 all:
@@ -87,6 +91,60 @@
 $(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog
 	$(ARCHIVE) $@ $^
 
+$(DSKDW3COCOBECK):
+	$(RM) $@
+	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/$(CPU) Level 1"
+	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_BECKER_COCO) -t=$(KERNELFILE_BECKER_COCO)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEFS
+	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(foreach file, $(CMDS_D2), $(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) $(STARTUP_DW) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
+	$(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) $(LDSKDW3COCOBECK)
+	$(SOFTLINK) $@ $(LDSKDW3COCOBECK)
+
+
 $(DSKDW3COCO1):
 	$(RM) $@
 	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/$(CPU) Level 1"