diff options
| author | Tom Rini <trini@konsulko.com> | 2022-08-31 19:32:31 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-08-31 19:32:31 -0400 |
| commit | 4e10c1227aa879af809b3073bf917289f23e17d7 (patch) | |
| tree | 682c915d732c07d017a00278ae76fdea6f00b003 /arch/arm/lib/semihosting.c | |
| parent | 1573b6a86993fcf80d4badc866a46b78df7e6bda (diff) | |
| parent | f4b540e25c5c63fd55a80c78a22b2f69ecb848f8 (diff) | |
Merge branch '2022-08-31-assorted-fixes'
- Assorted bugfixes including re-working the i2c command CVE and fixing
some TI reference platforms with different EEPROMs.
Diffstat (limited to 'arch/arm/lib/semihosting.c')
| -rw-r--r-- | arch/arm/lib/semihosting.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c index dbea2b06fb2..01d652a6b83 100644 --- a/arch/arm/lib/semihosting.c +++ b/arch/arm/lib/semihosting.c @@ -32,12 +32,12 @@ static noinline long smh_trap(unsigned int sysnum, void *addr) { register long result asm("r0"); #if defined(CONFIG_ARM64) - asm volatile ("hlt #0xf000" : "=r" (result) : "0"(sysnum), "r"(addr)); + asm volatile ("hlt #0xf000" : "=r" (result) : "0"(sysnum), "r"(addr) : "memory"); #elif defined(CONFIG_CPU_V7M) - asm volatile ("bkpt #0xAB" : "=r" (result) : "0"(sysnum), "r"(addr)); + asm volatile ("bkpt #0xAB" : "=r" (result) : "0"(sysnum), "r"(addr) : "memory"); #else /* Note - untested placeholder */ - asm volatile ("svc #0x123456" : "=r" (result) : "0"(sysnum), "r"(addr)); + asm volatile ("svc #0x123456" : "=r" (result) : "0"(sysnum), "r"(addr) : "memory"); #endif return result; } |