diff options
author | Juergen Borleis <jbe@pengutronix.de> | 2022-03-21 15:08:54 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-03-28 10:28:00 +0200 |
commit | 42cdd416c6ac515ee524821af4511fda99ae9595 (patch) | |
tree | 7b7f1e34f1273c9b29c0497237192d389b8bdd03 /arch/arm | |
parent | 26dc1bf751724540716a4a17a80f7605ebf61b3a (diff) | |
download | barebox-42cdd416c6ac515ee524821af4511fda99ae9595.tar.gz barebox-42cdd416c6ac515ee524821af4511fda99ae9595.tar.xz |
ARM: webasto-ccbv2: consider the available memory size for optee
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Link: https://lore.barebox.org/20220321140856.59479-1-jbe@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boards/webasto-ccbv2/lowlevel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boards/webasto-ccbv2/lowlevel.c b/arch/arm/boards/webasto-ccbv2/lowlevel.c index 32117b0a77..dfc5c0fd4c 100644 --- a/arch/arm/boards/webasto-ccbv2/lowlevel.c +++ b/arch/arm/boards/webasto-ccbv2/lowlevel.c @@ -32,7 +32,7 @@ static void configure_uart(void) } -static void noinline start_ccbv2(u32 r0) +static void noinline start_ccbv2(u32 r0, unsigned long mem_size) { int tee_size; void *tee; @@ -48,7 +48,7 @@ static void noinline start_ccbv2(u32 r0) */ if(IS_ENABLED(CONFIG_FIRMWARE_CCBV2_OPTEE) && !(r0 > MX6_MMDC_P0_BASE_ADDR - && r0 < MX6_MMDC_P0_BASE_ADDR + SZ_512M)) { + && r0 < MX6_MMDC_P0_BASE_ADDR + mem_size)) { get_builtin_firmware(ccbv2_optee_bin, &tee, &tee_size); memset((void *)OPTEE_OVERLAY_LOCATION, 0, 0x1000); @@ -70,7 +70,7 @@ ENTRY_FUNCTION(start_imx6ul_ccbv2_256m, r0, r1, r2) setup_c(); barrier(); - start_ccbv2(r0); + start_ccbv2(r0, SZ_256M); } ENTRY_FUNCTION(start_imx6ul_ccbv2_512m, r0, r1, r2) @@ -84,5 +84,5 @@ ENTRY_FUNCTION(start_imx6ul_ccbv2_512m, r0, r1, r2) setup_c(); barrier(); - start_ccbv2(r0); + start_ccbv2(r0, SZ_512M); } |