Delete redundant CONFIG_DRM_ARM, and add a menu "ARM devices" to subclass
ARM device drivers.
Signed-off-by: James (Qian) Wang <[email protected]>
---
drivers/gpu/drm/Makefile | 2 +-
drivers/gpu/drm/arm/Kconfig | 10 ++++------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 1fafc2f8e8f9..0df0a5a4cc82 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -51,7 +51,7 @@ obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/
obj-$(CONFIG_DRM) += drm.o
obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o
obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o
-obj-$(CONFIG_DRM_ARM) += arm/
+obj-y += arm/
obj-$(CONFIG_DRM_TTM) += ttm/
obj-$(CONFIG_DRM_SCHED) += scheduler/
obj-$(CONFIG_DRM_TDFX) += tdfx/
diff --git a/drivers/gpu/drm/arm/Kconfig b/drivers/gpu/drm/arm/Kconfig
index 9a18e1bd57b4..f9f7761cb2f4 100644
--- a/drivers/gpu/drm/arm/Kconfig
+++ b/drivers/gpu/drm/arm/Kconfig
@@ -1,13 +1,10 @@
-config DRM_ARM
- bool
- help
- Choose this option to select drivers for ARM's devices
+# SPDX-License-Identifier: GPL-2.0
+menu "ARM devices"
config DRM_HDLCD
tristate "ARM HDLCD"
depends on DRM && OF && (ARM || ARM64)
depends on COMMON_CLK
- select DRM_ARM
select DRM_KMS_HELPER
select DRM_KMS_CMA_HELPER
help
@@ -29,7 +26,6 @@ config DRM_MALI_DISPLAY
tristate "ARM Mali Display Processor"
depends on DRM && OF && (ARM || ARM64)
depends on COMMON_CLK
- select DRM_ARM
select DRM_KMS_HELPER
select DRM_KMS_CMA_HELPER
select DRM_GEM_CMA_HELPER
@@ -40,3 +36,5 @@ config DRM_MALI_DISPLAY
of the hardware.
If compiled as a module it will be called mali-dp.
+
+endmenu
--
2.17.1
Hi James,
On Wed, Dec 05, 2018 at 03:41:35AM +0000, james qian wang (Arm Technology China) wrote:
> Delete redundant CONFIG_DRM_ARM, and add a menu "ARM devices" to subclass
> ARM device drivers.
>
> Signed-off-by: James (Qian) Wang <[email protected]>
Reviewed-by: Alexandru Gheorghe <[email protected]>
> ---
> drivers/gpu/drm/Makefile | 2 +-
> drivers/gpu/drm/arm/Kconfig | 10 ++++------
> 2 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
> index 1fafc2f8e8f9..0df0a5a4cc82 100644
> --- a/drivers/gpu/drm/Makefile
> +++ b/drivers/gpu/drm/Makefile
> @@ -51,7 +51,7 @@ obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/
> obj-$(CONFIG_DRM) += drm.o
> obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o
> obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o
> -obj-$(CONFIG_DRM_ARM) += arm/
> +obj-y += arm/
> obj-$(CONFIG_DRM_TTM) += ttm/
> obj-$(CONFIG_DRM_SCHED) += scheduler/
> obj-$(CONFIG_DRM_TDFX) += tdfx/
> diff --git a/drivers/gpu/drm/arm/Kconfig b/drivers/gpu/drm/arm/Kconfig
> index 9a18e1bd57b4..f9f7761cb2f4 100644
> --- a/drivers/gpu/drm/arm/Kconfig
> +++ b/drivers/gpu/drm/arm/Kconfig
> @@ -1,13 +1,10 @@
> -config DRM_ARM
> - bool
> - help
> - Choose this option to select drivers for ARM's devices
> +# SPDX-License-Identifier: GPL-2.0
> +menu "ARM devices"
>
> config DRM_HDLCD
> tristate "ARM HDLCD"
> depends on DRM && OF && (ARM || ARM64)
> depends on COMMON_CLK
> - select DRM_ARM
> select DRM_KMS_HELPER
> select DRM_KMS_CMA_HELPER
> help
> @@ -29,7 +26,6 @@ config DRM_MALI_DISPLAY
> tristate "ARM Mali Display Processor"
> depends on DRM && OF && (ARM || ARM64)
> depends on COMMON_CLK
> - select DRM_ARM
> select DRM_KMS_HELPER
> select DRM_KMS_CMA_HELPER
> select DRM_GEM_CMA_HELPER
> @@ -40,3 +36,5 @@ config DRM_MALI_DISPLAY
> of the hardware.
>
> If compiled as a module it will be called mali-dp.
> +
> +endmenu
> --
> 2.17.1
--
Cheers,
Alex G