Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master

[karo-tx-uboot.git] / tools / img2srec.c

diff --git a/tools/img2srec.c b/tools/img2srec.c
index 330ae02ecfc043fadf9dec8606eeb6f748090fd3..b04abbd8b48976885e60340fe39432f2cad67652 100644 (file)
--- a/tools/img2srec.c
+++ b/tools/img2srec.c
@@ -351,34 +351,34 @@ static void ConvertELF(char* fileName, DWORD loadOffset)
   loadAddr  =  0;
   for (i = 0; i < elfHeader.e_shnum; i++) {
     if (    (sectHeader[i].sh_type == SHT_PROGBITS)
-         && (sectHeader[i].sh_size != 0)
-         ) {
+        && (sectHeader[i].sh_size != 0)
+        ) {
       loadSize = sectHeader[i].sh_size;
       if (sectHeader[i].sh_flags != 0) {
-        loadAddr = sectHeader[i].sh_addr;
-        loadDiff = loadAddr - sectHeader[i].sh_offset;
+       loadAddr = sectHeader[i].sh_addr;
+       loadDiff = loadAddr - sectHeader[i].sh_offset;
       } /* if */
       else {
-        loadAddr = sectHeader[i].sh_offset + loadDiff;
+       loadAddr = sectHeader[i].sh_offset + loadDiff;
       } /* else */
 
       if (loadAddr < firstAddr)
-        firstAddr = loadAddr;
+       firstAddr = loadAddr;
 
       /* build s-records */
       loadSize = sectHeader[i].sh_size;
       fseek(file, sectHeader[i].sh_offset, SEEK_SET);
       while (loadSize) {
-        rxCount = fread(rxBlock, 1, (loadSize > 32) ? 32 : loadSize, file);
-        if (rxCount < 0) {
-          fclose(file);
-          fprintf (stderr, "*** illegal file format\n");
-        return;
-        } /* if */
-        (void)BuildSRecord(srecLine, 3, loadAddr + loadOffset, rxBlock, rxCount);
-        loadSize -= rxCount;
-        loadAddr += rxCount;
-        printf("%s\r\n",srecLine);
+       rxCount = fread(rxBlock, 1, (loadSize > 32) ? 32 : loadSize, file);
+       if (rxCount < 0) {
+         fclose(file);
+         fprintf (stderr, "*** illegal file format\n");
+       return;
+       } /* if */
+       (void)BuildSRecord(srecLine, 3, loadAddr + loadOffset, rxBlock, rxCount);
+       loadSize -= rxCount;
+       loadAddr += rxCount;
+       printf("%s\r\n",srecLine);
       } /* while */
     } /* if */
   } /* for */