summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Schaefer <daniel.schaefer@hpe.com>2021-05-19 10:54:09 +0300
committerAnup Patel <anup@brainfault.org>2021-05-19 15:04:06 +0300
commitee7c2b27ea8d875db8d7d39116432d9958267415 (patch)
tree2dd2561a5de56fc653ae49e531eddfecd695fdf5
parentc9ef2bc7e4fd805325d4466ea7d42cc36980862d (diff)
downloadopensbi-ee7c2b27ea8d875db8d7d39116432d9958267415.tar.xz
lib: utils/fdt: Don't use sbi_string functions
When SBI is built by external firmware, we need to use their functions, defined in libfdt_env.h. Just like 2cfd2fc9048806353298a1b967abf985901e36e8 Signed-off-by: Daniel Schaefer <daniel.schaefer@hpe.com> Reviewed-by: Abner Chang <abner.chang@hpe.com> Reviewed-by: Xiang W <wxjstz@126.com> Reviewed-by: Anup Patel <anup.patel@wdc.com>
-rw-r--r--lib/utils/fdt/fdt_domain.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/utils/fdt/fdt_domain.c b/lib/utils/fdt/fdt_domain.c
index 95c195d..fc8ad42 100644
--- a/lib/utils/fdt/fdt_domain.c
+++ b/lib/utils/fdt/fdt_domain.c
@@ -9,6 +9,7 @@
*/
#include <libfdt.h>
+#include <libfdt_env.h>
#include <sbi/sbi_domain.h>
#include <sbi/sbi_error.h>
#include <sbi/sbi_hartmask.h>
@@ -95,7 +96,7 @@ static int __fixup_find_domain_offset(void *fdt, int doff, void *p)
{
struct __fixup_find_domain_offset_info *fdo = p;
- if (!sbi_strcmp(fdo->name, fdt_get_name(fdt, doff, NULL)))
+ if (!strcmp(fdo->name, fdt_get_name(fdt, doff, NULL)))
*fdo->doffset = doff;
return 0;
@@ -287,7 +288,7 @@ static int __fdt_parse_domain(void *fdt, int domain_offset, void *opaque)
regions = &fdt_regions[fdt_domains_count][0];
/* Read DT node name */
- sbi_strncpy(dom->name, fdt_get_name(fdt, domain_offset, NULL),
+ strncpy(dom->name, fdt_get_name(fdt, domain_offset, NULL),
sizeof(dom->name));
dom->name[sizeof(dom->name) - 1] = '\0';
@@ -313,7 +314,7 @@ static int __fdt_parse_domain(void *fdt, int domain_offset, void *opaque)
/* Setup memregions from DT */
val32 = 0;
- sbi_memset(regions, 0,
+ memset(regions, 0,
sizeof(*regions) * (FDT_DOMAIN_REGION_MAX_COUNT + 1));
dom->regions = regions;
err = fdt_iterate_each_memregion(fdt, domain_offset, &val32,
@@ -337,7 +338,7 @@ static int __fdt_parse_domain(void *fdt, int domain_offset, void *opaque)
continue;
if (FDT_DOMAIN_REGION_MAX_COUNT <= val32)
return SBI_EINVAL;
- sbi_memcpy(&regions[val32++], reg, sizeof(*reg));
+ memcpy(&regions[val32++], reg, sizeof(*reg));
}
/* Read "boot-hart" DT property */