diff options
| author | Tom Rini <trini@konsulko.com> | 2024-06-24 13:34:52 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-06-24 13:34:52 -0600 |
| commit | a7eada24327a40f7ef6c55c220e119839c9d4227 (patch) | |
| tree | efbea0c3cb6845fe9b5841b100c2770a60cb3f68 /arch/arm/mach-stm32mp/stm32mp1/spl.c | |
| parent | d3c610fa462a76880845920e7c535133a264448a (diff) | |
| parent | 9e9f78f7aa0124ef0e622532043acf87e84008dc (diff) | |
Merge tag 'v2024.07-rc5' into next
Prepare v2024.07-rc5
Diffstat (limited to 'arch/arm/mach-stm32mp/stm32mp1/spl.c')
| -rw-r--r-- | arch/arm/mach-stm32mp/stm32mp1/spl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-stm32mp/stm32mp1/spl.c b/arch/arm/mach-stm32mp/stm32mp1/spl.c index 7a8fd3178ad..6eae5c2f557 100644 --- a/arch/arm/mach-stm32mp/stm32mp1/spl.c +++ b/arch/arm/mach-stm32mp/stm32mp1/spl.c @@ -118,7 +118,7 @@ static int optee_get_reserved_memory(uint32_t *start, uint32_t *size) node = ofnode_path("/reserved-memory/optee"); if (!ofnode_valid(node)) - return 0; + return -ENOENT; fdt_start = ofnode_get_addr_size(node, "reg", &fdt_mem_size); *start = fdt_start; @@ -134,7 +134,7 @@ void stm32_init_tzc_for_optee(void) { const uint32_t dram_size = stm32mp_get_dram_size(); const uintptr_t dram_top = STM32_DDR_BASE + (dram_size - 1); - uint32_t optee_base, optee_size, tee_shmem_base; + u32 optee_base = 0, optee_size = 0, tee_shmem_base; const uintptr_t tzc = STM32_TZC_BASE; int ret; |