Module Name: src
Committed By: macallan
Date: Tue Sep 20 05:51:34 UTC 2011
Modified Files:
src/sys/arch/evbmips/loongson: autoconf.h machdep.c
Log Message:
call gdium_cnattach()
Now this actually boots on Gdium.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/loongson/autoconf.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/loongson/machdep.c
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/evbmips/loongson/autoconf.h
diff -u src/sys/arch/evbmips/loongson/autoconf.h:1.1 src/sys/arch/evbmips/loongson/autoconf.h:1.2
--- src/sys/arch/evbmips/loongson/autoconf.h:1.1 Sat Aug 27 13:42:44 2011
+++ src/sys/arch/evbmips/loongson/autoconf.h Tue Sep 20 05:51:34 2011
@@ -104,4 +104,7 @@
extern phys_ram_seg_t mem_clusters[];
extern int mem_cluster_cnt;
+int gdium_cnattach(bus_space_tag_t, bus_space_tag_t,
+ pci_chipset_tag_t, pcitag_t, pcireg_t);
+
#endif /* _MACHINE_AUTOCONF_H_ */
Index: src/sys/arch/evbmips/loongson/machdep.c
diff -u src/sys/arch/evbmips/loongson/machdep.c:1.2 src/sys/arch/evbmips/loongson/machdep.c:1.3
--- src/sys/arch/evbmips/loongson/machdep.c:1.2 Tue Sep 20 05:50:17 2011
+++ src/sys/arch/evbmips/loongson/machdep.c Tue Sep 20 05:51:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.2 2011/09/20 05:50:17 macallan Exp $ */
+/* $NetBSD: machdep.c,v 1.3 2011/09/20 05:51:34 macallan Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.2 2011/09/20 05:50:17 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2011/09/20 05:51:34 macallan Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -513,6 +513,9 @@
sisfb_cnattach(&bonito_memt, &bonito_iot, &bonito_pc,
pcitag, reg);
#endif
+ if (cn_tab == &pmoncons)
+ gdium_cnattach(&bonito_memt, &bonito_iot, &bonito_pc,
+ pcitag, reg);
}
DPRINTF(("\n"));
