Просмотр исходного кода

Merge branch 'fix/bootloader_region_overlap_update' into 'master'

bootloader: remove duplicate region overlap logic

See merge request idf/esp-idf!5128
Ivan Grokhotkov 6 лет назад
Родитель
Сommit
08557be5df
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      components/bootloader_support/include/bootloader_util.h

+ 3 - 2
components/bootloader_support/include/bootloader_util.h

@@ -29,6 +29,7 @@ static inline bool bootloader_util_regions_overlap(
         const intptr_t start1, const intptr_t end1,
         const intptr_t start2, const intptr_t end2)
 {
-    return (end1 > start2 && end2 > start1) ||
-           !(end1 <= start2 || end2 <= start1);
+    assert(end1>start1);
+    assert(end2>start2);
+    return (end1 > start2 && end2 > start1);
 }