Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/sunxi Restore pre-generic arm commit bootstrap ...



details:   https://anonhg.NetBSD.org/src/rev/555d0cbe83a4
branches:  trunk
changeset: 445416:555d0cbe83a4
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Oct 28 13:56:21 2018 +0000

description:
Restore pre-generic arm commit bootstrap behaviour.

Always call arm_fdt_cpu_bootstrap, i.e. don't depend on "/chosen" existing
in the FDT

diffstat:

 sys/arch/arm/sunxi/sunxi_platform.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r a5001091d21f -r 555d0cbe83a4 sys/arch/arm/sunxi/sunxi_platform.c
--- a/sys/arch/arm/sunxi/sunxi_platform.c       Sun Oct 28 10:21:42 2018 +0000
+++ b/sys/arch/arm/sunxi/sunxi_platform.c       Sun Oct 28 13:56:21 2018 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
 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 @@
                fdt_setprop_string(fdt_data, chosen_off,
                    "stdout-path", "serial0:115200n8");
        }
-
-       arm_fdt_cpu_bootstrap();
 }
 
 



Home | Main Index | Thread Index | Old Index