Module Name: src
Committed By: jmcneill
Date: Tue Nov 11 19:22:32 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_debe.c awin_hdmi.c awin_tcon.c
files.awin
Log Message:
defflag AWIN_HDMI_DEBUG, AWIN_TCON_DEBUG, AWIN_DEBE_DEBUG, and defparam
AWIN_DEBE_VIDEOMEM
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_debe.c \
src/sys/arch/arm/allwinner/awin_tcon.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/allwinner/awin_hdmi.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/allwinner/files.awin
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/arm/allwinner/awin_debe.c
diff -u src/sys/arch/arm/allwinner/awin_debe.c:1.3 src/sys/arch/arm/allwinner/awin_debe.c:1.4
--- src/sys/arch/arm/allwinner/awin_debe.c:1.3 Mon Nov 10 17:55:25 2014
+++ src/sys/arch/arm/allwinner/awin_debe.c Tue Nov 11 19:22:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_debe.c,v 1.3 2014/11/10 17:55:25 jmcneill Exp $ */
+/* $NetBSD: awin_debe.c,v 1.4 2014/11/11 19:22:32 jmcneill Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -26,14 +26,15 @@
* SUCH DAMAGE.
*/
+#include "opt_allwinner.h"
+#include "genfb.h"
+
#ifndef AWIN_DEBE_VIDEOMEM
#define AWIN_DEBE_VIDEOMEM (16 * 1024 * 1024)
#endif
-#include "genfb.h"
-
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.3 2014/11/10 17:55:25 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.4 2014/11/11 19:22:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/allwinner/awin_tcon.c
diff -u src/sys/arch/arm/allwinner/awin_tcon.c:1.3 src/sys/arch/arm/allwinner/awin_tcon.c:1.4
--- src/sys/arch/arm/allwinner/awin_tcon.c:1.3 Mon Nov 10 17:55:25 2014
+++ src/sys/arch/arm/allwinner/awin_tcon.c Tue Nov 11 19:22:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_tcon.c,v 1.3 2014/11/10 17:55:25 jmcneill Exp $ */
+/* $NetBSD: awin_tcon.c,v 1.4 2014/11/11 19:22:32 jmcneill Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -26,10 +26,10 @@
* SUCH DAMAGE.
*/
-//#define AWIN_TCON_DEBUG
+#include "opt_allwinner.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_tcon.c,v 1.3 2014/11/10 17:55:25 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_tcon.c,v 1.4 2014/11/11 19:22:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/allwinner/awin_hdmi.c
diff -u src/sys/arch/arm/allwinner/awin_hdmi.c:1.8 src/sys/arch/arm/allwinner/awin_hdmi.c:1.9
--- src/sys/arch/arm/allwinner/awin_hdmi.c:1.8 Tue Nov 11 17:27:12 2014
+++ src/sys/arch/arm/allwinner/awin_hdmi.c Tue Nov 11 19:22:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_hdmi.c,v 1.8 2014/11/11 17:27:12 jmcneill Exp $ */
+/* $NetBSD: awin_hdmi.c,v 1.9 2014/11/11 19:22:32 jmcneill Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -26,14 +26,13 @@
* SUCH DAMAGE.
*/
-//#define AWIN_HDMI_DEBUG
-
+#include "opt_allwinner.h"
#include "opt_ddb.h"
#define AWIN_HDMI_PLL 3 /* PLL7 or PLL3 */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_hdmi.c,v 1.8 2014/11/11 17:27:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_hdmi.c,v 1.9 2014/11/11 19:22:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/allwinner/files.awin
diff -u src/sys/arch/arm/allwinner/files.awin:1.24 src/sys/arch/arm/allwinner/files.awin:1.25
--- src/sys/arch/arm/allwinner/files.awin:1.24 Tue Nov 11 17:00:59 2014
+++ src/sys/arch/arm/allwinner/files.awin Tue Nov 11 19:22:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.awin,v 1.24 2014/11/11 17:00:59 jmcneill Exp $
+# $NetBSD: files.awin,v 1.25 2014/11/11 19:22:32 jmcneill Exp $
#
# Configuration info for Allwinner ARM Peripherals
#
@@ -28,6 +28,10 @@ defflag opt_allwinner.h ALLWINNER_A20
defflag opt_allwinner.h ALLWINNER_A31
defflag opt_allwinner.h ALLWINNER_A80
defflag opt_allwinner.h AWIN_GPIO_IGNORE_FW
+defflag opt_allwinner.h AWIN_HDMI_DEBUG
+defflag opt_allwinner.h AWIN_TCON_DEBUG
+defflag opt_allwinner.h AWIN_DEBE_DEBUG
+defparam opt_allwinner.h AWIN_DEBE_VIDEOMEM
# SoC I/O attach point
device awinio { [port=-1] } : bus_space_generic
