diff options
| author | D. Andrei Măceș <dmaces@nd.edu> | 2016-12-08 14:16:52 -0500 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2017-02-06 21:33:24 +0000 |
| commit | 92aba978efeacc4744f49812f49e27bc2bb18b4a (patch) | |
| tree | 6529e807376524ce990284a26a68da112271ef10 | |
| parent | e820488b092837eb546233ada0ac6bb9d49b53c9 (diff) | |
| download | hardware_ti_omap4-92aba978efeacc4744f49812f49e27bc2bb18b4a.zip hardware_ti_omap4-92aba978efeacc4744f49812f49e27bc2bb18b4a.tar.gz hardware_ti_omap4-92aba978efeacc4744f49812f49e27bc2bb18b4a.tar.bz2 | |
SGX-BIN: build/srvkm: Drop SGX core/version suffixes everywhere
In preparation for commonizing KM build targets and init insmod.
Change-Id: If3d1a1c9a3510ea7ce4ab23c569c06ff5671a5ec
4 files changed, 8 insertions, 8 deletions
diff --git a/pvr-source/eurasiacon/build/linux2/config/core.mk b/pvr-source/eurasiacon/build/linux2/config/core.mk index 247d1e1..05a468b 100644 --- a/pvr-source/eurasiacon/build/linux2/config/core.mk +++ b/pvr-source/eurasiacon/build/linux2/config/core.mk @@ -178,7 +178,7 @@ $(call directory-must-exist,$(TOP)/eurasiacon/build/linux2/$(PVR_BUILD_DIR)) BUILD ?= release # TI: Added SGX type to binary build location so builds for different GPUs # with the same build directory are put in different places -OUT ?= $(TOP)/eurasiacon/binary2_$(SGXCORE)_$(SGX_CORE_REV)_$(PVR_BUILD_DIR)_$(BUILD) +OUT ?= $(TOP)/eurasiacon/binary2_$(PVR_BUILD_DIR)_$(BUILD) override OUT := $(if $(filter /%,$(OUT)),$(OUT),$(TOP)/$(OUT)) CONFIG_MK := $(OUT)/config.mk diff --git a/pvr-source/eurasiacon/build/linux2/kbuild/Makefile.template b/pvr-source/eurasiacon/build/linux2/kbuild/Makefile.template index 9d88941..09ce3dc 100644 --- a/pvr-source/eurasiacon/build/linux2/kbuild/Makefile.template +++ b/pvr-source/eurasiacon/build/linux2/kbuild/Makefile.template @@ -86,7 +86,7 @@ endif include $(INTERNAL_KBUILD_MAKEFILES) -$(if $(pvrsrvkm_sgx$(SGXCORE)_$(SGX_CORE_REV)-y),,$(error pvrsrvkm_sgx$(SGXCORE)_$(SGX_CORE_REV)-y was empty, which could mean that srvkm is missing from $$(KERNEL_COMPONENTS))) +$(if $(pvrsrvkm-y),,$(error pvrsrvkm-y was empty, which could mean that srvkm is missing from $$(KERNEL_COMPONENTS))) pvrsrvkm-y += $(foreach _m,$(INTERNAL_EXTRA_KBUILD_OBJECTS:.o=),$($(_m)-y)) obj-m += $(INTERNAL_KBUILD_OBJECTS) diff --git a/pvr-source/services4/srvkm/env/linux/Kbuild.mk b/pvr-source/services4/srvkm/env/linux/Kbuild.mk index 25e35e9..5801dfc 100644 --- a/pvr-source/services4/srvkm/env/linux/Kbuild.mk +++ b/pvr-source/services4/srvkm/env/linux/Kbuild.mk @@ -38,7 +38,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ### ########################################################################### -pvrsrvkm_sgx$(SGXCORE)_$(SGX_CORE_REV)-y += \ +pvrsrvkm-y += \ services4/srvkm/env/linux/osfunc.o \ services4/srvkm/env/linux/mutils.o \ services4/srvkm/env/linux/mmap.o \ @@ -75,9 +75,9 @@ pvrsrvkm_sgx$(SGXCORE)_$(SGX_CORE_REV)-y += \ services4/system/$(PVR_SYSTEM)/sysconfig.o \ services4/system/$(PVR_SYSTEM)/sysutils.o -pvrsrvkm_sgx$(SGXCORE)_$(SGX_CORE_REV)-$(CONFIG_ION_OMAP) += \ +pvrsrvkm-$(CONFIG_ION_OMAP) += \ services4/srvkm/env/linux/ion.o -pvrsrvkm_sgx$(SGXCORE)_$(SGX_CORE_REV)-$(CONFIG_GCBV) += \ +pvrsrvkm-$(CONFIG_GCBV) += \ services4/srvkm/env/linux/gc_bvmapping.o ifeq ($(SUPPORT_ION),1) @@ -127,7 +127,7 @@ endif # SUPPORT_SGX==1 only -pvrsrvkm_sgx$(SGXCORE)_$(SGX_CORE_REV)-y += \ +pvrsrvkm-y += \ services4/srvkm/bridged/sgx/bridged_sgx_bridge.o \ services4/srvkm/devices/sgx/sgxinit.o \ services4/srvkm/devices/sgx/sgxpower.o \ @@ -152,7 +152,7 @@ endif ifeq ($(SUPPORT_DRI_DRM),1) -pvrsrvkm_sgx$(SGXCORE)_$(SGX_CORE_REV)-y += \ +pvrsrvkm-y += \ services4/srvkm/env/linux/pvr_drm.o ccflags-y += \ diff --git a/pvr-source/services4/srvkm/env/linux/Linux.mk b/pvr-source/services4/srvkm/env/linux/Linux.mk index 7e3d0fb..535a1f9 100644 --- a/pvr-source/services4/srvkm/env/linux/Linux.mk +++ b/pvr-source/services4/srvkm/env/linux/Linux.mk @@ -41,5 +41,5 @@ modules := srvkm srvkm_type := kernel_module -srvkm_target := pvrsrvkm_sgx$(SGXCORE)_$(SGX_CORE_REV).ko +srvkm_target := pvrsrvkm.ko srvkm_makefile := $(THIS_DIR)/Kbuild.mk |