diff options
author | Tom Rini <trini@konsulko.com> | 2024-06-14 08:13:54 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-06-14 08:13:54 -0600 |
commit | 2248c96ea1cf0b65377040d9f87ce7d8cf534c63 (patch) | |
tree | 365433ed536985085a2d906e490a826a648a1a54 | |
parent | ca6a992e09441d6cca73439c63c3735f86b36ea4 (diff) | |
parent | 55df13d930f4f191f458a6454f4b8e614e19c215 (diff) | |
download | u-boot-2248c96ea1cf0b65377040d9f87ce7d8cf534c63.zip u-boot-2248c96ea1cf0b65377040d9f87ce7d8cf534c63.tar.gz u-boot-2248c96ea1cf0b65377040d9f87ce7d8cf534c63.tar.bz2 |
Merge tag 'u-boot-stm32-20240614' of https://source.denx.de/u-boot/custodians/u-boot-stm
STM32MP1:
_ Fix spl compilation warning
_ Fix optee_get_reserved_memory()
_ Fix livetree conversion on STM32MP15xx DHSOM
-rw-r--r-- | arch/arm/mach-stm32mp/stm32mp1/spl.c | 4 | ||||
-rw-r--r-- | board/dhelectronics/dh_stm32mp1/board.c | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/arch/arm/mach-stm32mp/stm32mp1/spl.c b/arch/arm/mach-stm32mp/stm32mp1/spl.c index 6c79259..beda69f 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; diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c index 22af423..acfdf2e 100644 --- a/board/dhelectronics/dh_stm32mp1/board.c +++ b/board/dhelectronics/dh_stm32mp1/board.c @@ -76,14 +76,25 @@ static bool dh_stm32_mac_is_in_ks8851(void) { - ofnode node; + struct udevice *udev; u32 reg, cider, ccr; + char path[256]; + ofnode node; + int ret; node = ofnode_path("ethernet1"); if (!ofnode_valid(node)) return false; - if (ofnode_device_is_compatible(node, "micrel,ks8851-mll")) + ret = ofnode_get_path(node, path, sizeof(path)); + if (ret) + return false; + + ret = uclass_get_device_by_of_path(UCLASS_ETH, path, &udev); + if (ret) + return false; + + if (!ofnode_device_is_compatible(node, "micrel,ks8851-mll")) return false; /* |