Fixes for build warnings

Author: dgarske

hal/filesystem.c

@@ -37,14 +37,15 @@ void hal_init(void)
 {
     return;
 }
-int hal_flash_write(uintptr_t address, const uint8_t *data, int len)
+
+int hal_flash_write(haladdr_t address, const uint8_t *data, int len)
 {
     (void)address;
     (void)data;
     (void)len;
     return -1;
 }
-int hal_flash_erase(uintptr_t address, int len)
+int hal_flash_erase(haladdr_t address, int len)
 {
     (void)address;
     (void)len;

hal/library_fs.c

@@ -60,14 +60,14 @@ static int cmd_get_state(uint8_t part)
 {
     uint8_t state;
     int ret;
-    
+
     ret = wolfBoot_get_partition_state(part, &state);
     if (ret != 0) {
         wolfBoot_printf("Error: Failed to get state for %s partition (error: %d)\n",
                partition_name(part), ret);
         return -1;
     }
-    
+
     wolfBoot_printf("%s partition state: %s (0x%02X)\n",
            partition_name(part), state_name(state), state);
     return 0;
@@ -77,15 +77,15 @@ static int cmd_get_state(uint8_t part)
 static int cmd_get_all_states(void)
 {
     int ret = 0;
-    
+
     wolfBoot_printf("=== Partition States ===\n");
-    
+
     if (cmd_get_state(PART_BOOT) != 0)
         ret = -1;
-    
+
     if (cmd_get_state(PART_UPDATE) != 0)
         ret = -1;
-    
+
     return ret;
 }
 
@@ -164,15 +164,21 @@ static int cmd_verify(uint8_t part)
 int main(int argc, const char* argv[])
 {
     int ret = 0;
-    
+    const char* prog_name = "lib-fs";
+    const char* command;
+
+    if (argc >= 1) {
+        prog_name = argv[0];
+    }
+
     /* Check for argument count */
     if (argc != 2) {
-        print_usage(argv[0]);
+        print_usage(prog_name);
         return 1;
     }
-    
-    const char* command = argv[1];
-    
+
+    command = argv[1];
+
     /* Process commands */
     if (strcmp(command, "status") == 0) {
         ret = cmd_get_all_states();
@@ -195,7 +201,7 @@ int main(int argc, const char* argv[])
     else if (strcmp(command, "verify-update") == 0) {
         ret = cmd_verify(PART_UPDATE);
     }
-    else if (strcmp(command, "help") == 0 || strcmp(command, "--help") == 0 || 
+    else if (strcmp(command, "help") == 0 || strcmp(command, "--help") == 0 ||
              strcmp(command, "-h") == 0) {
         print_usage(argv[0]);
         ret = 0;
@@ -205,6 +211,6 @@ int main(int argc, const char* argv[])
         print_usage(argv[0]);
         ret = 1;
     }
-    
+
     return ret;
 }

include/printf.h

@@ -30,7 +30,7 @@
 #if defined(WOLFBOOT_DEBUG_EFI) && !defined(PRINTF_ENABLED)
 #   define PRINTF_ENABLED
 #endif
-#if defined(ARCH_SIM) && !defined(PRINTF_ENABLED)
+#if (defined(ARCH_SIM) || defined(__linux__)) && !defined(PRINTF_ENABLED)
 #   define PRINTF_ENABLED
 #endif
 

src/update_ram.c

@@ -312,7 +312,7 @@ void RAMFUNCTION wolfBoot_start(void)
             dts_size = (uint32_t)os_image.fw_size;
 
             wolfBoot_printf("Loading DTS (size %lu) to RAM at %08lx\n",
-                    dts_size, dts_addr);
+                (long unsigned int)dts_size, (long unsigned int)dts_addr);
             ext_flash_check_read((uintptr_t)os_image.fw_base,
                     (uint8_t*)dts_addr, dts_size);
         }
@@ -331,7 +331,7 @@ void RAMFUNCTION wolfBoot_start(void)
                     uint8_t* dts_dst = (uint8_t*)WOLFBOOT_LOAD_DTS_ADDRESS;
                     dts_size = (uint32_t)ret;
                     wolfBoot_printf("Loading DTB (size %d) from %p to RAM at %p\n",
-                        dts_size, dts_addr, WOLFBOOT_LOAD_DTS_ADDRESS);
+                        dts_size, dts_addr, (void*)WOLFBOOT_LOAD_DTS_ADDRESS);
                     memcpy(dts_dst, dts_addr, dts_size);
                     dts_addr = dts_dst;
                 }