Fix cppcheck issue. Fix uart_init function conflict with UART_FLASH a…

…nd WOLFBOOT_FSP.
wolfSSL · May 10, 2024 · 32c1dee · 32c1dee
1 parent e46e3fb
commit 32c1dee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/include/printf.h b/include/printf.h
@@ -35,7 +35,9 @@
 #endif
 
 #if defined(DEBUG_UART)
-    void uart_init(void);
+    #if !defined(UART_FLASH) && !defined(WOLFBOOT_FSP)
+        void uart_init(void);
+    #endif
     void uart_write(const char* buf, unsigned int sz);
 
     /* turn on small printf support */

diff --git a/src/boot_renesas.c b/src/boot_renesas.c
@@ -49,14 +49,16 @@ void do_boot(const uint32_t *app_offset)
 {
     void (*app_entry)(void);
     uint32_t app_sp;
+
+#ifdef BOOT_ENTRY_OFFSET
+    /* add byte offset to uint32_t */
+    app_offset += BOOT_ENTRY_OFFSET/sizeof(uint32_t);
+#endif
+
     (void) app_offset;
     (void) app_sp;
     (void) app_entry;
-    #ifndef BOOT_ENTRY_OFFSET
-    #define BOOT_ENTRY_OFFSET 0x00
-    #endif
-    /* add byte offset to uint32_t */
-    app_offset += BOOT_ENTRY_OFFSET/sizeof(uint32_t);
+
 #if defined(__RX__)
     /* Do unconditional jump (r1 = app_offset) */
     #if defined(__CCRX__)