Mercurial > hg > Members > kono > nitros9-code

changeset 3016:eb04ba1c507f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH 3/3] level2: Include ccbkrn in build again From ec3a9e79eeb1a8bd3b703e4ea9c28ccbb2d641d5 Mon Sep 17 00:00:00 2001 --- level2/coco3/makefile | 24 ++++++++++++------------ level2/coco3/modules/makefile | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-)
author Brett Gordon <beretta42@gmail.com>
date Wed, 29 Oct 2014 23:12:52 +0100
parents c00d5f495d43
children 545a59f51fee
files level2/coco3/makefile level2/coco3/modules/makefile
diffstat 2 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/level2/coco3/makefile	Wed Oct 29 23:11:32 2014 +0100
+++ b/level2/coco3/makefile	Wed Oct 29 23:12:52 2014 +0100
@@ -46,7 +46,7 @@
 STARTUP		= startup
 STARTUP_DW	= startup.dw
 SYSGO		= sysgo_dd
-# CCBKRN		= ccbkrn
+CCBKRN		= ccbkrn
 
 PACKAGENAME	= $(DISTROVER).zip
 DSKDW		= $(DISTROVER)_dw.dsk
@@ -119,7 +119,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	# $(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(OS9COPY) $(CMDS_DW) ../$@,CMDS
@@ -173,7 +173,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	# $(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(OS9COPY) $(CMDS_DW) ../$@,CMDS
@@ -227,7 +227,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	# $(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(OS9COPY) $(CMDS_DW) ../$@,CMDS
@@ -281,7 +281,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	# $(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(OS9COPY) $(CMDS_DW) ../$@,CMDS
@@ -335,7 +335,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	# $(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(OS9COPY) $(CMDS_DW) ../$@,CMDS
@@ -389,7 +389,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	# $(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(OS9COPY) $(CMDS_DW) ../$@,CMDS
@@ -443,7 +443,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	# $(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(OS9COPY) $(CMDS_DW) ../$@,CMDS
@@ -497,7 +497,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	# $(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
@@ -520,7 +520,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	# $(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
@@ -583,7 +583,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	# $(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(OS9COPY) $(sort $(CMDS) $(CMDS_D2)) ../$@,CMDS
@@ -637,7 +637,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	# $(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(OS9COPY) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(OS9COPY) $(sort $(CMDS) $(CMDS_D2)) ../$@,CMDS
--- a/level2/coco3/modules/makefile	Wed Oct 29 23:11:32 2014 +0100
+++ b/level2/coco3/modules/makefile	Wed Oct 29 23:12:52 2014 +0100
@@ -26,7 +26,7 @@
 		 boot_burke boot_rampak boot_wd1002 boot_dw boot_dw_becker boot_dw_arduino \
 		boot_tc3 boot_ide boot_rom
 BOOTTRACK	= rel_32 rel_40 rel_80 rel_32_50hz rel_40_50hz rel_80_50hz $(BOOTERS) krn
-KERNEL		= krnp2 krnp3_perr krnp4_regdump
+KERNEL		= krnp2 krnp3_perr krnp4_regdump ccbkrn
 SYSMODS		= ioman init sysgo_h0 sysgo_dd sysgo_rom rominfo vectors
 CLOCKS          = clock_60hz clock_50hz \
 		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \