raspi/userland
1
0
Fork 0
mirror of https://github.com/raspberrypi/userland.git synced 2025-12-06 04:49:12 +00:00
Code Issues Projects Releases Wiki Activity

userland: dtoverlay: Use os_prefix if set

Browse Source 
It's helpful if the dtoverlay and dtparam commands look in the right
place for overlays and the README. Make them check for and use
/proc/device-tree/chosen/os_prefix.
This commit is contained in:
Phil Elwell
2023-04-19 11:38:04 +01:00
committed by Dom Cobley
parent 9d5250fd98
commit cc1ca18fb0
3 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
host_applications/linux/apps/dtoverlay/dtoverlay_main.c
View File

@@ -218,12 +218,19 @@ int main(int argc, const char **argv)
if (!overlay_src_dir)
{
/* Find the overlays and README */
const char *os_prefix;
int i;
/* Check for an os_prefix value */
os_prefix = read_file_as_string("/proc/device-tree/chosen/os_prefix",
NULL);
if (!os_prefix)
os_prefix = "";
for (i = 0; boot_dirs[i]; i++)
{
overlay_src_dir = sprintf_dup("%s/" OVERLAY_SRC_SUBDIR,
boot_dirs[i]);
overlay_src_dir = sprintf_dup("%s/%s" OVERLAY_SRC_SUBDIR,
boot_dirs[i], os_prefix);
if (dir_exists(overlay_src_dir))
break;
free_string(overlay_src_dir);
@@ -267,29 +274,8 @@ int main(int argc, const char **argv)
}
if (!platform_string)
{
FILE *fp = fopen("/proc/device-tree/compatible", "r");
if (fp)
{
long len;
long bytes_read;
char *prop_buf;
fseek(fp, 0, SEEK_END);
len = ftell(fp);
fseek(fp, 0, SEEK_SET);
prop_buf = malloc(len);
bytes_read = fread(prop_buf, 1, len, fp);
if (bytes_read == len)
{
platform_string = prop_buf;
platform_string_len = len;
}
else
fatal_error("Failed to read 'compatible' property");
fclose(fp);
}
}
platform_string = read_file_as_string("/proc/device-tree/compatible",
&platform_string_len);
if (platform_string)
dtoverlay_init_map(overlay_src_dir, platform_string, platform_string_len);

27
host_applications/linux/apps/dtoverlay/utils.c
View File

@@ -461,3 +461,30 @@ void fatal_error(const char *fmt, ...)
fprintf(stderr, "\n");
exit(1);
}
char *read_file_as_string(const char *path, int *plen)
{
FILE *fp = fopen(path, "r");
char *string = NULL;
long len = 0;
if (fp)
{
long bytes_read;
fseek(fp, 0, SEEK_END);
len = ftell(fp);
fseek(fp, 0, SEEK_SET);
/* Ensure NUL-termination */
string = malloc(len + 1);
if (!string)
fatal_error("Out of memory", path);
string[len] = 0;
bytes_read = fread(string, 1, len, fp);
if (bytes_read != len)
fatal_error("Failed to read file '%s'", path);
fclose(fp);
}
if (plen)
*plen = (int)len;
return string;
}

1
host_applications/linux/apps/dtoverlay/utils.h
View File

@@ -70,5 +70,6 @@ void string_vec_sort(STRING_VEC_T *vec);
void string_vec_uninit(STRING_VEC_T *vec);
int error(const char *fmt, ...);
void fatal_error(const char *fmt, ...);
char *read_file_as_string(const char *path, int *plen);
#endif