PRSDK-6233: Cleaning up debug code

2 files changed, 19 insertions, 1 deletions

diff --git a/comp_top.mk b/comp_top.mk
index ff8f59c..5c37706 100755
--- a/comp_top.mk
+++ b/comp_top.mk
@@ -59,6 +59,11 @@ else
   CORE_LIST_ALL = $($(COMP)_$(SOC)_CORELIST)
 endif
 
+# For core indpendent libraries, chose the 'base' core the other cores' target can depend on 
+LIM_CORE_BASE_LIST := $(foreach core_type,$(DEFAULT_CORE_TYPES),$(firstword $(filter $(core_type)%,$(CORE_LIST_ALL))))
+# The rest of the cores, i.e (CORE_LIST_ALL - LIM_CORE_BASE_LIST). These will depend on the LIM_CORE_BASE_LIST
+LIM_CORE_REST_LIST := $(filter-out $(LIM_CORE_BASE_LIST),$(CORE_LIST_ALL))
+
 PRUCORE_LIST = pru_0 pru_1
 
 # If the component enables this, parallel builds are disabled for this component
@@ -73,6 +78,9 @@ ifeq ($(lib_$(COMP)_BUILD_DEPENDENCY),board)
     lib_BOARD_SOC_LIST_ALL = $(addsuffix _lib, $(BOARD_LIST_ALL))
 endif
 lib_CORE_LIST_ALL = $(addsuffix _lib, $(filter-out $(PRUCORE_LIST),$(CORE_LIST_ALL)))
+lib_CORE_LIST_BASE = $(addsuffix _lib, $(filter-out $(PRUCORE_LIST),$(LIM_CORE_BASE_LIST)))
+lib_CORE_LIST_REST = $(addsuffix _lib, $(filter-out $(PRUCORE_LIST),$(LIM_CORE_REST_LIST)))
+
 lib_LIB_ENDIAN_LIST = $(addsuffix _lib, $(LIB_ENDIAN_LIST))
 ifeq ($(lib_$(COMP)_BUILD_DEPENDENCY),soc)
     lib_BOARD_SOC_LIST_ALL_CLEAN = $(addsuffix _lclean, $(SOC_LIST_ALL))
@@ -302,7 +310,12 @@ tar: lib firm xdc_meta doxygen
         
 lib: $(lib_BOARD_SOC_LIST_ALL)
 
-libcores: $(lib_CORE_LIST_ALL)
+# First build the libraries for base cores, then followed by the rest
+libcores: libcores_base_cores
+        $(MAKE) libcores_rest_cores
+
+libcores_base_cores: $(lib_CORE_LIST_BASE)
+libcores_rest_cores: $(lib_CORE_LIST_REST)
 
 lib_allendians: $(lib_LIB_ENDIAN_LIST)
 
diff --git a/makerules/component.mk b/makerules/component.mk
index 9f8ebae..d847a3e 100644
--- a/makerules/component.mk
+++ b/makerules/component.mk
@@ -96,6 +96,11 @@ DEFAULT_am65xx_CORELIST   = mcu1_0 mpu1_0
 DEFAULT_j721e_CORELIST    = mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66xdsp_1 c66xdsp_2 c7x_1 c7x-hostemu
 DEFAULT_k3_CORELIST = m3
 
+# Core types (without the core IDs). This will be used to parse and order the establish the order of cores
+# in the case of building libraries for multiple cores
+
+DEFAULT_CORE_TYPES = a15 ipu c66x arp32 a8host a9host c674x arm9 c7x c7x-hostemu mpu mcu
+
 # Component specific CFLAGS
 PDK_CFLAGS =
 PDK_LNKFLAGS =