mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-25 13:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Rini 2018-03-09 13:29:58 -05:00
commit 2e5c42c630
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-imx/syscounter.c
View File

@ -62,7 +62,7 @@ int timer_init(void)
unsigned long val, freq; unsigned long val, freq;
freq = CONFIG_SC_TIMER_CLK; 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); writel(freq, &sctr->cntfid0);
@ -82,7 +82,7 @@ unsigned long long get_ticks(void)
{ {
unsigned long long now; 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.tbl = (unsigned long)(now & 0xffffffff);
gd->arch.tbu = (unsigned long)(now >> 32); gd->arch.tbu = (unsigned long)(now >> 32);

5
tools/imximage.c
View File

@ -777,11 +777,6 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name)
(*set_dcd_rst)(imxhdr, dcd_len, name, lineno); (*set_dcd_rst)(imxhdr, dcd_len, name, lineno);
fclose(fd); 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; return dcd_len;
} }