diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:34 +0100 |
| commit | 77d783a5170896aea021ec180e16751a0a249627 (patch) | |
| tree | f61e969576c736cdd4d06f89bf8b8dae22093298 /arch/arm/cpu | |
| parent | 293e981e7452511a876431aa076c0eb256623124 (diff) | |
| parent | af86e3a0548e16dc9cef13debd3d64d9091ba473 (diff) | |
| download | barebox-77d783a5170896aea021ec180e16751a0a249627.tar.gz barebox-77d783a5170896aea021ec180e16751a0a249627.tar.xz | |
Merge branch 'for-next/randfixes'
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/common.c | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/psci.c | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/start-kernel-optee.S | 14 |
4 files changed, 5 insertions, 15 deletions
diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile index 75cd42a5e2..63cf35c299 100644 --- a/arch/arm/cpu/Makefile +++ b/arch/arm/cpu/Makefile @@ -15,7 +15,6 @@ pbl-$(CONFIG_BOARD_ARM_GENERIC_DT_AARCH64) += board-dt-2nd-aarch64.o obj-pbl-y += setupc$(S64).o cache$(S64).o -obj-$(CONFIG_BOOTM_OPTEE) += start-kernel-optee.o obj-$(CONFIG_ARM_PSCI_CLIENT) += psci-client.o # diff --git a/arch/arm/cpu/common.c b/arch/arm/cpu/common.c index c81b2b3791..c7d1709b8b 100644 --- a/arch/arm/cpu/common.c +++ b/arch/arm/cpu/common.c @@ -51,7 +51,11 @@ void pbl_barebox_break(void) { __asm__ __volatile__ ( #ifdef CONFIG_PBL_BREAK +#ifdef CONFIG_CPU_V8 + "brk #17\n" +#else "bkpt #17\n" +#endif "nop\n" #else "nop\n" diff --git a/arch/arm/cpu/psci.c b/arch/arm/cpu/psci.c index 713ab2396c..5a69aaa810 100644 --- a/arch/arm/cpu/psci.c +++ b/arch/arm/cpu/psci.c @@ -227,3 +227,4 @@ static int armv7_psci_init(void) return of_register_fixup(of_psci_do_fixup, NULL); } device_initcall(armv7_psci_init); + diff --git a/arch/arm/cpu/start-kernel-optee.S b/arch/arm/cpu/start-kernel-optee.S deleted file mode 100644 index 92da4b63c9..0000000000 --- a/arch/arm/cpu/start-kernel-optee.S +++ /dev/null @@ -1,14 +0,0 @@ -#include <linux/linkage.h> - -ENTRY(start_kernel_optee) - /* - * r0 = optee - * r1 = kernel - * r2 = oftree - */ - mov r4, r0 - mov r0, #0 - mov lr, r1 - mov r1, #0 - bx r4 -ENDPROC(start_kernel_optee) |