diff options
| -rw-r--r-- | configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI (renamed from configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI) | 0 | ||||
| -rw-r--r-- | configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC | 1 | ||||
| -rw-r--r-- | configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC | 1 | ||||
| -rw-r--r-- | filter-aarch64.sh | 2 | ||||
| -rw-r--r-- | filter-armv7hl.sh | 2 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-aarch64.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 2 |
11 files changed, 11 insertions, 7 deletions
diff --git a/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI b/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI index cda1f60f8..cda1f60f8 100644 --- a/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI +++ b/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI diff --git a/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC b/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC new file mode 100644 index 000000000..146d9409f --- /dev/null +++ b/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC @@ -0,0 +1 @@ +CONFIG_DRM_SUN4I_HDMI_CEC=y diff --git a/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC b/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC deleted file mode 100644 index 8ba73409c..000000000 --- a/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DRM_SUN4I_HDMI_CEC is not set diff --git a/filter-aarch64.sh b/filter-aarch64.sh index d45da673f..4ca60946f 100644 --- a/filter-aarch64.sh +++ b/filter-aarch64.sh @@ -13,6 +13,6 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds medi ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom" -drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel radeon rockchip tegra sun4i tinydrm vc4" +drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel radeon rockchip tegra sun4i sun4i-drm-hdmi tinydrm vc4" singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr" diff --git a/filter-armv7hl.sh b/filter-armv7hl.sh index 254893398..c08e03d12 100644 --- a/filter-armv7hl.sh +++ b/filter-armv7hl.sh @@ -13,6 +13,6 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn media mem ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco dec dlink emulex icplus mellanox micrel myricom natsemi neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis sun tehuti via wiznet xircom" -drmdrvs="amd armada bridge ast exynos etnaviv hisilicon i2c imx meson mgag200 msm omapdrm panel nouveau radeon rockchip sti sun4i tegra tilcdc tinydrm via vc4" +drmdrvs="amd armada bridge ast exynos etnaviv hisilicon i2c imx meson mgag200 msm omapdrm panel nouveau radeon rockchip sti sun4i sun4i-drm-hdmi tegra tilcdc tinydrm via vc4" singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr bq27xxx_battery_hdq" diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index e4bedf60c..a768e3f31 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1354,6 +1354,8 @@ CONFIG_DRM_SII9234=m # CONFIG_DRM_SIL_SII8620 is not set # CONFIG_DRM_SIS is not set # CONFIG_DRM_STM is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y +CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN8I_MIXER=m # CONFIG_DRM_TDFX is not set # CONFIG_DRM_TEGRA_DEBUG is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index bd03697d9..80aa2053f 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1344,6 +1344,8 @@ CONFIG_DRM_SII9234=m # CONFIG_DRM_SIL_SII8620 is not set # CONFIG_DRM_SIS is not set # CONFIG_DRM_STM is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y +CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN8I_MIXER=m # CONFIG_DRM_TDFX is not set # CONFIG_DRM_TEGRA_DEBUG is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 600b1698a..8d992f0e8 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1459,7 +1459,7 @@ CONFIG_DRM_SII9234=m CONFIG_DRM_STI=m # CONFIG_DRM_STM is not set CONFIG_DRM_SUN4I_BACKEND=m -# CONFIG_DRM_SUN4I_HDMI_CEC is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN8I_MIXER=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index bb0f94746..59368635f 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1373,7 +1373,7 @@ CONFIG_DRM_SII9234=m CONFIG_DRM_STI=m # CONFIG_DRM_STM is not set CONFIG_DRM_SUN4I_BACKEND=m -# CONFIG_DRM_SUN4I_HDMI_CEC is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN8I_MIXER=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 518c3cee6..ec8c09176 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1363,7 +1363,7 @@ CONFIG_DRM_SII9234=m CONFIG_DRM_STI=m # CONFIG_DRM_STM is not set CONFIG_DRM_SUN4I_BACKEND=m -# CONFIG_DRM_SUN4I_HDMI_CEC is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN8I_MIXER=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 52aa4bc45..999575d74 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1449,7 +1449,7 @@ CONFIG_DRM_SII9234=m CONFIG_DRM_STI=m # CONFIG_DRM_STM is not set CONFIG_DRM_SUN4I_BACKEND=m -# CONFIG_DRM_SUN4I_HDMI_CEC is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN8I_MIXER=m |