diff options
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/Makefile | 1 | ||||
| -rwxr-xr-x | drivers/gpu/drm/emgd/Makefile | 40 |
3 files changed, 14 insertions, 36 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index e354bc0b052a..8453304c6973 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -179,6 +179,15 @@ config DRM_SAVAGE Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister chipset. If M is selected the module will be called savage. +config DRM_EGD + tristate "Intel EMGD" + depends on DRM + select DRM_KMS_HELPER + help + Choose this option if you have an EMGD-supported chipset + (Intel E6xx or System Controller Hub US15W/US15WP/WPT). + If M is selected the module will be called emgd. + source "drivers/gpu/drm/exynos/Kconfig" source "drivers/gpu/drm/vmwgfx/Kconfig" diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index c20da5bda355..b15becd4ab2e 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -42,4 +42,5 @@ obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ obj-$(CONFIG_DRM_EXYNOS) +=exynos/ obj-$(CONFIG_DRM_GMA500) += gma500/ obj-$(CONFIG_DRM_UDL) += udl/ +obj-$(CONFIG_DRM_EGD) +=emgd/ obj-y += i2c/ diff --git a/drivers/gpu/drm/emgd/Makefile b/drivers/gpu/drm/emgd/Makefile index 18d87fc610c0..56ff3f654b3e 100755 --- a/drivers/gpu/drm/emgd/Makefile +++ b/drivers/gpu/drm/emgd/Makefile @@ -24,10 +24,6 @@ #---------------------------------------------------------------------------- export EGD_TOPLEVEL = DRM Driver -KERNELVER ?= $(shell uname -r) -KERNELDIR ?= /lib/modules/$(KERNELVER)/build -INSTALLDIR ?= /lib/modules/$(KERNELVER)/kernel/drivers/gpu/drm/emgd - BLUE = \033[34m OFF = \033[0m BUILD ?= release @@ -35,7 +31,7 @@ CONFIG_PVR_RELEASE ?= $(BUILD) CONFIG_DRM_EGD ?= m # Get the include paths pointed to the right place. -export EMGD_MOD_DIR ?= $(CURDIR) +export EMGD_MOD_DIR ?= $(obj) BUILDDATE ?= $(shell date +%Y%m%d) @@ -51,6 +47,7 @@ PROJECT_INCLUDES = \ -I$(EMGD_MOD_DIR)/emgd/pal/ch7036 \ -I$(EMGD_MOD_DIR)/emgd/drm \ -I$(KERNELDIR)/include/drm \ + -Iinclude/drm \ -I/usr/src/linux-headers-2.6.32-5-common/include/drm \ -I$(EMGD_MOD_DIR)/pvr/include4 \ -I$(EMGD_MOD_DIR)/pvr/services4/include \ @@ -120,6 +117,8 @@ ifeq ($(PDUMP),1) EXTRA_CFLAGS += -DPDUMP=1 endif +ccflags-y += $(EXTRA_CFLAGS) + EMGD_OBJS := \ emgd/drm/emgd_fb.o \ emgd/drm/emgd_fbcon.o \ @@ -298,34 +297,3 @@ ifeq ($(PDUMP),1) endif obj-$(CONFIG_DRM_EGD) += emgd.o - -all:: clean modules - -modules:: - @echo $(CURDIR) -- $(CONFIG_PVR_RELEASE) - @echo "$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules" - @$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules - -clean:: - @rm -f $(emgd-y) - @rm -f emgd.o emgd.mod.* emgd.ko Module.* modules.order - @find . -name "*.cmd" -exec rm '{}' \; - -install:: - install -o root -g root -m 755 -d $(INSTALLDIR) - install -o root -g root -m 744 emgd.ko $(INSTALLDIR) - /sbin/depmod -a - -uninstall:: - rmmod $(INSTALLDIR)/emgd.ko - rm -rf $(INSTALLDIR)/emgd.ko - /sbin/depmod -a - -debug:: - export CONFIG_PVR_RELEASE=debug; $(MAKE) modules - -package:: clean - @echo -e "$(BLUE)Packaging $(EGD_TOPLEVEL)$(OFF)"; - mkdir -p $(EGD_PKG) - tar -C $(EMGD_MOD_DIR) --exclude "CVS" -czf $(EGD_PKG)/emgd_drm.tgz * - |