diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-18 05:15:23 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-18 05:15:23 +0300 |
| commit | fd8adc33b8f999cb09c3ba8ea8860ded28e8d6ca (patch) | |
| tree | 0928b768f2cf5951384fedb5aa25ce9260a6d6b2 /arch | |
| parent | 14b254b5f5a841e1227e3667cf94fbcdadaf720e (diff) | |
| parent | 677dac23d8ebfc0342f903aeee2a75e737fd4d7e (diff) | |
| download | u-boot-fd8adc33b8f999cb09c3ba8ea8860ded28e8d6ca.tar.xz | |
Merge tag 'dm-pull-14nov19' of git://git.denx.de/u-boot-dm
Add OP-TEE test swuit
Fix patman cc_file output
Minor sandbox/pinctrl changes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sandbox/cpu/os.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index 47dfb476d3..79094fb7f3 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -816,10 +816,10 @@ void *os_find_text_base(void) char *end = memchr(line, '-', len); if (end) { - unsigned long long addr; + uintptr_t addr; *end = '\0'; - if (sscanf(line, "%llx", &addr) == 1) + if (sscanf(line, "%zx", &addr) == 1) base = (void *)addr; } } |