- remove target specific variant and use target->variant member

[fw/openocd] / src / target / image.c

diff --git a/src/target/image.c b/src/target/image.c
index e7b7067d93fd99933271220c5cec987a2a333d13..fb4d8915acdde57d35ab3b0004585b65d021170b 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -83,15 +83,15 @@ static int autodetect_image_type(image_t *image, char *url)
                LOG_DEBUG("ELF image detected.");
                image->type = IMAGE_ELF;
        }
-       else if  ((buffer[0]==':') /* record start byte */
-               &&(isxdigit(buffer[1]))
-               &&(isxdigit(buffer[2]))
-               &&(isxdigit(buffer[3]))
-               &&(isxdigit(buffer[4]))
-               &&(isxdigit(buffer[5]))
-               &&(isxdigit(buffer[6]))
-               &&(buffer[7]=='0') /* record type : 00 -> 05 */
-               &&(buffer[8]>='0')&&(buffer[8]<'6'))
+       else if ((buffer[0]==':') /* record start byte */
+               &&(isxdigit(buffer[1]))
+               &&(isxdigit(buffer[2]))
+               &&(isxdigit(buffer[3]))
+               &&(isxdigit(buffer[4]))
+               &&(isxdigit(buffer[5]))
+               &&(isxdigit(buffer[6]))
+               &&(buffer[7]=='0') /* record type : 00 -> 05 */
+               &&(buffer[8]>='0')&&(buffer[8]<'6'))
        {
                LOG_DEBUG("IHEX image detected.");
                image->type = IMAGE_IHEX;
@@ -381,7 +381,6 @@ int image_elf_read_headers(image_t *image)
                return ERROR_IMAGE_FORMAT_ERROR;
        }
 
-
        elf->endianness = elf->header->e_ident[EI_DATA];
        if ((elf->endianness!=ELFDATA2LSB)
                 &&(elf->endianness!=ELFDATA2MSB))
@@ -1042,5 +1041,3 @@ int image_calculate_checksum(u8* buffer, u32 nbytes, u32* checksum)
        *checksum = crc;
        return ERROR_OK;
 }
-
-