diff options
| author | Tom Rini <[email protected]> | 2019-01-06 19:42:55 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-01-06 19:42:55 -0500 |
| commit | 7e40d0a38fc42de12696c835eded8945d650bfc1 (patch) | |
| tree | e55a3ce84f401b33408e7f46ace7c6c64dbf7a96 /arch | |
| parent | 7b84a20e68af7757fbb5722eb7bc9685000dfbed (diff) | |
| parent | df1ff4d6ba591a5fcb9549e895b23c781d8fda6d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/system.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b5952ad4cca..520ea8bed9c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -607,6 +607,7 @@ config ARCH_EXYNOS select DM_SPI select DM_SPI_FLASH select SPI + imply SYS_THUMB_BUILD imply CMD_DM imply FAT_WRITE diff --git a/arch/arm/mach-exynos/include/mach/system.h b/arch/arm/mach-exynos/include/mach/system.h index 48377819573..48f13c76481 100644 --- a/arch/arm/mach-exynos/include/mach/system.h +++ b/arch/arm/mach-exynos/include/mach/system.h @@ -58,7 +58,7 @@ struct exynos5_sysreg { /* Move 0xd3 value to CPSR register to enable SVC mode */ #define svc32_mode_en() __asm__ __volatile__ \ ("@ I&F disable, Mode: 0x13 - SVC\n\t" \ - "msr cpsr_c, #0x13|0xC0\n\t" : : ) + "msr cpsr_c, %0\n\t" : : "r"(0x13|0xC0)) /* Set program counter with the given value */ #define set_pc(x) __asm__ __volatile__ ("mov pc, %0\n\t" : : "r"(x)) |