bootutil *should not* import assert.h
bootutil already handles ASSERT definition, allowing us to override it
with a custom implementation. Importing assert.h would pull in stdio.h
and a whole bunch of other stuff by TI compiler into the final
firmware.
Signed-off-by: Blaž Hrastnik <blaz@mxxn.io>
diff --git a/boot/bootutil/src/bootutil_misc.c b/boot/bootutil/src/bootutil_misc.c
index c9562db..d9dd352 100644
--- a/boot/bootutil/src/bootutil_misc.c
+++ b/boot/bootutil/src/bootutil_misc.c
@@ -25,7 +25,6 @@
* under the License.
*/
-#include <assert.h>
#include <string.h>
#include <inttypes.h>
#include <stddef.h>
diff --git a/boot/bootutil/src/bootutil_priv.h b/boot/bootutil/src/bootutil_priv.h
index fe96113..180cd5c 100644
--- a/boot/bootutil/src/bootutil_priv.h
+++ b/boot/bootutil/src/bootutil_priv.h
@@ -49,6 +49,7 @@
#ifdef MCUBOOT_HAVE_ASSERT_H
#include "mcuboot_config/mcuboot_assert.h"
#else
+#include <assert.h>
#define ASSERT assert
#endif
diff --git a/boot/bootutil/src/encrypted.c b/boot/bootutil/src/encrypted.c
index 6e0a70f..b62a31e 100644
--- a/boot/bootutil/src/encrypted.c
+++ b/boot/bootutil/src/encrypted.c
@@ -8,7 +8,6 @@
#include "mcuboot_config/mcuboot_config.h"
#if defined(MCUBOOT_ENC_IMAGES)
-#include <assert.h>
#include <stddef.h>
#include <inttypes.h>
#include <string.h>
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 5a3de4f..1c1d3a6 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -30,7 +30,6 @@
* this file should only be called while the boot loader is running.
*/
-#include <assert.h>
#include <stddef.h>
#include <stdbool.h>
#include <inttypes.h>
diff --git a/boot/bootutil/src/swap_misc.c b/boot/bootutil/src/swap_misc.c
index 44b364d..995becf 100644
--- a/boot/bootutil/src/swap_misc.c
+++ b/boot/bootutil/src/swap_misc.c
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-#include <assert.h>
#include <stddef.h>
#include <stdbool.h>
#include <inttypes.h>
diff --git a/boot/bootutil/src/swap_move.c b/boot/bootutil/src/swap_move.c
index 90bf9d1..b051628 100644
--- a/boot/bootutil/src/swap_move.c
+++ b/boot/bootutil/src/swap_move.c
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-#include <assert.h>
#include <stddef.h>
#include <stdbool.h>
#include <inttypes.h>
diff --git a/boot/bootutil/src/swap_scratch.c b/boot/bootutil/src/swap_scratch.c
index ed88dc8..99c57f0 100644
--- a/boot/bootutil/src/swap_scratch.c
+++ b/boot/bootutil/src/swap_scratch.c
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-#include <assert.h>
#include <stddef.h>
#include <stdbool.h>
#include <inttypes.h>