diff options
| author | Tom Rini <[email protected]> | 2018-03-09 13:29:58 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-03-09 13:29:58 -0500 |
| commit | 2e5c42c630c4c550abf9d8da8cc11d8a7928ab0a (patch) | |
| tree | 0a1f79b06fb15b43672ca4f7848ec417d412ccce | |
| parent | 48ba1f3c38aebb12e443d5aefd48c5d03283b0c9 (diff) | |
| parent | 314d9f7e3eff41873011d9a0687f469680a00074 (diff) | |
Merge git://git.denx.de/u-boot-imx
| -rw-r--r-- | arch/arm/mach-imx/syscounter.c | 4 | ||||
| -rw-r--r-- | tools/imximage.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c index 9290918dca2..1d4ebfe3439 100644 --- 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 eb7e682038d..ed9d9359031 100644 --- 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; } |