Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-12-20 18:53:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

kboot: Try isp/isp0 for reserving firmware

Browse source 
Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2023-09-10 22:52:09 +09:00
parent 35c869cfe6
commit 78ca54afdc
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/kboot.c
View file

@ -1517,7 +1517,7 @@ static int dt_vram_reserved_region(const char *dcp_alias, const char *disp_alias
disp_reserved_regions_vram, &region, 1); disp_reserved_regions_vram, &region, 1);
} }
static int dt_reserve_asc_firmware(const char *adt_path, const char *fdt_path, bool remap) static int dt_reserve_asc_firmware(const char *adt_path, const char *adt_path_alt, const char *fdt_path, bool remap)
{ {
int ret = 0; int ret = 0;
@ -1528,6 +1528,8 @@ static int dt_reserve_asc_firmware(const char *adt_path, const char *fdt_path, b
} }
int node = adt_path_offset(adt, adt_path); int node = adt_path_offset(adt, adt_path);
if (node < 0 && adt_path_alt)
node = adt_path_offset(adt, adt_path_alt);
if (node < 0) if (node < 0)
bail("ADT: '%s' not found\n", adt_path); bail("ADT: '%s' not found\n", adt_path);
@ -2159,11 +2161,11 @@ int kboot_prepare_dt(void *fdt)
return -1; return -1;
if (dt_disable_missing_devs("i2c", "i2c@", 8)) if (dt_disable_missing_devs("i2c", "i2c@", 8))
return -1; return -1;
if (dt_reserve_asc_firmware("/arm-io/sio", "sio", true)) if (dt_reserve_asc_firmware("/arm-io/sio", NULL, "sio", true))
return -1; return -1;
if (dt_set_sio_fwdata()) if (dt_set_sio_fwdata())
return -1; return -1;
if (dt_reserve_asc_firmware("/arm-io/isp", "isp", false)) if (dt_reserve_asc_firmware("/arm-io/isp", "/arm-io/isp0", "isp", false))
return -1; return -1;
if (dt_set_isp_fwdata()) if (dt_set_isp_fwdata())
return -1; return -1;