Module Name:    src
Committed By:   christos
Date:           Mon Apr  9 19:05:26 UTC 2018

Modified Files:
        src/sys/arch/cobalt/conf: GENERIC INSTALL files.cobalt

Log Message:
rename the cobalt panel to ledpanel to avoid conflict with fdt.


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/cobalt/conf/files.cobalt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.156 src/sys/arch/cobalt/conf/GENERIC:1.157
--- src/sys/arch/cobalt/conf/GENERIC:1.156	Tue Jan 23 09:47:54 2018
+++ src/sys/arch/cobalt/conf/GENERIC	Mon Apr  9 15:05:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.156 2018/01/23 14:47:54 sevan Exp $
+# $NetBSD: GENERIC,v 1.157 2018/04/09 19:05:26 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.156 $"
+#ident 		"GENERIC-$Revision: 1.157 $"
 
 maxusers	32
 
@@ -146,7 +146,7 @@ zsc0		at mainbus? addr 0x1c800000 irq 4
 zstty0		at zsc0 channel 0
 zstty1		at zsc0 channel 1
 
-panel0 		at mainbus? addr 0x1f000000
+ledpanel0	at mainbus? addr 0x1f000000
 
 gt0 		at mainbus? addr 0x14000000
 

Index: src/sys/arch/cobalt/conf/INSTALL
diff -u src/sys/arch/cobalt/conf/INSTALL:1.65 src/sys/arch/cobalt/conf/INSTALL:1.66
--- src/sys/arch/cobalt/conf/INSTALL:1.65	Tue Jan 23 09:47:54 2018
+++ src/sys/arch/cobalt/conf/INSTALL	Mon Apr  9 15:05:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.65 2018/01/23 14:47:54 sevan Exp $
+# $NetBSD: INSTALL,v 1.66 2018/04/09 19:05:26 christos Exp $
 #
 # INSTALL -- installation and rescue kernel.
 #
@@ -10,7 +10,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"INSTALL-$Revision: 1.65 $"
+#ident 		"INSTALL-$Revision: 1.66 $"
 
 makeoptions     COPTS="-Os -mmemcpy"
 makeoptions	CPUFLAGS="-march=vr5000 -mabi=32"
@@ -135,7 +135,7 @@ zsc0		at mainbus? addr 0x1c800000 irq 4
 zstty0		at zsc0 channel 0
 #zstty1		at zsc0 channel 1
 
-panel0 		at mainbus? addr 0x1f000000
+ledpanel0	at mainbus? addr 0x1f000000
 
 gt0 		at mainbus? addr 0x14000000
 

Index: src/sys/arch/cobalt/conf/files.cobalt
diff -u src/sys/arch/cobalt/conf/files.cobalt:1.39 src/sys/arch/cobalt/conf/files.cobalt:1.40
--- src/sys/arch/cobalt/conf/files.cobalt:1.39	Sat Jan 20 08:56:09 2018
+++ src/sys/arch/cobalt/conf/files.cobalt	Mon Apr  9 15:05:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.cobalt,v 1.39 2018/01/20 13:56:09 skrll Exp $
+#	$NetBSD: files.cobalt,v 1.40 2018/04/09 19:05:26 christos Exp $
 
 maxpartitions 16
 
@@ -31,9 +31,9 @@ device mcclock: mc146818
 attach mcclock at mainbus
 file arch/cobalt/dev/mcclock.c		mcclock		needs-flag
 
-device panel: hd44780
-attach panel at mainbus
-file arch/cobalt/dev/panel.c		panel
+device ledpanel: hd44780
+attach ledpanel at mainbus
+file arch/cobalt/dev/panel.c		ledpanel
 
 device gt: pcibus
 attach gt at mainbus

Reply via email to