ww48 release

CMakeLists.txt

@@ -251,7 +251,8 @@ if (NOT CAL_BUILD)
     find_package(LIBDRM)
     if(LIBDRM_FOUND AND ("${LIBDRM_VERSION}" VERSION_GREATER_EQUAL 2.4.114))
         include_directories(${LIBDRM_INCLUDE_DIRS})
-        set(LIBCAMHAL_LINK_LIBS ${LIBCAMHAL_LINK_LIBS} ${LIBDRM_LIBS})
+        link_directories(${LIBDRM_LIBRARY_DIRS})
+        set(LIBCAMHAL_LINK_LIBS ${LIBCAMHAL_LINK_LIBS} ${LIBDRM_LIBRARIES})
         add_definitions(-DLIBDRM_SUPPORT_MMAP_OFFSET)
     endif()
 endif()
@@ -331,28 +332,32 @@ endif()
     # Link ia_imaging
     find_package(IA_IMAGING)
     set(TARGET_INCLUDE ${TARGET_INCLUDE} ${IA_IMAGING${TARGET_SUFFIX}_INCLUDE_DIRS})
-    set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${IA_IMAGING${TARGET_SUFFIX}_LIBS})
+    set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${IA_IMAGING${TARGET_SUFFIX}_LIBRARIES})
+    link_directories(${IA_IMAGING${TARGET_SUFFIX}_LIBRARY_DIRS})
 
     if(USE_PG_LITE_PIPE)
         find_package(LIBGCSS)
         set(TARGET_INCLUDE ${TARGET_INCLUDE} ${LIBGCSS${TARGET_SUFFIX}_INCLUDE_DIRS})
-        set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${LIBGCSS${TARGET_SUFFIX}_LIBS})
+        set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${LIBGCSS${TARGET_SUFFIX}_LIBRARIES})
+        link_directories(${LIBGCSS${TARGET_SUFFIX}_LIBRARY_DIRS})
         # Include libipu(4) headers
         find_package(LIBIPU)
         set(TARGET_INCLUDE ${TARGET_INCLUDE} ${LIBIPU${TARGET_SUFFIX}_INCLUDE_DIRS})
-        set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${LIBIPU${TARGET_SUFFIX}_LIBS})
+        set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${LIBIPU${TARGET_SUFFIX}_LIBRARIES})
+        link_directories(${LIBIPU${TARGET_SUFFIX}_LIBRARY_DIRS})
     else()
         # Link libiacss
         find_package(LIBIACSS)
         set(TARGET_INCLUDE ${TARGET_INCLUDE} ${LIBIACSS${TARGET_SUFFIX}_INCLUDE_DIRS})
-        set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${LIBIACSS${TARGET_SUFFIX}_LIBS})
+        set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${LIBIACSS${TARGET_SUFFIX}_LIBRARIES})
+        link_directories(${LIBIACSS${TARGET_SUFFIX}_LIBRARY_DIRS})
     endif()
 
 #--------------------------- Add libcamhal target  ---------------------------
 
 if (BUILD_CAMHAL_PLUGIN)
-    set(CAMHAL_TARGET ${IPU_VER})
-    set(CAMHAL_STATIC_TARGET ${IPU_VER}_static)
+    set(CAMHAL_TARGET camhal${IPU_VER})
+    set(CAMHAL_STATIC_TARGET camhal${IPU_VER}_static)
 else()
     set(CAMHAL_TARGET camhal)
     set(CAMHAL_STATIC_TARGET camhal_static)

cmake/FindIA_IMAGING.cmake

@@ -20,72 +20,44 @@ if(TARGET ia_aiq)
 endif()
 
 # Get include and lib paths for IA_IMAGING from pkgconfig
-include(FindPackageHandleStandardArgs)
 
 find_package(PkgConfig)
 pkg_check_modules(IA_IMAGING${TARGET_SUFFIX} ia_imaging${TARGET_SUFFIX})
 if(NOT IA_IMAGING${TARGET_SUFFIX}_FOUND)
     message(FATAL_ERROR "IA_IMAGING${TARGET_SUFFIX} not found")
 endif()
 
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${IA_IMAGING${TARGET_SUFFIX}_LIBRARY_DIRS})
-
-# Libraries
-find_library(IA_CCA${TARGET_SUFFIX}_LIB         ia_cca${TARGET_SUFFIX})
-find_library(IA_AIQ${TARGET_SUFFIX}_LIB         ia_aiq${TARGET_SUFFIX})
-find_library(IA_AIQB_PARSER${TARGET_SUFFIX}_LIB ia_aiqb_parser${TARGET_SUFFIX})
-find_library(IA_CMC_PARSER${TARGET_SUFFIX}_LIB  ia_cmc_parser${TARGET_SUFFIX})
-find_library(IA_EXC${TARGET_SUFFIX}_LIB         ia_exc${TARGET_SUFFIX})
-find_library(IA_MKN${TARGET_SUFFIX}_LIB         ia_mkn${TARGET_SUFFIX})
-# SENSOR_EMD_DECODER
-find_library(IA_EMD${TARGET_SUFFIX}_LIB         ia_emd_decoder${TARGET_SUFFIX})
+set(IA_IMAGING${TARGET_SUFFIX}_LIBRARIES
+    ia_cca${TARGET_SUFFIX}
+    ia_aiq${TARGET_SUFFIX}
+    ia_aiqb_parser${TARGET_SUFFIX}
+    ia_cmc_parser${TARGET_SUFFIX}
+    ia_exc${TARGET_SUFFIX}
+    ia_mkn${TARGET_SUFFIX}
+    ia_emd_decoder${TARGET_SUFFIX}
+    ia_nvm${TARGET_SUFFIX}
+    ia_log${TARGET_SUFFIX}
+    ia_dvs${TARGET_SUFFIX}
+    ia_coordinate${TARGET_SUFFIX}
+    ia_ltm${TARGET_SUFFIX}
+    ia_dvs${TARGET_SUFFIX}
+    ia_isp_bxt${TARGET_SUFFIX}
+    broxton_ia_pal${TARGET_SUFFIX}
 # DOL_FEATURE_S
-find_library(IA_BCOMP${TARGET_SUFFIX}_LIB       ia_bcomp${TARGET_SUFFIX})
+    ia_bcomp${TARGET_SUFFIX}
 # DOL_FEATURE_E
-find_library(IA_NVM${TARGET_SUFFIX}_LIB         ia_nvm${TARGET_SUFFIX})
-find_library(IA_LOG${TARGET_SUFFIX}_LIB         ia_log${TARGET_SUFFIX})
-find_library(IA_DVS${TARGET_SUFFIX}_LIB         ia_dvs${TARGET_SUFFIX})
-find_library(IA_COORDINATE${TARGET_SUFFIX}_LIB  ia_coordinate${TARGET_SUFFIX})
-find_library(IA_LTM${TARGET_SUFFIX}_LIB         ia_ltm${TARGET_SUFFIX})
-find_library(IA_DVS${TARGET_SUFFIX}_LIB         ia_dvs${TARGET_SUFFIX})
-find_library(IA_ISP_BXT${TARGET_SUFFIX}_LIB     ia_isp_bxt${TARGET_SUFFIX})
-find_library(BXT_IA_PAL${TARGET_SUFFIX}_LIB     broxton_ia_pal${TARGET_SUFFIX})
-
-set(IA_IMAGING${TARGET_SUFFIX}_LIBS
-    ${IA_CCA${TARGET_SUFFIX}_LIB}
-    ${IA_AIQ${TARGET_SUFFIX}_LIB}
-    ${IA_AIQB_PARSER${TARGET_SUFFIX}_LIB}
-    ${IA_CMC_PARSER${TARGET_SUFFIX}_LIB}
-    ${IA_EXC${TARGET_SUFFIX}_LIB}
-    ${IA_MKN${TARGET_SUFFIX}_LIB}
-    ${IA_EMD${TARGET_SUFFIX}_LIB}
-    ${IA_BCOMP${TARGET_SUFFIX}_LIB}
-    ${IA_NVM${TARGET_SUFFIX}_LIB}
-    ${IA_LOG${TARGET_SUFFIX}_LIB}
-    ${IA_DVS${TARGET_SUFFIX}_LIB}
-    ${IA_COORDINATE${TARGET_SUFFIX}_LIB}
-    ${IA_LTM${TARGET_SUFFIX}_LIB}
-    ${IA_DVS${TARGET_SUFFIX}_LIB}
-    ${IA_OB${TARGET_SUFFIX}_LIB}
-    ${IA_ISP_BXT${TARGET_SUFFIX}_LIB}
-    ${BXT_IA_PAL${TARGET_SUFFIX}_LIB}
 )
 
 if (NOT ENABLE_SANDBOXING)
-    find_library(IA_LARD${TARGET_SUFFIX}_LIB ia_lard${TARGET_SUFFIX})
-    set(IA_IMAGING${TARGET_SUFFIX}_LIBS ${IA_IMAGING${TARGET_SUFFIX}_LIBS} ${IA_LARD${TARGET_SUFFIX}_LIB})
+    set(IA_IMAGING${TARGET_SUFFIX}_LIBRARIES
+        ${IA_IMAGING${TARGET_SUFFIX}_LIBRARIES}
+        ia_lard${TARGET_SUFFIX}
+    )
 endif() #ENABLE_SANDBOXING
 
 if (USE_PG_LITE_PIPE)
-    find_library(IA_P2P${TARGET_SUFFIX}_LIB ia_p2p${TARGET_SUFFIX})
-    set(IA_IMAGING${TARGET_SUFFIX}_LIBS ${IA_IMAGING${TARGET_SUFFIX}_LIBS} ${IA_P2P${TARGET_SUFFIX}_LIB})
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
-# all listed variables are TRUE
-find_package_handle_standard_args(IA_IMAGING${TARGET_SUFFIX}
-                                  REQUIRED_VARS IA_IMAGING${TARGET_SUFFIX}_INCLUDE_DIRS IA_IMAGING${TARGET_SUFFIX}_LIBS)
-
-if(NOT IA_IMAGING${TARGET_SUFFIX}_FOUND)
-    message(FATAL_ERROR "IA_IMAGING${TARGET_SUFFIX} not found")
+    set(IA_IMAGING${TARGET_SUFFIX}_LIBRARIES
+        ${IA_IMAGING${TARGET_SUFFIX}_LIBRARIES}
+        ia_p2p${TARGET_SUFFIX}
+    )
 endif()

cmake/FindLIBDRM.cmake

@@ -15,25 +15,9 @@
 #
 
 # Get include and lib paths for LIBDRM from pkgconfig
-include(FindPackageHandleStandardArgs)
 
 find_package(PkgConfig)
 pkg_check_modules(LIBDRM libdrm)
 if(NOT LIBDRM_FOUND)
     message(SEND_ERROR "LIBDRM not found")
 endif()
-
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${LIBDRM_LIBRARY_DIRS})
-
-# Libraries
-find_library(DRM_LIB drm)
-set(LIBDRM_LIBS ${DRM_LIB})
-
-# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
-# all listed variables are TRUE
-find_package_handle_standard_args(LIBDRM REQUIRED_VARS LIBDRM_INCLUDE_DIRS LIBDRM_LIBS)
-
-if(NOT LIBDRM_FOUND)
-        message(SEND_ERROR "LIBDRM not found")
-endif()
-

cmake/FindLIBGCSS.cmake

@@ -15,25 +15,9 @@
 #
 
 # Get include and lib paths for LIBGCSS from pkgconfig
-include(FindPackageHandleStandardArgs)
 
 find_package(PkgConfig)
 pkg_check_modules(LIBGCSS${TARGET_SUFFIX} libgcss${TARGET_SUFFIX})
 if(NOT LIBGCSS${TARGET_SUFFIX}_FOUND)
     message(FATAL_ERROR "LIBGCSS${TARGET_SUFFIX} not found")
 endif()
-
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${LIBGCSS${TARGET_SUFFIX}_LIBRARY_DIRS})
-
-# Libraries
-find_library(GCSS${TARGET_SUFFIX}_LIB gcss${TARGET_SUFFIX})
-set(LIBGCSS${TARGET_SUFFIX}_LIBS ${GCSS${TARGET_SUFFIX}_LIB})
-
-# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
-# all listed variables are TRUE
-find_package_handle_standard_args(LIBGCSS${TARGET_SUFFIX} REQUIRED_VARS LIBGCSS${TARGET_SUFFIX}_INCLUDE_DIRS LIBGCSS${TARGET_SUFFIX}_LIBS)
-
-if(NOT LIBGCSS${TARGET_SUFFIX}_FOUND)
-        message(FATAL_ERROR "LIBGCSS${TARGET_SUFFIX} not found")
-endif()
-

cmake/FindLIBIACSS.cmake

@@ -15,32 +15,9 @@
 #
 
 # Get include and lib paths for LIBIACSS from pkgconfig
-include(FindPackageHandleStandardArgs)
 
 find_package(PkgConfig)
-pkg_check_modules(LIBIACSS libiacss)
-if(NOT LIBIACSS_FOUND)
-    message(FATAL_ERROR "LIBIACSS not found")
+pkg_check_modules(LIBIACSS${TARGET_SUFFIX} libiacss${TARGET_SUFFIX})
+if(NOT LIBIACSS${TARGET_SUFFIX}_FOUND)
+    message(FATAL_ERROR "LIBIACSS${TARGET_SUFFIX} not found")
 endif()
-
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${LIBIACSS_LIBRARY_DIRS})
-
-# Libraries
-find_library(GCSS_LIB      gcss)
-find_library(IA_CAMERA_LIB ia_camera)
-find_library(IA_CIPF_LIB   ia_cipf)
-set(LIBIACSS_LIBS
-    ${GCSS_LIB}
-    ${IA_CAMERA_LIB}
-    ${IA_CIPF_LIB}
-    )
-
-# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
-# all listed variables are TRUE
-find_package_handle_standard_args(LIBIACSS
-                                  REQUIRED_VARS LIBIACSS_INCLUDE_DIRS LIBIACSS_LIBS)
-
-if(NOT LIBIACSS_FOUND)
-    message(FATAL_ERROR "LIBIACSS not found")
-endif()
-

cmake/FindLIBIPU.cmake

@@ -28,26 +28,9 @@ else()
 endif()
 
 # Get include and lib paths for LIBIPU from pkgconfig
-include(FindPackageHandleStandardArgs)
 
-# Include directory
 find_package(PkgConfig)
 pkg_check_modules(LIBIPU${TARGET_SUFFIX} ${libipu_ver})
 if(NOT LIBIPU${TARGET_SUFFIX}_FOUND)
     message(FATAL_ERROR "LIBIPU${TARGET_SUFFIX} not found")
 endif()
-
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${LIBIPU${TARGET_SUFFIX}_LIBRARY_DIRS})
-
-# Libraries
-find_library(IPU${TARGET_SUFFIX}_LIB NAMES ${libipu_ver}.a)
-set(LIBIPU${TARGET_SUFFIX}_LIBS ${IPU${TARGET_SUFFIX}_LIB})
-
-# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
-# all listed variables are TRUE
-find_package_handle_standard_args(LIBIPU${TARGET_SUFFIX}
-                                  REQUIRED_VARS LIBIPU${TARGET_SUFFIX}_INCLUDE_DIRS LIBIPU${TARGET_SUFFIX}_LIBS)
-
-if(NOT LIBIPU${TARGET_SUFFIX}_FOUND)
-    message(FATAL_ERROR "LIBIPU${TARGET_SUFFIX} not found")
-endif()

config/linux/ipu6ep/libcamhal_profile.xml

@@ -21,6 +21,6 @@
         <!-- The value format of availableSensors is "sensor name"-wf/uf-"CSI port ID" -->
         <availableSensors value="ov13b10-wf-2,ov13b10-uf-1,ov8856-wf-2,ov8856-uf-1,ov01a10-uf-1,ov01a10-uf-2,ov02c10-uf-1,ov02c10-uf-2,
                                  ov2740-uf-1,hm2170-uf-1,hm2170-uf-2,hi556-uf-1,ov01a1s-uf-1,ov08a10-uf-1,
-                                 isx031,imx390,ar0234,external_source,ar0234_usb,lt6911uxc,lt6911uxe"/>
+                                 isx031,imx390,ar0234,external_source,ar0234_usb,lt6911uxc-1-1,lt6911uxc-2-2,lt6911uxe"/>
     </Common>
 </CameraSettings>

config/linux/ipu6ep/psys_policy_profiles.xml

@@ -19,8 +19,6 @@ limitations under the License.
         <!-- op_modes: 0-disabled, 2-coupled. see ia_cipf_css.h in libiacss -->
         <pipe_executor name="ipu6_lb_video"  pgs="isa_lb_video"/>
         <pipe_executor name="ipu6_bb_video"  pgs="post_gdc_video"/>
-        <bundle executors="ipu6_lb_video:0,ipu6_bb_video:1"/>
-        <enableBundleInSdv name="false"/>
 
         <pipe_executor name="ipu6_full_still"  pgs="isa_lb_stills,post_gdc_stills"/>
     </graph>