Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'u-boot-stm32-20240614' of https://source.denx.de/u-boot/custodians/u-boot-stm

Browse Source 
STM32MP1:
 _ Fix spl compilation warning
 _ Fix optee_get_reserved_memory()
 _ Fix livetree conversion on STM32MP15xx DHSOM
This commit is contained in:
Tom Rini
2024-06-14 08:13:54 -06:00
parent ca6a992e09 55df13d930
commit 2248c96ea1
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-stm32mp/stm32mp1/spl.c
View File

@@ -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;

15
board/dhelectronics/dh_stm32mp1/board.c
View File

@@ -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;
/*