Merge git://git.denx.de/u-boot-imx

diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c
index 9290918dca225b7fa0ea2c706a51d06deb4d31a6..1d4ebfe3439ff1fb078ca820674fcdd957b058f8 100644 (file)
--- a/arch/arm/mach-imx/syscounter.c
+++ b/arch/arm/mach-imx/syscounter.c
@@ -62,7 +62,7 @@ int timer_init(void)
        unsigned long val, freq;
 
        freq = CONFIG_SC_TIMER_CLK;
-       asm("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq));
+       asm volatile("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq));
 
        writel(freq, &sctr->cntfid0);
 
@@ -82,7 +82,7 @@ unsigned long long get_ticks(void)
 {
        unsigned long long now;
 
-       asm("mrrc p15, 0, %Q0, %R0, c14" : "=r" (now));
+       asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (now));
 
        gd->arch.tbl = (unsigned long)(now & 0xffffffff);
        gd->arch.tbu = (unsigned long)(now >> 32);

diff --git a/tools/imximage.c b/tools/imximage.c
index eb7e682038d0c7f83e7c2e1f74cd31ccb6c6cc42..ed9d93590316614bc8880ea94b51385b2f66b8ba 100644 (file)
--- a/tools/imximage.c
+++ b/tools/imximage.c
@@ -777,11 +777,6 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name)
        (*set_dcd_rst)(imxhdr, dcd_len, name, lineno);
        fclose(fd);
 
-       /* Exit if there is no BOOT_FROM field specifying the flash_offset */
-       if (imximage_ivt_offset == FLASH_OFFSET_UNDEFINED) {
-               fprintf(stderr, "Error: No BOOT_FROM tag in %s\n", name);
-               exit(EXIT_FAILURE);
-       }
        return dcd_len;
 }