eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
Robin Müller 2022-03-25 19:00:19 +01:00
parent 9351c8285b
commit 94dc4eb367
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/config/commonObjects.h
View File

@ -90,19 +90,14 @@ enum commonObjects: uint32_t {
PLOC_UPDATER = 0x44330000, PLOC_UPDATER = 0x44330000,
PLOC_MEMORY_DUMPER = 0x44330001, PLOC_MEMORY_DUMPER = 0x44330001,
STR_HELPER = 0x44330002, STR_HELPER = 0x44330002,
<<<<<<< HEAD
PLOC_MPSOC_HELPER = 0x44330003, PLOC_MPSOC_HELPER = 0x44330003,
AXI_PTME_CONFIG = 44330004, AXI_PTME_CONFIG = 44330004,
PTME_CONFIG = 44330005, PTME_CONFIG = 44330005,
=======
AXI_PTME_CONFIG = 44330003,
PTME_CONFIG = 44330004,
// 0x73 ('s') for assemblies and system/subsystem components // 0x73 ('s') for assemblies and system/subsystem components
ACS_BOARD_ASS = 0x73000001, ACS_BOARD_ASS = 0x73000001,
SUS_BOARD_ASS = 0x73000002, SUS_BOARD_ASS = 0x73000002,
TCS_BOARD_ASS = 0x73000003 TCS_BOARD_ASS = 0x73000003
>>>>>>> develop
}; };
} }