@@ -19,11 +19,11 @@ struct fdt_serial {
int (*init)(const void *fdt, int nodeoff, const struct fdt_match *match);
};
-int fdt_serial_init(void);
+int fdt_serial_init(const void *fdt);
#else
-static inline int fdt_serial_init(void) { return 0; }
+static inline int fdt_serial_init(const void *fdt) { return 0; }
#endif
@@ -17,13 +17,12 @@
extern struct fdt_serial *fdt_serial_drivers[];
extern unsigned long fdt_serial_drivers_size;
-int fdt_serial_init(void)
+int fdt_serial_init(const void *fdt)
{
const void *prop;
struct fdt_serial *drv;
const struct fdt_match *match;
int pos, noff = -1, len, coff, rc;
- const void *fdt = fdt_get_address();
/* Find offset of node pointed to by stdout-path */
coff = fdt_path_offset(fdt, "/chosen");
@@ -230,7 +230,7 @@ static int generic_early_init(bool cold_boot)
if (semihosting_enabled())
rc = semihosting_init();
else
- rc = fdt_serial_init();
+ rc = fdt_serial_init(fdt);
if (rc)
return rc;
}
Indicate that this function does not modify the FDT blob, and deduplicate the call to fdt_get_address(). Signed-off-by: Samuel Holland <samuel.holland@sifive.com> --- include/sbi_utils/serial/fdt_serial.h | 4 ++-- lib/utils/serial/fdt_serial.c | 3 +-- platform/generic/platform.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)