Module Name: src
Committed By: skrll
Date: Sun Oct 28 13:56:21 UTC 2018
Modified Files:
src/sys/arch/arm/sunxi: sunxi_platform.c
Log Message:
Restore pre-generic arm commit bootstrap behaviour.
Always call arm_fdt_cpu_bootstrap, i.e. don't depend on "/chosen" existing
in the FDT
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/sunxi/sunxi_platform.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_platform.c
diff -u src/sys/arch/arm/sunxi/sunxi_platform.c:1.29 src/sys/arch/arm/sunxi/sunxi_platform.c:1.30
--- src/sys/arch/arm/sunxi/sunxi_platform.c:1.29 Thu Oct 18 09:01:53 2018
+++ src/sys/arch/arm/sunxi/sunxi_platform.c Sun Oct 28 13:56:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_platform.c,v 1.29 2018/10/18 09:01:53 skrll Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.30 2018/10/28 13:56:21 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.29 2018/10/18 09:01:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.30 2018/10/28 13:56:21 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -187,6 +187,8 @@ sunxi_platform_uart_freq(void)
static void
sunxi_platform_bootstrap(void)
{
+ arm_fdt_cpu_bootstrap();
+
void *fdt_data = __UNCONST(fdtbus_get_data());
const int chosen_off = fdt_path_offset(fdt_data, "/chosen");
if (chosen_off < 0)
@@ -207,8 +209,6 @@ sunxi_platform_bootstrap(void)
fdt_setprop_string(fdt_data, chosen_off,
"stdout-path", "serial0:115200n8");
}
-
- arm_fdt_cpu_bootstrap();
}
