firmware: Fix typos in debug messages. Unused include in main.c

Change-Id: I685f9ccca4873fceb555a3717dc165f14cce9fea

Author: 7134956

firmware/programmer/main.c

@@ -11,7 +11,6 @@
 #include "jtag.h"
 #include "version.h"
 #include "clock.h"
-#include "spi_flash.h"
 #include <stdio.h>
 
 int main()

firmware/programmer/nand_programmer.c

@@ -468,7 +468,7 @@ static int _np_cmd_nand_erase(np_prog_t *prog)
     skip_bb = erase_cmd->flags.skip_bb;
     inc_spare = erase_cmd->flags.inc_spare;
 
-    DEBUG_PRINT("Erase at 0x%" PRIx64 " %" PRIx64 " bytes command\r\n", addr,
+    DEBUG_PRINT("Erase at 0x%" PRIx64 " 0x%" PRIx64 " bytes command\r\n", addr,
         len);
 
     pages_in_block = prog->chip_info.block_size / prog->chip_info.page_size;
@@ -1056,7 +1056,7 @@ static void np_print_chip_info(np_prog_t *prog)
 {
     DEBUG_PRINT("Page size: %lu\r\n", prog->chip_info.page_size);
     DEBUG_PRINT("Block size: %lu\r\n", prog->chip_info.block_size);
-    DEBUG_PRINT("Total size: %" PRIx64 "\r\n", prog->chip_info.total_size);
+    DEBUG_PRINT("Total size: 0x%" PRIx64 "\r\n", prog->chip_info.total_size);
     DEBUG_PRINT("Spare size: %lu\r\n", prog->chip_info.spare_size);    
     DEBUG_PRINT("Bad block mark offset: %d\r\n", prog->chip_info.bb_mark_off);
 }