Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/i2c drm: Use CPPFLAGS.drmkms in all local drm driver...
details: https://anonhg.NetBSD.org/src/rev/c37e014354a7
branches: trunk
changeset: 368583:c37e014354a7
user: riastradh <riastradh%NetBSD.org@localhost>
date: Wed Jul 20 10:01:10 2022 +0000
description:
drm: Use CPPFLAGS.drmkms in all local drm drivers too.
This way we don't pollute the NetBSD kernel namespace with all the
Linux compat shim definitions needed to build drm, except for the
local drm drivers that need the API.
diffstat:
sys/arch/arm/nxp/files.imx | 3 ++-
sys/arch/arm/rockchip/files.rockchip | 9 +++++++--
sys/arch/arm/sunxi/files.sunxi | 7 ++++++-
sys/arch/arm/ti/files.ti | 4 +++-
sys/conf/files | 4 +++-
sys/dev/fdt/files.fdt | 4 +++-
sys/dev/i2c/files.i2c | 4 +++-
7 files changed, 27 insertions(+), 8 deletions(-)
diffs (189 lines):
diff -r 8f9dbba2d2d7 -r c37e014354a7 sys/arch/arm/nxp/files.imx
--- a/sys/arch/arm/nxp/files.imx Wed Jul 20 10:01:01 2022 +0000
+++ b/sys/arch/arm/nxp/files.imx Wed Jul 20 10:01:10 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx,v 1.1 2020/12/23 14:42:38 skrll Exp $
+# $NetBSD: files.imx,v 1.2 2022/07/20 10:01:10 riastradh Exp $
#
# Configuration info for the Freescale i.MX6
#
@@ -150,3 +150,4 @@
# HDMI TX (Designware based)
attach dwhdmi at fdt with imx6_dwhdmi
file arch/arm/nxp/imx6_dwhdmi.c imx6_dwhdmi
+makeoptions imx6_dwhdmi "CPPFLAGS.imx6_dwhdmi"+="${CPPFLAGS.drmkms}"
diff -r 8f9dbba2d2d7 -r c37e014354a7 sys/arch/arm/rockchip/files.rockchip
--- a/sys/arch/arm/rockchip/files.rockchip Wed Jul 20 10:01:01 2022 +0000
+++ b/sys/arch/arm/rockchip/files.rockchip Wed Jul 20 10:01:10 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.rockchip,v 1.25 2021/11/12 22:02:08 jmcneill Exp $
+# $NetBSD: files.rockchip,v 1.26 2022/07/20 10:01:11 riastradh Exp $
#
# Configuration info for Rockchip family SoCs
#
@@ -116,27 +116,32 @@
device rkdrm: drmkms, ddc_read_edid, rkfbbus
attach rkdrm at fdt with rk_drm
file arch/arm/rockchip/rk_drm.c rk_drm
+makeoptions rk_drm "CPPFLAGS.rk_drm"+="${CPPFLAGS.drmkms}"
# DRM framebuffer console
device rkfb: rkfbbus, drmfb, wsemuldisplaydev
attach rkfb at rkfbbus with rk_fb
file arch/arm/rockchip/rk_fb.c rk_fb
+makeoptions rk_fb "CPPFLAGS.rk_fb"+="${CPPFLAGS.drmkms}"
# Visual Output Processor
device rkvop: drmkms
attach rkvop at fdt with rk_vop
file arch/arm/rockchip/rk_vop.c rk_vop
+makeoptions rk_vop "CPPFLAGS.rk_vop"+="${CPPFLAGS.drmkms}"
# HDMI TX (Designware based)
attach dwhdmi at fdt with rk_dwhdmi
file arch/arm/rockchip/rk_dwhdmi.c rk_dwhdmi
+makeoptions rk_dwhdmi "CPPFLAGS.rk_dwhdmi"+="${CPPFLAGS.drmkms}"
# DP/eDP (Analogix-based)
attach anxdp at fdt with rk_anxdp
file arch/arm/rockchip/rk_anxdp.c rk_anxdp
+makeoptions rk_anxdp "CPPFLAGS.rk_anxdp"+="${CPPFLAGS.drmkms}"
# I2S/PCM controller
-device rki2s
+device rki2s
attach rki2s at fdt with rk_i2s
file arch/arm/rockchip/rk_i2s.c rk_i2s
diff -r 8f9dbba2d2d7 -r c37e014354a7 sys/arch/arm/sunxi/files.sunxi
--- a/sys/arch/arm/sunxi/files.sunxi Wed Jul 20 10:01:01 2022 +0000
+++ b/sys/arch/arm/sunxi/files.sunxi Wed Jul 20 10:01:10 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.sunxi,v 1.71 2022/06/28 05:19:03 skrll Exp $
+# $NetBSD: files.sunxi,v 1.72 2022/07/20 10:01:11 riastradh Exp $
#
# Configuration info for Allwinner sunxi family SoCs
#
@@ -342,26 +342,31 @@
device sunximixer: drmkms
attach sunximixer at fdt with sunxi_mixer
file arch/arm/sunxi/sunxi_mixer.c sunxi_mixer
+makeoptions sunxi_mixer "CPPFLAGS.sunxi_mixer"+="${CPPFLAGS.drmkms}"
# DE2 timing controller
device sunxilcdc: drmkms
attach sunxilcdc at fdt with sunxi_lcdc
file arch/arm/sunxi/sunxi_lcdc.c sunxi_lcdc
+makeoptions sunxi_lcdc "CPPFLAGS.sunxi_lcdc"+="${CPPFLAGS.drmkms}"
# Display Pipeline
define sunxifbbus { }
device sunxidrm: drmkms, ddc_read_edid, sunxifbbus
attach sunxidrm at fdt with sunxi_drm
file arch/arm/sunxi/sunxi_drm.c sunxi_drm
+makeoptions sunxi_drm "CPPFLAGS.sunxi_drm"+="${CPPFLAGS.drmkms}"
# DRM framebuffer console
device sunxifb: sunxifbbus, drmfb, wsemuldisplaydev
attach sunxifb at sunxifbbus with sunxi_fb
file arch/arm/sunxi/sunxi_fb.c sunxi_fb
+makeoptions sunxi_fb "CPPFLAGS.sunxi_fb"+="${CPPFLAGS.drmkms}"
# Allwinner HDMI (Designware based)
attach dwhdmi at fdt with sunxi_dwhdmi
file arch/arm/sunxi/sunxi_dwhdmi.c sunxi_dwhdmi
+makeoptions sunxi_dwhdmi "CPPFLAGS.sunxi_dwhdmi"+="${CPPFLAGS.drmkms}"
# Allwinner HDMI TX PHY
device sunxihdmiphy: drmkms
diff -r 8f9dbba2d2d7 -r c37e014354a7 sys/arch/arm/ti/files.ti
--- a/sys/arch/arm/ti/files.ti Wed Jul 20 10:01:01 2022 +0000
+++ b/sys/arch/arm/ti/files.ti Wed Jul 20 10:01:10 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.ti,v 1.21 2019/11/29 20:54:00 jmcneill Exp $
+# $NetBSD: files.ti,v 1.22 2022/07/20 10:01:11 riastradh Exp $
#
file arch/arm/ti/ti_cpufreq.c soc_ti
@@ -116,10 +116,12 @@
device tilcdc: drmkms, tilcdcfbbus
attach tilcdc at fdt with ti_lcdc
file arch/arm/ti/ti_lcdc.c ti_lcdc
+makeoptions ti_lcdc "CPPFLAGS.ti_lcdc"+="${CPPFLAGS.drmkms}"
device tifb: tilcdcfbbus, drmfb, wsemuldisplaydev
attach tifb at tilcdcfbbus with ti_fb
file arch/arm/ti/ti_fb.c ti_fb
+makeoptions ti_fb "CPPFLAGS.ti_fb"+="${CPPFLAGS.drmkms}"
# Memory controller
device tigpmc { } : fdt
diff -r 8f9dbba2d2d7 -r c37e014354a7 sys/conf/files
--- a/sys/conf/files Wed Jul 20 10:01:01 2022 +0000
+++ b/sys/conf/files Wed Jul 20 10:01:10 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1298 2022/06/05 13:35:52 rjs Exp $
+# $NetBSD: files,v 1.1299 2022/07/20 10:01:11 riastradh Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1514,10 +1514,12 @@
device dwhdmi: edid, videomode, drmkms, drmkms_i2c, ddc_read_edid
file dev/ic/dw_hdmi.c dwhdmi
file dev/ic/dw_hdmi_phy.c dwhdmi
+makeoptions dwhdmi "CPPFLAGS.dwhdmi"+="${CPPFLAGS.drmkms}"
# Analogix DisplayPort
device anxdp: edid, videomode, drmkms, drmkms_i2c
file dev/ic/anx_dp.c anxdp
+makeoptions anxdp "CPPFLAGS.anxdp"+="${CPPFLAGS.drmkms}"
# Broadcom GENET v5 ethernet
device genet: arp, ether, ifnet, mii
diff -r 8f9dbba2d2d7 -r c37e014354a7 sys/dev/fdt/files.fdt
--- a/sys/dev/fdt/files.fdt Wed Jul 20 10:01:01 2022 +0000
+++ b/sys/dev/fdt/files.fdt Wed Jul 20 10:01:10 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.64 2022/03/25 21:23:51 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.65 2022/07/20 10:01:11 riastradh Exp $
include "external/bsd/libfdt/conf/files.libfdt"
@@ -55,10 +55,12 @@
attach panel at fdt with panel_fdt: drmkms
file dev/fdt/fdt_panel.c panel_fdt
+makeoptions panel_fdt "CPPFLAGS.panel_fdt"+="${CPPFLAGS.drmkms}"
device dispcon: fdt_port, drmkms, ddc_read_edid
attach dispcon at fdt with dispcon_hdmi
file dev/fdt/hdmi_connector.c dispcon_hdmi
+makeoptions dispcon_hdmi "CPPFLAGS.dispcon_hdmi"+="${CPPFLAGS.drmkms}"
device iicmux: i2cbus, i2cmux
attach iicmux at fdt with iicmux_fdt
diff -r 8f9dbba2d2d7 -r c37e014354a7 sys/dev/i2c/files.i2c
--- a/sys/dev/i2c/files.i2c Wed Jul 20 10:01:01 2022 +0000
+++ b/sys/dev/i2c/files.i2c Wed Jul 20 10:01:10 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.i2c,v 1.122 2022/01/17 16:31:23 thorpej Exp $
+# $NetBSD: files.i2c,v 1.123 2022/07/20 10:01:11 riastradh Exp $
obsolete defflag opt_i2cbus.h I2C_SCAN
define i2cbus { }
@@ -368,6 +368,7 @@
device anxedp: edid, videomode, drmkms, drmkms_i2c
attach anxedp at iic
file dev/i2c/anxedp.c anxedp
+makeoptions anxedp "CPPFLAGS.anxedp"+="${CPPFLAGS.drmkms}"
# NXP PCA954x / PCA984x I2C switch / mux controllers
device pcaiicmux: i2cbus, i2cmux
@@ -388,6 +389,7 @@
device tdahdmi: edid, videomode, drmkms, drmkms_i2c
attach tdahdmi at iic
file dev/i2c/tda19988.c tdahdmi
+makeoptions tdahdmi "CPPFLAGS.tdahdmi"+="${CPPFLAGS.drmkms}"
# Everest Semi ES8316 Low Power Audio CODEC
device es8316ac
Home |
Main Index |
Thread Index |
Old Index