From f5d51dcdc98fdbb957d6e79f25b0ed54faf003d1 Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill@NetBSD.org>
Date: Tue, 11 Nov 2014 19:22:32 +0000
Subject: [PATCH] defflag AWIN_HDMI_DEBUG, AWIN_TCON_DEBUG, AWIN_DEBE_DEBUG,
 and defparam AWIN_DEBE_VIDEOMEM

---
 sys/arch/arm/allwinner/awin_debe.c | 9 +++++----
 sys/arch/arm/allwinner/awin_hdmi.c | 7 +++----
 sys/arch/arm/allwinner/awin_tcon.c | 6 +++---
 sys/arch/arm/allwinner/files.awin  | 6 +++++-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/sys/arch/arm/allwinner/awin_debe.c b/sys/arch/arm/allwinner/awin_debe.c
index cdd4ca5620c8..b7c6545a70d7 100644
--- a/sys/arch/arm/allwinner/awin_debe.c
+++ b/sys/arch/arm/allwinner/awin_debe.c
@@ -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 <jmcneill@invisible.ca>
@@ -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>
diff --git a/sys/arch/arm/allwinner/awin_hdmi.c b/sys/arch/arm/allwinner/awin_hdmi.c
index 50f3dcd08a18..1d09d0c277a9 100644
--- a/sys/arch/arm/allwinner/awin_hdmi.c
+++ b/sys/arch/arm/allwinner/awin_hdmi.c
@@ -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 <jmcneill@invisible.ca>
@@ -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>
diff --git a/sys/arch/arm/allwinner/awin_tcon.c b/sys/arch/arm/allwinner/awin_tcon.c
index 9306629142b2..2d5cb0fa5707 100644
--- a/sys/arch/arm/allwinner/awin_tcon.c
+++ b/sys/arch/arm/allwinner/awin_tcon.c
@@ -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 <jmcneill@invisible.ca>
@@ -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>
diff --git a/sys/arch/arm/allwinner/files.awin b/sys/arch/arm/allwinner/files.awin
index 5f962b940f24..735acbc72e1a 100644
--- a/sys/arch/arm/allwinner/files.awin
+++ b/sys/arch/arm/allwinner/files.awin
@@ -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