diff options
| -rw-r--r-- | usr/src/cmd/mdb/i915/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/mdb/i915/ia32/Makefile | 28 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/driver-graphics-agpgart.mf | 4 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/driver-graphics-drm.mf | 5 | ||||
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel | 4 |
5 files changed, 3 insertions, 40 deletions
diff --git a/usr/src/cmd/mdb/i915/Makefile b/usr/src/cmd/mdb/i915/Makefile index 732cc08..bf026f3 100644 --- a/usr/src/cmd/mdb/i915/Makefile +++ b/usr/src/cmd/mdb/i915/Makefile @@ -14,6 +14,6 @@ # include $(SRC)/Makefile.master -SUBDIRS = ia32 +SUBDIRS = $(BUILD64)SUBDIRS += $(MACH64) include ../Makefile.subdirs diff --git a/usr/src/cmd/mdb/i915/ia32/Makefile b/usr/src/cmd/mdb/i915/ia32/Makefile deleted file mode 100644 index 125c5b5..0000000 --- a/usr/src/cmd/mdb/i915/ia32/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright 2016 Joyent, Inc. -# - -MODULE = i915.so -MDBTGT = kvm - -MODSRCS = i915.c - -include ../../../Makefile.cmd -include ../../Makefile.ia32 -include ../../Makefile.module - -CPPFLAGS += -I$(SRC)/uts/intel/io/i915 -CPPFLAGS += -I$(SRC)/uts/common/io/drm -CPPFLAGS += -I$(SRC)/uts/common/drm -CPPFLAGS += -I$(SRC)/uts/common diff --git a/usr/src/pkg/manifests/driver-graphics-agpgart.mf b/usr/src/pkg/manifests/driver-graphics-agpgart.mf index 98200ee..353e166 100644 --- a/usr/src/pkg/manifests/driver-graphics-agpgart.mf +++ b/usr/src/pkg/manifests/driver-graphics-agpgart.mf @@ -88,12 +88,8 @@ driver name=amd64_gart alias=pci1022,1103 perms="* 0644 root sys" file path=kernel/drv/$(ARCH64)/$(ARCH64)_gart group=sys mode=0755 file path=kernel/drv/$(ARCH64)/agpgart group=sys mode=0755 file path=kernel/drv/$(ARCH64)/agptarget group=sys mode=0755 -file path=kernel/drv/$(ARCH64)_gart group=sys mode=0755 -file path=kernel/drv/agpgart group=sys mode=0755 file path=kernel/drv/agpgart.conf group=sys mode=0644 -file path=kernel/drv/agptarget group=sys mode=0755 file path=kernel/misc/$(ARCH64)/agpmaster group=sys mode=0755 -file path=kernel/misc/agpmaster group=sys mode=0755 file path=usr/share/man/man7i/agpgart_io.7i legacy pkg=SUNWagp desc="AGP GART driver for x86 workstations" \ name="AGP GART Driver" diff --git a/usr/src/pkg/manifests/driver-graphics-drm.mf b/usr/src/pkg/manifests/driver-graphics-drm.mf index 1a4ca44..b10812c 100644 --- a/usr/src/pkg/manifests/driver-graphics-drm.mf +++ b/usr/src/pkg/manifests/driver-graphics-drm.mf @@ -170,15 +170,10 @@ driver name=i915 perms="* 0644 root sys" \ alias=pci8086,f33 file path=kernel/drv/$(ARCH64)/i915 group=sys mode=0755 #file path=kernel/drv/$(ARCH64)/radeon group=sys mode=0755 -file path=kernel/drv/i915 group=sys mode=0755 -#file path=kernel/drv/radeon group=sys mode=0755 file path=kernel/kmdb/$(ARCH64)/i915 group=sys mode=0555 -file path=kernel/kmdb/i915 group=sys mode=0555 file path=kernel/misc/$(ARCH64)/drm group=sys mode=0755 -file path=kernel/misc/drm group=sys mode=0755 file path=usr/lib/devfsadm/linkmod/SUNW_drm_link_i386.so group=sys mode=0755 file path=usr/lib/mdb/kvm/$(ARCH64)/i915.so group=sys mode=0555 -file path=usr/lib/mdb/kvm/i915.so group=sys mode=0555 file path=usr/share/man/man7d/i915.7d #file path=usr/share/man/man7d/radeon.7d legacy pkg=SUNWdrmr desc="Direct Rendering Manager kernel drivers and modules" \ diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel index 609acd9..57f2ec6 100644 --- a/usr/src/uts/intel/Makefile.intel +++ b/usr/src/uts/intel/Makefile.intel @@ -103,8 +103,8 @@ MODSTUBS = $(UTSBASE)/intel/ia32/ml/modstubs.s # # Define supported builds # -DEF_BUILDS = $(DEF_BUILDS64) $(DEF_BUILDS32) -ALL_BUILDS = $(ALL_BUILDS64) $(ALL_BUILDS32) +DEF_BUILDS = $(DEF_BUILDS64) +ALL_BUILDS = $(ALL_BUILDS64) # # x86 or amd64 inline templates |