Fix missing pulp-sdk linking to bsp

Author: lukamac

CMakeLists.txt

@@ -38,15 +38,16 @@ if (${USE_NE16})
     ne16/gvsoc
   )
   if(${ENABLE_BSP})
-  target_sources(pulp-nnx-bsp
-    PRIVATE
-    ne16/bsp/ne16_pulp_bsp.c
-    src/pulp_nnx_ne16.c
-  )
-  target_include_directories(pulp-nnx-bsp
-    PUBLIC
-    ne16/bsp
-  )
+    target_sources(pulp-nnx-bsp
+      PRIVATE
+      ne16/bsp/ne16_pulp_bsp.c
+      src/pulp_nnx_ne16.c
+    )
+    target_include_directories(pulp-nnx-bsp
+      PUBLIC
+      ne16/bsp
+    )
+    target_link_libraries(pulp-nnx-bsp PUBLIC pulp-nnx-hal)
   endif()
 
 endif()
@@ -64,15 +65,16 @@ if (${USE_NEUREKA})
     neureka/gvsoc
   )
   if(${ENABLE_BSP})
-  target_sources(pulp-nnx-bsp
-    PRIVATE
-    neureka/bsp/neureka_siracusa_bsp.c
-    src/pulp_nnx_neureka.c
-  )
-  target_include_directories(pulp-nnx-bsp
-    PUBLIC
-    neureka/bsp
-  )
+    target_sources(pulp-nnx-bsp
+      PRIVATE
+      neureka/bsp/neureka_siracusa_bsp.c
+      src/pulp_nnx_neureka.c
+    )
+    target_include_directories(pulp-nnx-bsp
+      PUBLIC
+      neureka/bsp
+    )
+    target_link_libraries(pulp-nnx-bsp PUBLIC pulp-nnx-hal)
   endif()
 
 endif()
@@ -90,15 +92,16 @@ if (${USE_NEUREKA_V2})
     neureka_v2/gvsoc
   )
   if(${ENABLE_BSP})
-  target_sources(pulp-nnx-bsp
-    PRIVATE
-    neureka_v2/bsp/neureka_v2_pulp_bsp.c
-    src/pulp_nnx_neureka_v2.c
-  )
-  target_include_directories(pulp-nnx-bsp
-    PUBLIC
-    neureka_v2/bsp
-  )
+    target_sources(pulp-nnx-bsp
+      PRIVATE
+      neureka_v2/bsp/neureka_v2_siracusa_bsp.c
+      src/pulp_nnx_neureka_v2.c
+    )
+    target_include_directories(pulp-nnx-bsp
+      PUBLIC
+      neureka_v2/bsp
+    )
+    target_link_libraries(pulp-nnx-bsp PUBLIC pulp-nnx-hal)
   endif()
 
 endif()

test/app/CMakeLists.txt

@@ -25,15 +25,20 @@ target_link_libraries(test-pulp-nnx PRIVATE pulp-sdk)
 
 if(${ACCELERATOR} STREQUAL neureka)
 	set(USE_NEUREKA ON)
+	set(ENABLE_BSP ON)
 	target_compile_definitions(test-pulp-nnx PRIVATE NNX_ACCELERATOR="neureka" NNX_NEUREKA)
 elseif(${ACCELERATOR} STREQUAL neureka_v2)
 	set(USE_NEUREKA_V2 ON)
+	set(ENABLE_BSP ON)
 	target_compile_definitions(test-pulp-nnx PRIVATE NNX_ACCELERATOR="neureka_v2" NNX_NEUREKA_V2)
 else()
 	message(FATAL_ERROR "Unrecognized accelerator detected: \"${ACCELERATOR}\"")
 endif()
 
 add_subdirectory(../.. pulp-nnx)
-target_link_libraries(pulp-nnx PUBLIC pulp-sdk)
-target_include_directories(pulp-nnx SYSTEM PUBLIC ${PULP_SDK_INCLUDES})
+target_link_libraries(pulp-nnx-bsp PRIVATE pulp-sdk)
+target_include_directories(pulp-nnx-bsp PRIVATE ${PULP_SDK_INCLUDES})
+
+target_link_libraries(test-pulp-nnx PRIVATE pulp-sdk)
+target_include_directories(test-pulp-nnx PRIVATE ${PULP_SDK_INCLUDES})
 target_link_libraries(test-pulp-nnx PRIVATE pulp-nnx)