diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-15 22:05:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-15 22:05:05 -0500 |
| commit | 0cd35f392000fb0783149d9b5f66c5f2e01bcbf1 (patch) | |
| tree | b2bc80bd79b2ba7aa387abc575630b03b7470c36 /examples/standalone/stubs.c | |
| parent | e807f6b5f9a164dc1fc35e1c733fa343acf335c0 (diff) | |
| parent | 91882c472d8c0aef4db699d3f2de55bf43d4ae4b (diff) | |
Merge git://git.denx.de/u-boot-riscv
1. Improve cache implementation.
2. Fix and improve standalone applications
Diffstat (limited to 'examples/standalone/stubs.c')
| -rw-r--r-- | examples/standalone/stubs.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c index fadde669fa..0827bde35e 100644 --- a/examples/standalone/stubs.c +++ b/examples/standalone/stubs.c @@ -174,16 +174,27 @@ gd_t *global_data; : : "i"(offsetof(gd_t, jt)), "i"(FO(x)) : "$r16"); #elif defined(CONFIG_RISCV) /* - * t7 holds the pointer to the global_data. gp is call clobbered. + * gp holds the pointer to the global_data. t0 is call clobbered. */ +#ifdef CONFIG_ARCH_RV64I #define EXPORT_FUNC(f, a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ -" lw x19, %0(gp)\n" \ -" lw x19, %1(x19)\n" \ -" jr x19\n" \ - : : "i"(offsetof(gd_t, jt)), "i"(FO(x)) : "x19"); +" ld t0, %0(gp)\n" \ +" ld t0, %1(t0)\n" \ +" jr t0\n" \ + : : "i"(offsetof(gd_t, jt)), "i"(FO(x)) : "t0"); +#else +#define EXPORT_FUNC(f, a, x, ...) \ + asm volatile ( \ +" .globl " #x "\n" \ +#x ":\n" \ +" lw t0, %0(gp)\n" \ +" lw t0, %1(t0)\n" \ +" jr t0\n" \ + : : "i"(offsetof(gd_t, jt)), "i"(FO(x)) : "t0"); +#endif #elif defined(CONFIG_ARC) /* * r25 holds the pointer to the global_data. r10 is call clobbered. |