Commit 2aa38496 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: atomisp: unify ia_css_isp_params.c

The contents of ia_css_isp_params.c is almost identical for
2400 and 2401. The only difference is that, on 2400, there
are some duplicated assignments. So, drop it, unifying this
file.

While here, simplify the Makefile's logic by dropping an
unused define.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 3a9559d8
...@@ -55,6 +55,7 @@ atomisp-objs += \ ...@@ -55,6 +55,7 @@ atomisp-objs += \
pci/ia_css_device_access.o \ pci/ia_css_device_access.o \
pci/ia_css_isp_configs.o \ pci/ia_css_isp_configs.o \
pci/ia_css_isp_states.o \ pci/ia_css_isp_states.o \
pci/ia_css_isp_params.o \
pci/isp/kernels/aa/aa_2/ia_css_aa2.host.o \ pci/isp/kernels/aa/aa_2/ia_css_aa2.host.o \
pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.o \ pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.o \
pci/isp/kernels/anr/anr_2/ia_css_anr2.host.o \ pci/isp/kernels/anr/anr_2/ia_css_anr2.host.o \
...@@ -156,17 +157,13 @@ atomisp-objs += \ ...@@ -156,17 +157,13 @@ atomisp-objs += \
pci/hive_isp_css_common/host/timed_ctrl.o \ pci/hive_isp_css_common/host/timed_ctrl.o \
pci/hive_isp_css_common/host/vmem.o \ pci/hive_isp_css_common/host/vmem.o \
pci/hive_isp_css_shared/host/tag.o \ pci/hive_isp_css_shared/host/tag.o \
pci/system_local.o \ pci/system_local.o
obj-byt = \
pci/css_2400_system/hive/ia_css_isp_params.o
# These will be needed when clean merge CHT support nicely into the driver # These will be needed when clean merge CHT support nicely into the driver
# Keep them here handy for when we get to that point # Keep them here handy for when we get to that point
# #
obj-cht = \ obj-cht = \
pci/css_2401_system/hive/ia_css_isp_params.o \
pci/css_2401_system/host/csi_rx.o \ pci/css_2401_system/host/csi_rx.o \
pci/css_2401_system/host/ibuf_ctrl.o \ pci/css_2401_system/host/ibuf_ctrl.o \
pci/css_2401_system/host/isys_dma.o \ pci/css_2401_system/host/isys_dma.o \
...@@ -322,10 +319,7 @@ ifeq ($(CONFIG_VIDEO_ATOMISP_ISP2401),y) ...@@ -322,10 +319,7 @@ ifeq ($(CONFIG_VIDEO_ATOMISP_ISP2401),y)
atomisp-objs += \ atomisp-objs += \
$(obj-cht) \ $(obj-cht) \
pci/runtime/isys/src/ibuf_ctrl_rmgr.o pci/runtime/isys/src/ibuf_ctrl_rmgr.o
DEFINES += -DISP2401 -DISP2401_NEW_INPUT_SYSTEM -DSYSTEM_hive_isp_css_2401_system DEFINES += -DISP2401 -DISP2401_NEW_INPUT_SYSTEM
else
atomisp-objs += $(obj-byt)
DEFINES += -DISP2400 -DSYSTEM_hive_isp_css_2400_system
endif endif
ccflags-y += $(INCLUDES) $(DEFINES) -fno-common ccflags-y += $(INCLUDES) $(DEFINES) -fno-common
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment