fixed merge conflicts

2022-03-25 18:49:34 +01:00
parent 4bf0521a5d 15d1da8199
commit 2f6d9ab7f1
67 changed files with 2539 additions and 340 deletions
--- a/common/config/commonObjects.h
+++ b/common/config/commonObjects.h
@ -90,9 +90,19 @@ enum commonObjects: uint32_t {
    PLOC_UPDATER = 0x44330000,
    PLOC_MEMORY_DUMPER = 0x44330001,
    STR_HELPER = 0x44330002,
+<<<<<<< HEAD
    PLOC_MPSOC_HELPER = 0x44330003,
    AXI_PTME_CONFIG = 44330004,
    PTME_CONFIG = 44330005,
+=======
+    AXI_PTME_CONFIG = 44330003,
+    PTME_CONFIG = 44330004,
+
+    // 0x73 ('s') for assemblies and system/subsystem components
+    ACS_BOARD_ASS = 0x73000001,
+    SUS_BOARD_ASS = 0x73000002,
+    TCS_BOARD_ASS = 0x73000003
+>>>>>>> develop
 };
 }