From 7d1fe0e66e9537c05a2abff6f16c555ddff63bad Mon Sep 17 00:00:00 2001 From: Ye Li Date: Wed, 22 Apr 2020 02:29:20 -0700 Subject: [PATCH] MLK-23574-40 imx8: Rename boot_pointer to share optee codes To share some common optee codes for iMX8 and iMX8M, we need same name for parameters passed from ATF. Currently iMX8 uses boot_pointer but iMX8M use rom_pointer. So rename boot_pointer to rom_pointer. Signed-off-by: Ye Li (cherry picked from commit 47a04423cb09d84ba7558ba9570515901f124c0f) --- arch/arm/include/asm/arch-imx8/sys_proto.h | 2 +- arch/arm/mach-imx/imx8/cpu.c | 4 ++-- arch/arm/mach-imx/imx8/lowlevel_init.S | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/arch-imx8/sys_proto.h b/arch/arm/include/asm/arch-imx8/sys_proto.h index 6f1fc8f999..e4bd296173 100644 --- a/arch/arm/include/asm/arch-imx8/sys_proto.h +++ b/arch/arm/include/asm/arch-imx8/sys_proto.h @@ -21,7 +21,7 @@ struct pass_over_info_t { u32 g_ap_mu; }; -extern unsigned long boot_pointer[]; +extern unsigned long rom_pointer[]; void build_info(void); enum boot_device get_boot_device(void); int print_bootinfo(void); diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index 8b437154ec..e314abe141 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -424,8 +424,8 @@ static sc_faddr_t reserve_optee_shm(sc_faddr_t addr_start) * optee, optee driver will memremap it and can't be used by system malloc. */ - sc_faddr_t optee_start = boot_pointer[0]; - sc_faddr_t optee_size = boot_pointer[1]; + sc_faddr_t optee_start = rom_pointer[0]; + sc_faddr_t optee_size = rom_pointer[1]; if (optee_size && optee_start <= addr_start && addr_start < optee_start + optee_size) { diff --git a/arch/arm/mach-imx/imx8/lowlevel_init.S b/arch/arm/mach-imx/imx8/lowlevel_init.S index a66243c5e4..84798eab6b 100644 --- a/arch/arm/mach-imx/imx8/lowlevel_init.S +++ b/arch/arm/mach-imx/imx8/lowlevel_init.S @@ -6,8 +6,8 @@ #include .align 8 -.global boot_pointer -boot_pointer: +.global rom_pointer +rom_pointer: .space 32 /* @@ -17,7 +17,7 @@ boot_pointer: .global save_boot_params save_boot_params: /* The firmware provided ATAG/FDT address can be found in r2/x0 */ - adr x0, boot_pointer + adr x0, rom_pointer stp x1, x2, [x0], #16 stp x3, x4, [x0], #16 -- 2.17.1