Merge remote-tracking branch 'igrr/master'

Author: Me No Dev

README.md

@@ -26,7 +26,8 @@ Argument | Description
 ```-bz <512K|256K|1M|2M|4M|8M|16M|32M>``` | Set the flash chip size. Default is 512K.
 ```-bf <40|26|20|80>``` | Set the flash chip frequency, in MHz. Default is 40M.
 ```-bs <section>``` | Read the specified section from the ELF file and append it to the firmware image. Sections will appear in the firmware image in the exact same order as the -bs commands are executed.
-```-bp <size>``` | Pad last written section of firmware image to the given size, in bytes.
+```-bp <size>``` | Finalize the firmware image, padding it with `0xaa` value until it is at least `<size>` bytes long. Unlike `-bc`, this doesn't close the file. This option can be used to combine bootloader with the rest of the application
+```-br <size>``` | Pad all the following sections to multiples of `<size>`. Default is 4 bytes. This option can be used to place sections on specific boundaries, e.g. 4k or 64k.
 ```-bc``` | Close the firmware image and save the result as file to disk.
 ```-v``` | Increase verbosity level of the tool. Add more v's to increase it even more, e.g. -vv, -vvv.
 ```-q``` | Disable most of the output.

appveyor.yml

@@ -11,7 +11,7 @@ matrix:
 
 build_script:
     - SET PATH=C:\MinGW\bin;C:\MinGW\msys\1.0\bin;%PATH%
-    - make all
+    - make all CC=gcc
     - for /f %%i in ('git describe --always') do set PRODUCT_VERSION=%%i
     - SET PRODUCT_NAME=esptool-%PRODUCT_VERSION%
     - SET PLATFORM_NAME=win32

argparse/argparse.c

@@ -78,7 +78,13 @@ they are given.\n\
     same order as the -bs commands are executed.\n\
 \n\
 -bp <size>\n\
-    Pad last written section of firmware image to the given size, in bytes.\n\
+    Finalize the firmware image, padding it with '0xaa' value until it is at least\n\
+    <size> bytes long. Unlike -bc, this doesn't close the file.\n\
+    This option can be used to combine bootloader with the rest of the application\n\
+\n\
+-br <size>\n\
+    Pad all the following sections to multiples of <size>. Default is 4 bytes.\n\
+    This option can be used to place sections on specific boundaries, e.g. 4k or 64k.\n\
 \n\
 -bc\n\
     Close the firmware image and save the result as file to disk.\n\

argparse/argparse_binimagecmd.c

@@ -30,6 +30,8 @@
 #include "esptool_elf_object.h"
 #include "esptool_binimage.h"
 
+static unsigned section_pad_size = 4;
+
 static int argparse_binimagecmd_add_segment(const char *sname, uint32_t padsize)
 {
     uint32_t snum;
@@ -93,7 +95,7 @@ int argparse_binimagecmd(int num_args, char **arg_ptr)
                 {
                     return 0;
                 }
-                if(argparse_binimagecmd_add_segment(arg_ptr[0], 4))
+                if(argparse_binimagecmd_add_segment(arg_ptr[0], section_pad_size))
                 {
                     bimage_set_entry(get_elf_entry());
                     return 2;
@@ -119,6 +121,14 @@ int argparse_binimagecmd(int num_args, char **arg_ptr)
                 }
                 break;
 
+            case 'r':
+                if(num_args < 1)
+                {
+                    return 0;
+                }
+                section_pad_size = (unsigned) atoi(arg_ptr[0]);    
+                return 2;
+
             case 'm':
                 if (num_args < 1)
                 {
@@ -151,6 +161,17 @@ int argparse_binimagecmd(int num_args, char **arg_ptr)
                     return 0;
                 }
                 return 2;
+
+            case 'l':
+                if (num_args < 1)
+                {
+                    return 0;
+                }
+                if (binimage_set_header_layout(arg_ptr[0]) == 0)
+                {
+                    return 0;
+                }
+                return 2;
 
             default:
                 return 0;

binimage/esptool_binimage.c

@@ -29,14 +29,18 @@
 #include "infohelper.h"
 #include "esptool_binimage.h"
 
+typedef enum { HL_ESP8266, HL_ESP32BOOT, HL_ESP32 } binimage_header_layout_t;
+
 static bin_image b_image = {
  .magic             = 0xe9,
  .num_segments      = 0,
  .flash_mode        = FLASH_MODE_QIO,
  .flash_size_freq   = FLASH_SIZE_512K | FLASH_FREQ_40
 };
 
-unsigned int total_size = 0;
+static unsigned int total_size = 0;
+static binimage_header_layout_t header_layout = HL_ESP8266;
+
 
 int binimage_add_segment(uint32_t address, uint32_t size, unsigned char *data)
 {
@@ -139,6 +143,22 @@ int binimage_write(uint32_t padsize, bool close)
     }
 
     total_size = 8;
+
+    if (header_layout == HL_ESP32BOOT)
+    {
+        LOGDEBUG("adding extra header for ESP32 boot image");
+        uint8_t extra_header[16];
+        // TODO: replace this dummy 16 byte array with the actual flash_extN_config_hdr structures
+        memset(extra_header, 0, sizeof(extra_header));
+        if(fwrite(extra_header, 1, sizeof(extra_header), b_image.image_file) != sizeof(extra_header))
+        {
+            LOGERR("cant write extra header to binimage file, aborting");
+            fclose(b_image.image_file);
+            b_image.image_file = 0;
+            return 0;
+        }
+        total_size += sizeof(extra_header);        
+    }
 
     for(cnt = 0; cnt < b_image.num_segments; cnt++)
     {
@@ -377,3 +397,21 @@ const char* binimage_flash_freq_to_str(unsigned char freq)
     }
 }
 
+int binimage_set_header_layout(const char* layout)
+{
+    LOGDEBUG("setting header layout to %s", layout);
+    if (strcasecmp(layout, "esp32boot") == 0) {
+        header_layout = HL_ESP32BOOT;
+        return 1;
+    }
+    else if (strcasecmp(layout, "esp8266") == 0) {
+        header_layout = HL_ESP8266;
+        return 1;
+    }
+    else if (strcasecmp(layout, "esp32")) {
+        header_layout = HL_ESP32;
+    }
+    LOGERR("invalid image header layout: %s", layout);
+    return 0;
+}
+

binimage/esptool_binimage.h

@@ -136,6 +136,6 @@ int binimage_add_segment(uint32_t address, uint32_t size, unsigned char *data);
 int binimage_set_flash_mode(const char* mode);
 int binimage_set_flash_size(const char* size);
 int binimage_set_flash_freq(const char* freq);
-
+int binimage_set_header_layout(const char* layout);
 
 #endif

main.c

@@ -59,6 +59,7 @@ int main(int argc, char **argv)
         num_args_parsed = parse_arg(num_args, arg_ptr);
         if(num_args_parsed == 0)
         {
+            LOGERR("Invalid argument or value after %s (argument #%d)", arg_ptr[0], arg_ptr - argv + 1);
             goto EXITERROR;
         }
 
@@ -77,5 +78,5 @@ int main(int argc, char **argv)
 EXITERROR:
     close_elf_object();
     binimage_write_close(16);
-    return -1;
+    return 2;
 }