fixed conflicts

2022-05-23 16:53:20 +02:00
parent 379c5f06ba a2eabdce01
commit d808a12c31
97 changed files with 2431 additions and 1577 deletions
--- a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
+++ b/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
@ -310,6 +310,9 @@ class ApidOnlyPacket : public SpacePacket {
 */
 class MPSoCBootSelect : public SpacePacket {
 public:
+  static const uint8_t NVM0 = 0;
+  static const uint8_t NVM1 = 1;
+
  /**
   * @brief   Constructor
   *