summaryrefslogtreecommitdiffstats
path: root/bsps/shared
diff options
context:
space:
mode:
Diffstat (limited to 'bsps/shared')
-rw-r--r--bsps/shared/start/bsp-fdt.c8
-rw-r--r--bsps/shared/start/bspfatal-default.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/bsps/shared/start/bsp-fdt.c b/bsps/shared/start/bsp-fdt.c
index 75a1ea41c9..f532247b2a 100644
--- a/bsps/shared/start/bsp-fdt.c
+++ b/bsps/shared/start/bsp-fdt.c
@@ -32,6 +32,10 @@
#include <bsp/fdt.h>
#include <bsp/linker-symbols.h>
+#ifdef BSP_DTB_IS_SUPPORTED
+#include BSP_DTB_HEADER_PATH
+#endif
+
#ifndef BSP_FDT_IS_SUPPORTED
#warning "BSP FDT support indication not defined"
#endif
@@ -76,5 +80,9 @@ void bsp_fdt_copy(const void *src)
const void *bsp_fdt_get(void)
{
+#ifdef BSP_DTB_IS_SUPPORTED
+ return system_dtb;
+#else
return &bsp_fdt_blob[0];
+#endif
}
diff --git a/bsps/shared/start/bspfatal-default.c b/bsps/shared/start/bspfatal-default.c
index 28f492dee1..9e109c4eb7 100644
--- a/bsps/shared/start/bspfatal-default.c
+++ b/bsps/shared/start/bspfatal-default.c
@@ -153,7 +153,7 @@ void bsp_fatal_extension(
_Thread_Get_name( executing, name, sizeof( name ) );
printk(
- "executing thread ID: 0x08%" PRIx32 "\n"
+ "executing thread ID: 0x%08" PRIx32 "\n"
"executing thread name: %s\n",
executing->Object.id,
name