Mercurial > hg > Members > kono > nitros9-code

changeset 3082:6da1deb038f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
level2: Set "coco1" baud rate in port.mak via DW_BAUD38400 flag instead of matching "coco1" port name when selecting boot modules. Makes it easier to add new ports with the "coco1" 38400 baud rate.
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 26 Jul 2015 10:38:26 +0200
parents 4f384d9b7e1a
children f631d26d4913
files level1/coco1/bootfiles/makefile level1/coco1/port.mak
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco1/bootfiles/makefile	Sat Jul 25 09:24:30 2015 +0200
+++ b/level1/coco1/bootfiles/makefile	Sun Jul 26 10:38:26 2015 +0200
@@ -10,7 +10,7 @@
 KERNEL_1773	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		$(MD)/boot_1773_6ms
 
-ifeq ($(PORT),coco1)
+ifdef DW_BAUD38400
 KERNEL_DW	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		$(MD)/boot_dw_coco1
 else
@@ -40,7 +40,7 @@
 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)
+ifdef DW_BAUD38400
 RBDW		= $(MD)/rbdw.dr $(MD)/dwio_coco1.sb \
 		$(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd
 else
--- a/level1/coco1/port.mak	Sat Jul 25 09:24:30 2015 +0200
+++ b/level1/coco1/port.mak	Sun Jul 26 10:38:26 2015 +0200
@@ -4,5 +4,6 @@
 LEVEL = 1
 TELNET_PORT = 6802
 HTTPD_PORT = 8802
+DW_BAUD38400 = 1
 
 include $(NITROS9DIR)/rules.mak