diff options
author | Tom Rini <trini@konsulko.com> | 2016-06-06 13:24:23 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-06-06 13:39:43 -0400 |
commit | d77fa2ff766bbb4b867e791187f78b6033071613 (patch) | |
tree | b1116470884e46c0a66c49525771cf9b49c3835d /arch/arm/mach-exynos/soc.c | |
parent | 65eac4cc54921f9496061b0e0f0a7e159b42a3c6 (diff) | |
parent | 086e13c5f6f79a68246d6b803cf4736cb6815e44 (diff) | |
download | talos-obmc-uboot-d77fa2ff766bbb4b867e791187f78b6033071613.tar.gz talos-obmc-uboot-d77fa2ff766bbb4b867e791187f78b6033071613.zip |
Merge http://git.denx.de/u-boot-samsung
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/peach-pi_defconfig
configs/peach-pit_defconfig
Diffstat (limited to 'arch/arm/mach-exynos/soc.c')
-rw-r--r-- | arch/arm/mach-exynos/soc.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c index 0f116b141a..f9c7468611 100644 --- a/arch/arm/mach-exynos/soc.c +++ b/arch/arm/mach-exynos/soc.c @@ -11,7 +11,9 @@ void reset_cpu(ulong addr) { +#ifdef CONFIG_CPU_V7 writel(0x1, samsung_get_base_swreset()); +#endif } #ifndef CONFIG_SYS_DCACHE_OFF @@ -21,3 +23,11 @@ void enable_caches(void) dcache_enable(); } #endif + +#ifdef CONFIG_ARM64 +void lowlevel_init(void) +{ + armv8_switch_to_el2(); + armv8_switch_to_el1(); +} +#endif |