drm/omap: move omapdss & displays under omapdrm

Now that omapfb has its own copy of omapdss and display drivers, we can
move omapdss and display drivers which omapdrm uses to omapdrm's
directory.

We also need to change the main drm Makefile so that omapdrm directory
is always entered, because omapdss has a file that can't be built as a
module.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Tomi Valkeinen 2015-12-09 20:26:00 +02:00
parent 5ca28914b8
commit 9960aa7cb5
61 changed files with 6 additions and 6 deletions

View File

@ -62,7 +62,7 @@ obj-$(CONFIG_DRM_ARMADA) += armada/
obj-$(CONFIG_DRM_ATMEL_HLCDC) += atmel-hlcdc/
obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
obj-$(CONFIG_DRM_OMAP) += omapdrm/
obj-y += omapdrm/
obj-y += tilcdc/
obj-$(CONFIG_DRM_QXL) += qxl/
obj-$(CONFIG_DRM_BOCHS) += bochs/

View File

@ -1,4 +1,3 @@
config DRM_OMAP
tristate "OMAP DRM"
depends on DRM
@ -24,3 +23,5 @@ config DRM_OMAP_NUM_CRTCS
Select the number of video overlays which can be used as framebuffers.
The remaining overlays are reserved for video.
source "drivers/gpu/drm/omapdrm/dss/Kconfig"
source "drivers/gpu/drm/omapdrm/displays/Kconfig"

View File

@ -3,6 +3,9 @@
# Direct Rendering Infrastructure (DRI)
#
obj-y += dss/
obj-y += displays/
ccflags-y := -Iinclude/drm -Werror
omapdrm-y := omap_drv.o \
omap_irq.o \

View File

@ -1,7 +1,5 @@
if ARCH_OMAP2PLUS
source "drivers/video/fbdev/omap2/dss/Kconfig"
source "drivers/video/fbdev/omap2/omapfb/Kconfig"
source "drivers/video/fbdev/omap2/displays-new/Kconfig"
endif

View File

@ -1,3 +1 @@
obj-y += dss/
obj-y += displays-new/
obj-y += omapfb/