Mercurial > hg > Members > kono > nitros9-code
changeset 2786:e333ec1907ef lwtools-port
Updated makefile(s) so correct coco1 dw boot and dwio.sb files are used.
Updated level1/coco1/modules/makefile so that boot_dw_coco1
and dwio_coco1.sb get created.
Updated level1/coco1/bootfiles/makefile added detection of PORT
status so if coco1 is detected then dwio_coco1.sb and
boot_dw_coco1 are used in place of dwio.sb and boot_dw.
| author | drencor-xeen |
|---|---|
| date | Sun, 27 Jan 2013 00:14:03 -0600 |
| parents | 2d45c7285ae4 |
| children | 151849d94f25 |
| files | ChangeLog level1/coco1/bootfiles/makefile level1/coco1/modules/makefile |
| diffstat | 3 files changed, 34 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jan 26 17:21:50 2013 -0600 +++ b/ChangeLog Sun Jan 27 00:14:03 2013 -0600 @@ -1,6 +1,19 @@ NitrOS-9 V3.2.9: ---------------------------------------------------------- +2013/01/27 David Ladd +M ChangeLog +M level1/coco1/bootfiles/makefile +M level1/coco1/modules/makefile + +Updated level1/coco1/modules/makefile so that boot_dw_coco1 +and dwio_coco1.sb get created. + +Updated level1/coco1/bootfiles/makefile added detection of +PORT status so if coco1 is detected then dwio_coco1.sb and +boot_dw_coco1 are used in place of dwio.sb and boot_dw. + +---------------------------------------------------------- 2013/01/26 David Ladd M ChangeLog M level1/coco1/bootfiles/makefile
--- a/level1/coco1/bootfiles/makefile Sat Jan 26 17:21:50 2013 -0600 +++ b/level1/coco1/bootfiles/makefile Sun Jan 27 00:14:03 2013 -0600 @@ -13,8 +13,13 @@ KERNEL_1773 = $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \ $(MD)/boot_1773_6ms +ifeq ($(PORT),coco1) +KERNEL_DW = $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \ + $(MD)/boot_dw_coco1 +else KERNEL_DW = $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \ $(MD)/boot_dw +endif KERNEL_BECKER = $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \ $(MD)/boot_dw_becker @@ -35,8 +40,13 @@ PIPE = $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd CLOCK60HZ = $(MD)/clock_60hz $(MD)/clock2_soft CLOCK60HZDW = $(MD)/clock_60hz $(MD)/clock2_dw +ifeq ($(PORT),coco1) +RBDW = $(MD)/rbdw.dr $(MD)/dwio_coco1.sb \ + $(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd +else RBDW = $(MD)/rbdw.dr $(MD)/dwio.sb \ $(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd +endif RBBECKER = $(MD)/rbdw.dr $(MD)/dwio_becker.sb \ $(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd RBARDUINO = $(MD)/rbdw.dr $(MD)/dwio_arduino.sb \ @@ -296,5 +306,4 @@ $(PADROM) 4608 $@ clean: - $(RM) $(ALLOBJS) - + -$(RM) $(ALLOBJS)
--- a/level1/coco1/modules/makefile Sat Jan 26 17:21:50 2013 -0600 +++ b/level1/coco1/modules/makefile Sun Jan 27 00:14:03 2013 -0600 @@ -26,7 +26,7 @@ BOOTERS = boot_1773_6ms boot_1773_30ms \ boot_burke boot_rampak boot_wd1002 boot_dw \ boot_tc3 boot_ide boot_rom boot_dw_becker \ - boot_dw_arduino + boot_dw_arduino boot_dw_coco1 BOOTTRACK = rel $(BOOTERS) KERNEL = krn krnp2 wbug SYSMODS = ioman init sysgo_dd sysgo_h0 rominfo vectors @@ -36,7 +36,7 @@ clock2_messemu clock2_jvemu clock2_dw RBF = rbf.mn \ - rbdw.dr dwio.sb dwio_becker.sb dwio_arduino.sb \ + rbdw.dr dwio.sb dwio_coco1.sb dwio_becker.sb dwio_arduino.sb \ rb1773.dr rb1773_scii_ff74.dr rb1773_scii_ff58.dr \ ddd0_35s.dd d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \ ddd0_40d.dd d0_40d.dd d1_40d.dd d2_40d.dd \ @@ -101,6 +101,14 @@ dwio_arduino.sb: dwio.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DARDUINO=1 +# DriveWire CoCo1 Booter +boot_dw_coco1: boot_dw.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DBAUD38400=1 + +# DriveWire CoCo1 Submodule +dwio_coco1.sb: dwio.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DBAUD38400=1 + # DriveWire 3 boot_1773_6ms: boot_1773.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 -DSTEP=0