diff options
| author |   kettenis <kettenis@openbsd.org> | 2019-10-25 10:17:06 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2019-10-25 10:17:06 +0000 |
| commit | 917650c7c96cccfa49474dc06ad5a21c74035c32 (patch) | |
| tree | 0b32236b2c01b2b5c1ee302b0d45bfa24450a785 | |
| parent | Make it possible to switch to framebuffer "glass" console in case it (diff) | |
| download | wireguard-openbsd-917650c7c96cccfa49474dc06ad5a21c74035c32.tar.xz wireguard-openbsd-917650c7c96cccfa49474dc06ad5a21c74035c32.zip | |
Add glass console for armv7. Similar to what we did on arm64 two years ago.
ok patrick@
| -rw-r--r-- | sys/arch/armv7/armv7/armv7var.h | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/armv7/platform.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/arch/armv7/armv7/armv7var.h b/sys/arch/armv7/armv7/armv7var.h index d006001b095..9ab3a858392 100644 --- a/sys/arch/armv7/armv7/armv7var.h +++ b/sys/arch/armv7/armv7/armv7var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7var.h,v 1.15 2016/10/23 19:05:09 kettenis Exp $ */ +/* $OpenBSD: armv7var.h,v 1.16 2019/10/25 10:17:06 kettenis Exp $ */ /* * Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com> * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se> @@ -19,6 +19,8 @@ #ifndef __ARMV7VAR_H__ #define __ARMV7VAR_H__ +extern struct bus_space armv7_bs_tag; + /* Boards device list */ struct board_dev { char *name; diff --git a/sys/arch/armv7/armv7/platform.c b/sys/arch/armv7/armv7/platform.c index 8653f074da9..5816bd9cb5d 100644 --- a/sys/arch/armv7/armv7/platform.c +++ b/sys/arch/armv7/armv7/platform.c @@ -1,4 +1,4 @@ -/* $OpenBSD: platform.c,v 1.23 2017/09/08 05:36:51 deraadt Exp $ */ +/* $OpenBSD: platform.c,v 1.24 2019/10/25 10:17:06 kettenis Exp $ */ /* * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se> * @@ -31,10 +31,11 @@ static struct armv7_platform *platform; void agtimer_init(void); -void exuart_init_cons(void); -void imxuart_init_cons(void); -void com_fdt_init_cons(void); -void pluart_init_cons(void); +extern void exuart_init_cons(void); +extern void imxuart_init_cons(void); +extern void com_fdt_init_cons(void); +extern void pluart_init_cons(void); +extern void simplefb_init_cons(bus_space_tag_t); struct armv7_platform *omap_platform_match(void); @@ -91,6 +92,7 @@ platform_init_cons(void) imxuart_init_cons(); com_fdt_init_cons(); pluart_init_cons(); + simplefb_init_cons(&armv7_bs_tag); } void |