Merge "Video: Driver: Add support for volcano upstream"
Este cometimento está contido em:

cometido por
Gerrit - the friendly Code Review server

cometimento
5e9e0583cb
1691
driver/platform/volcano/src/volcano.c
Ficheiro normal
1691
driver/platform/volcano/src/volcano.c
Ficheiro normal
A apresentação das diferenças no ficheiro foi suprimida por ser demasiado grande
Carregar diff
11
video/Kbuild
11
video/Kbuild
@@ -13,6 +13,11 @@ LINUXINCLUDE += -I$(VIDEO_DRIVER_ABS_PATH)/platform/pineapple/inc \
|
||||
-I$(VIDEO_DRIVER_ABS_PATH)/variant/iris33/inc
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_MSM_VIDC_VOLCANO), y)
|
||||
LINUXINCLUDE += -I$(VIDEO_DRIVER_ABS_PATH)/platform/volcano/inc \
|
||||
-I$(VIDEO_DRIVER_ABS_PATH)/variant/iris2/inc
|
||||
endif
|
||||
|
||||
LINUXINCLUDE += -I$(VIDEO_DRIVER_ABS_PATH)/platform/common/inc \
|
||||
-I$(VIDEO_DRIVER_ABS_PATH)/variant/common/inc \
|
||||
-I$(VIDEO_DRIVER_ABS_PATH)/vidc/inc \
|
||||
@@ -31,6 +36,12 @@ video-objs += $(VIDEO_DRIVER_REL_PATH)/platform/pineapple/src/pineapple.o \
|
||||
$(VIDEO_DRIVER_REL_PATH)/variant/iris33/src/msm_vidc_clock_iris33.o \
|
||||
$(VIDEO_DRIVER_REL_PATH)/variant/iris33/src/msm_vidc_iris33.o
|
||||
endif
|
||||
ifeq ($(CONFIG_MSM_VIDC_VOLCANO), y)
|
||||
video-objs += $(VIDEO_DRIVER_REL_PATH)/variant/iris2/src/msm_vidc_buffer_iris2.o \
|
||||
$(VIDEO_DRIVER_REL_PATH)/variant/iris2/src/msm_vidc_iris2.o \
|
||||
$(VIDEO_DRIVER_REL_PATH)/variant/iris2/src/msm_vidc_power_iris2.o \
|
||||
$(VIDEO_DRIVER_REL_PATH)/platform/volcano/src/volcano.o
|
||||
endif
|
||||
video-objs += $(VIDEO_DRIVER_REL_PATH)/platform/common/src/msm_vidc_platform.o \
|
||||
$(VIDEO_DRIVER_REL_PATH)/variant/common/src/msm_vidc_variant.o \
|
||||
$(VIDEO_DRIVER_REL_PATH)/vidc/src/msm_vidc_v4l2.o \
|
||||
|
@@ -93,5 +93,11 @@ module_entry(
|
||||
"driver/variant/iris33/src/msm_vidc_clock_iris33.c",
|
||||
"driver/variant/iris33/src/msm_vidc_iris33.c",
|
||||
],
|
||||
"CONFIG_MSM_VIDC_VOLCANO" : [
|
||||
"driver/variant/iris2/src/msm_vidc_buffer_iris2.c",
|
||||
"driver/variant/iris2/src/msm_vidc_iris2.c",
|
||||
"driver/variant/iris2/src/msm_vidc_power_iris2.c",
|
||||
"driver/platform/volcano/src/volcano.c",
|
||||
],
|
||||
}
|
||||
)
|
||||
|
Criar uma nova questão referindo esta
Bloquear um utilizador