Mercurial > hg > Members > kono > nitros9-code

changeset 1370:62991148cab4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More changes
author boisy
date Fri, 26 Sep 2003 14:52:28 +0000
parents de053e06fdce
children 1ed7c47503e8
files level2/coco3/bootfiles/makefile level2/coco3/bootfiles/makefile.cust level2/coco3_6309/bootfiles/makefile level2/coco3_6309/bootfiles/makefile.cust level2/modules/makefile
diffstat 5 files changed, 38 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/level2/coco3/bootfiles/makefile	Fri Sep 26 14:47:41 2003 +0000
+++ b/level2/coco3/bootfiles/makefile	Fri Sep 26 14:52:28 2003 +0000
@@ -7,10 +7,10 @@
 
 DEPENDS		= ./makefile
 
-KERNEL_STOCK	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/os9p1
+KERNEL_STOCK	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/kernel
 
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
-BOOTFILE_VDG	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_VDG	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_40d.dd \
@@ -24,7 +24,7 @@
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft
 
-BOOTFILE_WIN40	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_WIN40	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_40d.dd \
@@ -37,7 +37,7 @@
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft
 
-BOOTFILE_WIN80	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_WIN80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_40d.dd \
--- a/level2/coco3/bootfiles/makefile.cust	Fri Sep 26 14:47:41 2003 +0000
+++ b/level2/coco3/bootfiles/makefile.cust	Fri Sep 26 14:52:28 2003 +0000
@@ -10,14 +10,14 @@
 
 DEPENDS		= ./Makefile
 
-KERNEL_1773	= $(MD)/rel $(MD)/boot_1773_6ms $(MD)/os9p1
-KERNEL_ROM	= $(MD)/rel $(3PB)/boot_rom $(MD)/os9p1
-KERNEL_KENTON	= $(MD)/rel $(C9)/superscsi/boot_id0_ktlr_l2 $(MD)/os9p1
-KERNEL_TC3	= $(MD)/rel $(C9)/superscsi/boot_id0_tc3_l2 $(MD)/os9p1
-KERNEL_DW	= $(MD)/rel $(C9)/drivewire/boot_drivewire_l2 $(MD)/os9p1
+KERNEL_1773	= $(MD)/rel $(MD)/boot_1773_6ms $(MD)/kernel
+KERNEL_ROM	= $(MD)/rel $(3PB)/boot_rom $(MD)/kernel
+KERNEL_KENTON	= $(MD)/rel $(C9)/superscsi/boot_id0_ktlr_l2 $(MD)/kernel
+KERNEL_TC3	= $(MD)/rel $(C9)/superscsi/boot_id0_tc3_l2 $(MD)/kernel
+KERNEL_DW	= $(MD)/rel $(C9)/drivewire/boot_drivewire_l2 $(MD)/kernel
 
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
-BOOTFILE_1773	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_1773	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
 		$(MD)/ddd0_40d.dd \
@@ -33,13 +33,13 @@
 BOOTFILE_1773_ROM = $(MD)/rominfo
 
 # OS-9 ROM image to allow booting from ROM
-BOOTFILE_ROM	= $(MD)/rominfo $(MD)/os9p2 $(MD)/init $(MD)/ioman \
+BOOTFILE_ROM	= $(MD)/rominfo $(MD)/kernelp2 $(MD)/init $(MD)/ioman \
 		$(MD)/scf.mn $(MD)/sio.dr $(MD)/term_t1.dd \
 		$(MD)/sspak.dr $(MD)/ssp.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(CD)/shell $(CD)/mdir $(CD)/mfree $(CD)/procs
 
-BOOTFILE_DW	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/cc3disk.dr \
 		$(MD)/d0_40d.dd \
@@ -63,7 +63,7 @@
 		
 # OS-9 disk bootfile to allow booting from Ken-Ton SCSI controller
 # This is a custom boot for Boisy's system
-BOOTFILE_TC3	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_TC3	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(C9)/superscsi/superscsi_tc3_l2.dr \
 		dd_ez135_l2.dd \
 		$(C9)/superscsi/c3_cdrom_l2.dd \
@@ -83,7 +83,7 @@
 		
 # OS-9 disk bootfile to allow booting from Ken-Ton SCSI controller
 BOOTFILE_KENTON	= $(C9)/superscsi/superscsi_ktlr_l2.dr \
-		$(MD)/os9p2 $(MD)/ioman $(MD)/init \
+		$(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(C9)/superscsi/h0_ez135_l2.dd \
 		$(C9)/superscsi/c3_cdrom_l2.dd \
--- a/level2/coco3_6309/bootfiles/makefile	Fri Sep 26 14:47:41 2003 +0000
+++ b/level2/coco3_6309/bootfiles/makefile	Fri Sep 26 14:52:28 2003 +0000
@@ -7,10 +7,10 @@
 
 DEPENDS		= ./makefile
 
-KERNEL_STOCK	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/os9p1
+KERNEL_STOCK	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/kernel
 
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
-BOOTFILE_VDG	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_VDG	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_40d.dd \
@@ -24,7 +24,7 @@
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft
 
-BOOTFILE_WIN40	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_WIN40	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_40d.dd \
@@ -37,7 +37,7 @@
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft
 
-BOOTFILE_WIN80	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_WIN80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_40d.dd \
--- a/level2/coco3_6309/bootfiles/makefile.cust	Fri Sep 26 14:47:41 2003 +0000
+++ b/level2/coco3_6309/bootfiles/makefile.cust	Fri Sep 26 14:52:28 2003 +0000
@@ -10,14 +10,14 @@
 
 DEPENDS		= ./Makefile
 
-KERNEL_1773	= $(MD)/rel $(MD)/boot_1773_6ms $(MD)/os9p1
-KERNEL_ROM	= $(MD)/rel $(3PB)/boot_rom $(MD)/os9p1
-KERNEL_KENTON	= $(MD)/rel $(C9)/superscsi/boot_id0_ktlr_l2 $(MD)/os9p1
-KERNEL_TC3	= $(MD)/rel $(C9)/superscsi/boot_id0_tc3_l2 $(MD)/os9p1
-KERNEL_DW	= $(MD)/rel $(C9)/drivewire/boot_drivewire_l2 $(MD)/os9p1
+KERNEL_1773	= $(MD)/rel $(MD)/boot_1773_6ms $(MD)/kernel
+KERNEL_ROM	= $(MD)/rel $(3PB)/boot_rom $(MD)/kernel
+KERNEL_KENTON	= $(MD)/rel $(C9)/superscsi/boot_id0_ktlr_l2 $(MD)/kernel
+KERNEL_TC3	= $(MD)/rel $(C9)/superscsi/boot_id0_tc3_l2 $(MD)/kernel
+KERNEL_DW	= $(MD)/rel $(C9)/drivewire/boot_drivewire_l2 $(MD)/kernel
 
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
-BOOTFILE_1773	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_1773	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
 		$(MD)/ddd0_40d.dd \
@@ -33,13 +33,13 @@
 BOOTFILE_1773_ROM = $(MD)/rominfo
 
 # OS-9 ROM image to allow booting from ROM
-BOOTFILE_ROM	= $(MD)/rominfo $(MD)/os9p2 $(MD)/init $(MD)/ioman \
+BOOTFILE_ROM	= $(MD)/rominfo $(MD)/kernelp2 $(MD)/init $(MD)/ioman \
 		$(MD)/scf.mn $(MD)/sio.dr $(MD)/term_t1.dd \
 		$(MD)/sspak.dr $(MD)/ssp.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(CD)/shell $(CD)/mdir $(CD)/mfree $(CD)/procs
 
-BOOTFILE_DW	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/cc3disk.dr \
 		$(MD)/d0_40d.dd \
@@ -63,7 +63,7 @@
 		
 # OS-9 disk bootfile to allow booting from Ken-Ton SCSI controller
 # This is a custom boot for Boisy's system
-BOOTFILE_TC3	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_TC3	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(C9)/superscsi/superscsi_tc3_l2.dr \
 		dd_ez135_l2.dd \
 		$(C9)/superscsi/c3_cdrom_l2.dd \
@@ -83,7 +83,7 @@
 		
 # OS-9 disk bootfile to allow booting from Ken-Ton SCSI controller
 BOOTFILE_KENTON	= $(C9)/superscsi/superscsi_ktlr_l2.dr \
-		$(MD)/os9p2 $(MD)/ioman $(MD)/init \
+		$(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(C9)/superscsi/h0_ez135_l2.dd \
 		$(C9)/superscsi/c3_cdrom_l2.dd \
--- a/level2/modules/makefile	Fri Sep 26 14:47:41 2003 +0000
+++ b/level2/modules/makefile	Fri Sep 26 14:52:28 2003 +0000
@@ -16,8 +16,8 @@
 
 BOOTERS		= boot_1773_6ms boot_1773_30ms \
 		 boot_burke boot_idelba boot_rampak boot_wd1002
-BOOTTRACK	= rel_32 rel_40 rel_80 $(BOOTERS) os9p1
-KERNEL		= os9p2 os9p3_perr os9p4_regdump
+BOOTTRACK	= rel_32 rel_40 rel_80 $(BOOTERS) kernel
+KERNEL		= kernelp2 kernelp3_perr kernelp4_regdump
 SYSMODS		= ioman init sysgo_h0 sysgo_dd
 CLOCKS          = clock_60hz clock_50hz \
 		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
@@ -53,19 +53,19 @@
 # The following macros represent a collection of modules for various
 # kernel tracks and bootfile configurations.
 #
-KERNEL_1773	= rel_32 boot_1773 os9p1
-KERNEL_RAMPAK	= rel_32 $(TPB)/boot_rampak os9p1
-KERNEL_KENTON	= rel_32 $(TPB)/boot_kenton os9p1
-KERNEL_IDE	= rel_32 $(TPB)/boot_ide os9p1
+KERNEL_1773	= rel_32 boot_1773 kernel
+KERNEL_RAMPAK	= rel_32 $(TPB)/boot_rampak kernel
+KERNEL_KENTON	= rel_32 $(TPB)/boot_kenton kernel
+KERNEL_IDE	= rel_32 $(TPB)/boot_ide kernel
 
 ALLOBJS		=  $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE)
 
 all:	$(ALLOBJS)
 
 # Kernel
-os9p1 os9p2:
-	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
+kernel kernelp2:
+	$(CD) krnl; make $@
+	$(CP) krnl/$@ .
 
 # Special cases
 rel_32: rel.asm
@@ -209,7 +209,7 @@
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< $(CLOCKSOFT)
 
 clean:
-	$(CD) kernel; make $@
+	$(CD) krnl; make $@
 	$(RM) $(ALLOBJS)
 
 showobjs: