diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-05-01 14:17:21 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-05-20 12:32:20 +0200 |
| commit | 0057131fea6ddf9583baf9b7defa0ce2e51e9b7e (patch) | |
| tree | a68c124402d61628f2bb03b1b52982d9b9f59dc0 /drivers/staging/media/atomisp/Makefile | |
| parent | bbf3f7827ef5ae262f6ef44d8dcc6e77fd1edac5 (diff) | |
media: atomisp: remove some file duplication and do more dir renames
There are currently two identical copies of some files, one
at css_2401_csi2p_system/ and another one at css_2401_system/.
Get rid of one of them, moving the remaining files to the
directory with the shortest name.
While here, do more renames, in order to get smaller path
names.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media/atomisp/Makefile')
| -rw-r--r-- | drivers/staging/media/atomisp/Makefile | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/drivers/staging/media/atomisp/Makefile b/drivers/staging/media/atomisp/Makefile index 3c1c9bc0eebc..d166b5f614e8 100644 --- a/drivers/staging/media/atomisp/Makefile +++ b/drivers/staging/media/atomisp/Makefile @@ -159,9 +159,9 @@ atomisp-objs += \ pci/hive_isp_css_shared/host/tag.o \ obj-byt = \ - pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.o \ - pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.o \ - pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.o \ + pci/css_2400_system/hive/ia_css_isp_configs.o \ + pci/css_2400_system/hive/ia_css_isp_params.o \ + pci/css_2400_system/hive/ia_css_isp_states.o \ pci/css_2400_system/spmem_dump.o \ # These will be needed when clean merge CHT support nicely into the driver @@ -170,19 +170,15 @@ obj-byt = \ obj-cht = \ pci/css_2401_system/spmem_dump.o \ - pci/css_2401_csi2p_system/spmem_dump.o \ - pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.o \ - pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.o \ - pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.o \ - pci/css_2401_csi2p_system/host/csi_rx.o \ - pci/css_2401_csi2p_system/host/ibuf_ctrl.o \ - pci/css_2401_csi2p_system/host/isys_dma.o \ - pci/css_2401_csi2p_system/host/isys_irq.o \ - pci/css_2401_csi2p_system/host/isys_stream2mmio.o - -# pci/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.o \ -# pci/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.o \ -# pci/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.o \ + pci/css_2401_system/spmem_dump.o \ + pci/css_2401_system/hive/ia_css_isp_configs.o \ + pci/css_2401_system/hive/ia_css_isp_params.o \ + pci/css_2401_system/hive/ia_css_isp_states.o \ + pci/css_2401_system/host/csi_rx.o \ + pci/css_2401_system/host/ibuf_ctrl.o \ + pci/css_2401_system/host/isys_dma.o \ + pci/css_2401_system/host/isys_irq.o \ + pci/css_2401_system/host/isys_stream2mmio.o INCLUDES += \ -I$(atomisp)/ \ @@ -320,14 +316,14 @@ INCLUDES += \ INCLUDES_byt += \ -I$(atomisp)/pci/css_2400_system/ \ - -I$(atomisp)/pci/css_2400_system/hive_isp_css_2400_system_generated/ \ + -I$(atomisp)/pci/css_2400_system/hive/ \ -I$(atomisp)/pci/css_2400_system/hrt/ \ INCLUDES_cht += \ - -I$(atomisp)/pci/css_2401_csi2p_system/ \ - -I$(atomisp)/pci/css_2401_csi2p_system/host/ \ - -I$(atomisp)/pci/css_2401_csi2p_system/hive_isp_css_2400_system_generated/ \ - -I$(atomisp)/pci/css_2401_csi2p_system/hrt/ \ + -I$(atomisp)/pci/css_2401_system/ \ + -I$(atomisp)/pci/css_2401_system/host/ \ + -I$(atomisp)/pci/css_2401_system/hive/ \ + -I$(atomisp)/pci/css_2401_system/hrt/ \ # -I$(atomisp)/pci/css_2401_system/hrt/ \ # -I$(atomisp)/pci/css_2401_system/hive_isp_css_2401_system_generated/ \ |