Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/vexpress No need for console=fb handling with W...



details:   https://anonhg.NetBSD.org/src/rev/da12033e6d6e
branches:  trunk
changeset: 457860:da12033e6d6e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Jul 23 12:34:47 2019 +0000

description:
No need for console=fb handling with WSDISPLAY_MULTICONS

diffstat:

 sys/arch/arm/vexpress/vexpress_platform.c |  14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diffs (42 lines):

diff -r 3689096822ec -r da12033e6d6e sys/arch/arm/vexpress/vexpress_platform.c
--- a/sys/arch/arm/vexpress/vexpress_platform.c Tue Jul 23 12:34:05 2019 +0000
+++ b/sys/arch/arm/vexpress/vexpress_platform.c Tue Jul 23 12:34:47 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vexpress_platform.c,v 1.14 2019/01/31 13:16:31 skrll Exp $ */
+/* $NetBSD: vexpress_platform.c,v 1.15 2019/07/23 12:34:47 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -30,7 +30,7 @@
 #include "opt_console.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.14 2019/01/31 13:16:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.15 2019/07/23 12:34:47 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -58,8 +58,6 @@
 
 #include <libfdt.h>
 
-#define        VEXPRESS_CLCD_NODE_PATH \
-       "/smb@8000000/motherboard/iofpga@3,00000000/clcd@1f0000"
 #define        VEXPRESS_REF_FREQ       24000000
 
 extern struct bus_space armv7_generic_bs_tag;
@@ -188,14 +186,6 @@
 #ifdef MULTIPROCESSOR
        arm_cpu_max = 1 + __SHIFTOUT(armreg_l2ctrl_read(), L2CTRL_NUMCPU);
 #endif
-
-       if (match_bootconf_option(boot_args, "console", "fb")) {
-               void *fdt_data = __UNCONST(fdtbus_get_data());
-               const int chosen_off = fdt_path_offset(fdt_data, "/chosen");
-               if (chosen_off >= 0)
-                       fdt_setprop_string(fdt_data, chosen_off, "stdout-path",
-                           VEXPRESS_CLCD_NODE_PATH);
-       }
 }
 
 static void



Home | Main Index | Thread Index | Old Index