Remove model specific strings keyed off the board id.

We now pull the model string from fdt.

15 files changed, 31 insertions, 183 deletions

diff --git a/sys/arch/armv7/armv7/armv7.c b/sys/arch/armv7/armv7/armv7.c
index 42c7e06421a..c57fb56738a 100644
--- a/sys/arch/armv7/armv7/armv7.c
+++ b/sys/arch/armv7/armv7/armv7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: armv7.c,v 1.13 2016/05/01 21:07:40 patrick Exp $ */
+/* $OpenBSD: armv7.c,v 1.14 2016/06/04 18:09:16 jsg Exp $ */
 /*
  * Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com>
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
@@ -97,20 +97,8 @@ armv7_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct armv7_softc *sc = (struct armv7_softc *)self;
 	struct board_dev *bd;
-	int len;
-	const char *name = platform_board_name();
-
-	if (hw_prod == NULL && name != NULL) {
-		len = strlen(name) + 1;
-		hw_prod = malloc(len, M_DEVBUF, M_NOWAIT);
-		if (hw_prod)
-			strlcpy(hw_prod, name, len);
-	}
 
-	if (name != NULL)
-		printf(": %s\n", name);
-	else
-		printf(": UNKNOWN BOARD %u\n", board_id);
+	printf("\n");
 
 	sc->sc_board_devs = platform_board_devs();
 
diff --git a/sys/arch/armv7/armv7/armv7_machdep.c b/sys/arch/armv7/armv7/armv7_machdep.c
index a71b57e9c4a..27726122941 100644
--- a/sys/arch/armv7/armv7/armv7_machdep.c
+++ b/sys/arch/armv7/armv7/armv7_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: armv7_machdep.c,v 1.27 2016/05/20 11:21:08 kettenis Exp $ */
+/*	$OpenBSD: armv7_machdep.c,v 1.28 2016/06/04 18:09:16 jsg Exp $ */
 /*	$NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
 
 /*
@@ -483,7 +483,7 @@ initarm(void *arg0, void *arg1, void *arg2)
 	consinit();
 
 	/* Talk to the user */
-	printf("\n%s booting ...\n", platform_boot_name());
+	printf("\nOpenBSD/armv7 booting ...\n");
 
 	printf("arg0 %p arg1 %p arg2 %p\n", arg0, arg1, arg2);
 
diff --git a/sys/arch/armv7/armv7/armv7_machdep.h b/sys/arch/armv7/armv7/armv7_machdep.h
index 466b40b5a16..a90676625fb 100644
--- a/sys/arch/armv7/armv7/armv7_machdep.h
+++ b/sys/arch/armv7/armv7/armv7_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: armv7_machdep.h,v 1.6 2016/05/18 22:55:23 kettenis Exp $	*/
+/*	$OpenBSD: armv7_machdep.h,v 1.7 2016/06/04 18:09:16 jsg Exp $	*/
 /*
  * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
  *
@@ -24,13 +24,9 @@ void platform_watchdog_reset(void);
 void platform_init_cons(void);
 void platform_init_mainbus(struct device *);
 void platform_disable_l2_if_needed(void);
-const char *platform_boot_name(void);
-const char *platform_board_name(void);
 struct board_dev *platform_board_devs();
 
 struct armv7_platform {
-	const char *boot_name;
-	const char *(*board_name)(void);
 	struct board_dev *devs;
 	void (*board_init)(void);
 	void (*smc_write)(bus_space_tag_t, bus_space_handle_t, bus_size_t,
diff --git a/sys/arch/armv7/armv7/armv7var.h b/sys/arch/armv7/armv7/armv7var.h
index 7da123df60b..e1e78a5fa55 100644
--- a/sys/arch/armv7/armv7/armv7var.h
+++ b/sys/arch/armv7/armv7/armv7var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: armv7var.h,v 1.11 2016/05/19 09:54:18 jsg Exp $ */
+/* $OpenBSD: armv7var.h,v 1.12 2016/06/04 18:09:16 jsg Exp $ */
 /*
  * Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com>
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
@@ -27,7 +27,6 @@ struct board_dev {
 
 struct armv7_board {
 	uint32_t		board_id;
-	const char		*name;
 	struct board_dev	*devs;
 	void			(*init)(void);
 };
diff --git a/sys/arch/armv7/armv7/platform.c b/sys/arch/armv7/armv7/platform.c
index 83e7928bf5a..073a53f870c 100644
--- a/sys/arch/armv7/armv7/platform.c
+++ b/sys/arch/armv7/armv7/platform.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: platform.c,v 1.5 2016/05/18 22:55:23 kettenis Exp $	*/
+/*	$OpenBSD: platform.c,v 1.6 2016/06/04 18:09:16 jsg Exp $	*/
 /*
  * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
  *
@@ -72,12 +72,6 @@ platform_init(void)
 	platform->board_init();
 }
 
-const char *
-platform_boot_name(void)
-{
-	return platform->boot_name;
-}
-
 void
 platform_smc_write(bus_space_tag_t iot, bus_space_handle_t ioh, bus_size_t off,
     uint32_t op, uint32_t val)
@@ -110,12 +104,6 @@ platform_powerdown(void)
 	platform->powerdown();
 }
 
-const char *
-platform_board_name(void)
-{
-	return (platform->board_name());
-}
-
 void
 platform_disable_l2_if_needed(void)
 {
diff --git a/sys/arch/armv7/exynos/exynos.c b/sys/arch/armv7/exynos/exynos.c
index dfa86147fcf..175888e14cc 100644
--- a/sys/arch/armv7/exynos/exynos.c
+++ b/sys/arch/armv7/exynos/exynos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exynos.c,v 1.11 2016/05/02 15:27:24 patrick Exp $ */
+/* $OpenBSD: exynos.c,v 1.12 2016/06/04 18:09:16 jsg Exp $ */
 /*
  * Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com>
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
@@ -110,23 +110,20 @@ struct board_dev smdkc210_devs[] = {
 struct armv7_board exynos_boards[] = {
 	{
 		BOARD_ID_EXYNOS5_CHROMEBOOK,
-		"Exynos 5 Chromebook",
 		chromebook_devs,
 		exynos5_init,
 	},
 	{
 		BOARD_ID_EXYNOS4_NURI,
-		"Samsung NURI",
 		nuri_devs,
 		exynos4_init,
 	},
 	{
 		BOARD_ID_EXYNOS4_SMDKC210,
-		"Samsung SMDKC210",
 		smdkc210_devs,
 		exynos4_init,
 	},
-	{ 0, NULL, NULL, NULL },
+	{ 0, NULL, NULL },
 };
 
 struct board_dev *
@@ -134,7 +131,7 @@ exynos_board_devs(void)
 {
 	int i;
 
-	for (i = 0; exynos_boards[i].name != NULL; i++) {
+	for (i = 0; exynos_boards[i].board_id != 0; i++) {
 		if (exynos_boards[i].board_id == board_id)
 			return (exynos_boards[i].devs);
 	}
@@ -146,7 +143,7 @@ exynos_board_init(void)
 {
 	int i;
 
-	for (i = 0; exynos_boards[i].name != NULL; i++) {
+	for (i = 0; exynos_boards[i].board_id != 0; i++) {
 		if (exynos_boards[i].board_id == board_id) {
 			exynos_boards[i].init();
 			break;
@@ -154,18 +151,6 @@ exynos_board_init(void)
 	}
 }
 
-const char *
-exynos_board_name(void)
-{
-	int i;
-
-	for (i = 0; exynos_boards[i].name != NULL; i++) {
-		if (exynos_boards[i].board_id == board_id)
-			return (exynos_boards[i].name);
-	}
-	return (NULL);
-}
-
 int
 exynos_match(struct device *parent, void *cfdata, void *aux)
 {
diff --git a/sys/arch/armv7/exynos/exynos_machdep.c b/sys/arch/armv7/exynos/exynos_machdep.c
index b96e246773c..9766982c166 100644
--- a/sys/arch/armv7/exynos/exynos_machdep.c
+++ b/sys/arch/armv7/exynos/exynos_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exynos_machdep.c,v 1.7 2016/05/20 01:42:56 jsg Exp $	*/
+/*	$OpenBSD: exynos_machdep.c,v 1.8 2016/06/04 18:09:16 jsg Exp $	*/
 /*
  * Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -35,7 +35,6 @@
 #include <armv7/armv7/armv7_machdep.h>
 
 extern void exdog_reset(void);
-extern char *exynos_board_name(void);
 extern struct board_dev *exynos_board_devs(void);
 extern void exynos_board_init(void);
 extern int comcnspeed;
@@ -103,12 +102,6 @@ exynos_platform_powerdown(void)
 
 }
 
-const char *
-exynos_platform_board_name(void)
-{
-	return (exynos_board_name());
-}
-
 static void
 exynos_platform_disable_l2_if_needed(void)
 {
@@ -122,8 +115,6 @@ exynos_platform_board_init(void)
 }
 
 struct armv7_platform exynos_platform = {
-	.boot_name = "OpenBSD/exynos",
-	.board_name = exynos_platform_board_name,
 	.board_init = exynos_platform_board_init,
 	.smc_write = exynos_platform_smc_write,
 	.init_cons = exynos_platform_init_cons,
diff --git a/sys/arch/armv7/imx/imx.c b/sys/arch/armv7/imx/imx.c
index fd18ccae155..10f1606cc76 100644
--- a/sys/arch/armv7/imx/imx.c
+++ b/sys/arch/armv7/imx/imx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imx.c,v 1.14 2016/06/03 01:36:46 jsg Exp $ */
+/* $OpenBSD: imx.c,v 1.15 2016/06/04 18:09:16 jsg Exp $ */
 /*
  * Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com>
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
@@ -186,53 +186,45 @@ struct board_dev wandboard_devs[] = {
 struct armv7_board imx_boards[] = {
 	{
 		BOARD_ID_IMX6_CUBOXI,
-		"SolidRun CuBox-i",
 		hummingboard_devs,
 		imx6_init,
 	},
 	{
 		BOARD_ID_IMX6_HUMMINGBOARD,
-		"SolidRun HummingBoard",
 		hummingboard_devs,
 		imx6_init,
 	},
 	{
 		BOARD_ID_IMX6_SABRELITE,
-		"Freescale i.MX6 SABRE Lite",
 		sabrelite_devs,
 		imx6_init,
 	},
 	{
 		BOARD_ID_IMX6_SABRESD,
-		"Freescale i.MX6 SABRE SD",
 		sabresd_devs,
 		imx6_init,
 	},
 	{
 		BOARD_ID_IMX6_UDOO,
-		"Udoo i.MX6",
 		udoo_devs,
 		imx6_init,
 	},
 	{
 		BOARD_ID_IMX6_UTILITE,
-		"CompuLab Utilite",
 		utilite_devs,
 		imx6_init,
 	},
 	{
 		BOARD_ID_IMX6_NOVENA,
-		"Kosagi Novena",
 		novena_devs,
 		imx6_init,
 	},
 	{
 		BOARD_ID_IMX6_WANDBOARD,
-		"Wandboard i.MX6",
 		wandboard_devs,
 		imx6_init,
 	},
-	{ 0, NULL, NULL, NULL },
+	{ 0, NULL, NULL },
 };
 
 struct board_dev *
@@ -240,7 +232,7 @@ imx_board_devs(void)
 {
 	int i;
 
-	for (i = 0; imx_boards[i].name != NULL; i++) {
+	for (i = 0; imx_boards[i].board_id != 0; i++) {
 		if (imx_boards[i].board_id == board_id)
 			return (imx_boards[i].devs);
 	}
@@ -252,7 +244,7 @@ imx_board_init(void)
 {
 	int i;
 
-	for (i = 0; imx_boards[i].name != NULL; i++) {
+	for (i = 0; imx_boards[i].board_id != 0; i++) {
 		if (imx_boards[i].board_id == board_id) {
 			imx_boards[i].init();
 			break;
@@ -260,18 +252,6 @@ imx_board_init(void)
 	}
 }
 
-const char *
-imx_board_name(void)
-{
-	int i;
-
-	for (i = 0; imx_boards[i].name != NULL; i++) {
-		if (imx_boards[i].board_id == board_id)
-			return (imx_boards[i].name);
-	}
-	return (NULL);
-}
-
 int
 imx_match(struct device *parent, void *cfdata, void *aux)
 {
diff --git a/sys/arch/armv7/imx/imx_machdep.c b/sys/arch/armv7/imx/imx_machdep.c
index 79b39002b74..91226433440 100644
--- a/sys/arch/armv7/imx/imx_machdep.c
+++ b/sys/arch/armv7/imx/imx_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imx_machdep.c,v 1.17 2016/05/19 09:54:18 jsg Exp $	*/
+/*	$OpenBSD: imx_machdep.c,v 1.18 2016/06/04 18:09:16 jsg Exp $	*/
 /*
  * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
  *
@@ -34,7 +34,6 @@
 #include <armv7/armv7/armv7_machdep.h>
 
 extern void imxdog_reset(void);
-extern char *imx_board_name(void);
 extern struct board_dev *imx_board_devs(void);
 extern void imx_board_init(void);
 extern int comcnspeed;
@@ -97,12 +96,6 @@ imx_platform_powerdown(void)
 
 }
 
-const char *
-imx_platform_board_name(void)
-{
-	return (imx_board_name());
-}
-
 void
 imx_platform_disable_l2_if_needed(void)
 {
@@ -116,8 +109,6 @@ imx_platform_board_init(void)
 }
 
 struct armv7_platform imx_platform = {
-	.boot_name = "OpenBSD/imx",
-	.board_name = imx_platform_board_name,
 	.board_init = imx_platform_board_init,
 	.smc_write = imx_platform_smc_write,
 	.init_cons = imx_platform_init_cons,
diff --git a/sys/arch/armv7/omap/omap.c b/sys/arch/armv7/omap/omap.c
index 9cb946dfba1..45e4a0d4c2b 100644
--- a/sys/arch/armv7/omap/omap.c
+++ b/sys/arch/armv7/omap/omap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omap.c,v 1.9 2016/05/02 15:27:24 patrick Exp $ */
+/* $OpenBSD: omap.c,v 1.10 2016/06/04 18:09:16 jsg Exp $ */
 /*
  * Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com>
  *
@@ -111,29 +111,25 @@ struct board_dev pandaboard_devs[] = {
 struct armv7_board omap_boards[] = {
 	{
 		BOARD_ID_OMAP3_BEAGLE,
-		"TI OMAP3 BeagleBoard",
 		beagleboard_devs,
 		omap3_init,
 	},
 	{
 		BOARD_ID_AM335X_BEAGLEBONE,
-		"TI AM335x BeagleBone",
 		beaglebone_devs,
 		am335x_init,
 	},
 	{
 		BOARD_ID_OMAP3_OVERO,
-		"Gumstix OMAP3 Overo",
 		overo_devs,
 		omap3_init,
 	},
 	{
 		BOARD_ID_OMAP4_PANDA,
-		"TI OMAP4 PandaBoard",
 		pandaboard_devs,
 		omap4_init,
 	},
-	{ 0, NULL, NULL, NULL },
+	{ 0, NULL, NULL },
 };
 
 struct board_dev *
@@ -141,7 +137,7 @@ omap_board_devs(void)
 {
 	int i;
 
-	for (i = 0; omap_boards[i].name != NULL; i++) {
+	for (i = 0; omap_boards[i].board_id != 0; i++) {
 		if (omap_boards[i].board_id == board_id)
 			return (omap_boards[i].devs);
 	}
@@ -153,7 +149,7 @@ omap_board_init(void)
 {
 	int i;
 
-	for (i = 0; omap_boards[i].name != NULL; i++) {
+	for (i = 0; omap_boards[i].board_id != 0; i++) {
 		if (omap_boards[i].board_id == board_id) {
 			omap_boards[i].init();
 			break;
@@ -161,18 +157,6 @@ omap_board_init(void)
 	}
 }
 
-const char *
-omap_board_name(void)
-{
-	int i;
-
-	for (i = 0; omap_boards[i].name != NULL; i++) {
-		if (omap_boards[i].board_id == board_id)
-			return (omap_boards[i].name);
-	}
-	return (NULL);
-}
-
 int
 omap_match(struct device *parent, void *cfdata, void *aux)
 {
diff --git a/sys/arch/armv7/omap/omap_machdep.c b/sys/arch/armv7/omap/omap_machdep.c
index d04e9d52992..2a08eadf0e8 100644
--- a/sys/arch/armv7/omap/omap_machdep.c
+++ b/sys/arch/armv7/omap/omap_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: omap_machdep.c,v 1.7 2016/05/20 01:42:56 jsg Exp $	*/
+/*	$OpenBSD: omap_machdep.c,v 1.8 2016/06/04 18:09:16 jsg Exp $	*/
 /*
  * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
  *
@@ -35,7 +35,6 @@
 
 extern void omap4_smc_call(uint32_t, uint32_t);
 extern void omdog_reset(void);
-extern char *omap_board_name(void);
 extern struct board_dev *omap_board_devs(void);
 extern void omap_board_init(void);
 extern int comcnspeed;
@@ -97,12 +96,6 @@ omap_platform_powerdown(void)
 
 }
 
-const char *
-omap_platform_board_name(void)
-{
-	return (omap_board_name());
-}
-
 void
 omap_platform_disable_l2_if_needed(void)
 {
@@ -121,8 +114,6 @@ omap_platform_board_init(void)
 }
 
 struct armv7_platform omap_platform = {
-	.boot_name = "OpenBSD/omap",
-	.board_name = omap_platform_board_name,
 	.board_init = omap_platform_board_init,
 	.smc_write = omap_platform_smc_write,
 	.init_cons = omap_platform_init_cons,
diff --git a/sys/arch/armv7/sunxi/sunxi.c b/sys/arch/armv7/sunxi/sunxi.c
index 2ed498d8881..694793cc589 100644
--- a/sys/arch/armv7/sunxi/sunxi.c
+++ b/sys/arch/armv7/sunxi/sunxi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sunxi.c,v 1.9 2016/05/02 15:27:24 patrick Exp $ */
+/* $OpenBSD: sunxi.c,v 1.10 2016/06/04 18:09:16 jsg Exp $ */
 /*
  * Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com>
  *
@@ -92,17 +92,15 @@ struct board_dev sun7i_devs[] = {
 struct armv7_board sunxi_boards[] = {
 	{
 		BOARD_ID_SUN4I_A10,
-		"Allwinner A1x",
 		sun4i_devs,
 		sxia1x_init,
 	},
 	{
 		BOARD_ID_SUN7I_A20,
-		"Allwinner A20",
 		sun7i_devs,
 		sxia20_init,
 	},
-	{ 0, NULL, NULL, NULL },
+	{ 0, NULL, NULL },
 };
 
 struct board_dev *
@@ -110,7 +108,7 @@ sunxi_board_devs(void)
 {
 	int i;
 
-	for (i = 0; sunxi_boards[i].name != NULL; i++) {
+	for (i = 0; sunxi_boards[i].board_id != 0; i++) {
 		if (sunxi_boards[i].board_id == board_id)
 			return (sunxi_boards[i].devs);
 	}
@@ -123,7 +121,7 @@ sunxi_board_init(void)
 	bus_space_handle_t ioh;
 	int i, match = 0;
 
-	for (i = 0; sunxi_boards[i].name != NULL; i++) {
+	for (i = 0; sunxi_boards[i].board_id != 0; i++) {
 		if (sunxi_boards[i].board_id == board_id) {
 			sunxi_boards[i].init();
 			match = 1;
@@ -141,18 +139,6 @@ sunxi_board_init(void)
 	}
 }
 
-const char *
-sunxi_board_name(void)
-{
-	int i;
-
-	for (i = 0; sunxi_boards[i].name != NULL; i++) {
-		if (sunxi_boards[i].board_id == board_id)
-			return (sunxi_boards[i].name);
-	}
-	return (NULL);
-}
-
 int
 sunxi_match(struct device *parent, void *cfdata, void *aux)
 {
diff --git a/sys/arch/armv7/sunxi/sunxi_machdep.c b/sys/arch/armv7/sunxi/sunxi_machdep.c
index 32dfcc80dd7..ea60f789914 100644
--- a/sys/arch/armv7/sunxi/sunxi_machdep.c
+++ b/sys/arch/armv7/sunxi/sunxi_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sunxi_machdep.c,v 1.9 2016/05/20 01:42:56 jsg Exp $	*/
+/*	$OpenBSD: sunxi_machdep.c,v 1.10 2016/06/04 18:09:16 jsg Exp $	*/
 /*
  * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
  *
@@ -34,7 +34,6 @@
 
 extern int sxiuartcnattach(bus_space_tag_t, bus_addr_t, int, long, tcflag_t);
 extern void sxidog_reset(void);
-extern char *sunxi_board_name(void);
 extern struct board_dev *sunxi_board_devs(void);
 extern void sunxi_board_init(void);
 extern int comcnspeed;
@@ -86,12 +85,6 @@ sunxi_platform_powerdown(void)
 
 }
 
-const char *
-sunxi_platform_board_name(void)
-{
-	return (sunxi_board_name());
-}
-
 void
 sunxi_platform_disable_l2_if_needed(void)
 {
@@ -105,8 +98,6 @@ sunxi_platform_board_init(void)
 }
 
 struct armv7_platform sunxi_platform = {
-	.boot_name = "OpenBSD/sunxi",
-	.board_name = sunxi_platform_board_name,
 	.board_init = sunxi_platform_board_init,
 	.smc_write = sunxi_platform_smc_write,
 	.init_cons = sunxi_platform_init_cons,
diff --git a/sys/arch/armv7/vexpress/vexpress.c b/sys/arch/armv7/vexpress/vexpress.c
index 8a994e1d536..422e16fa0c7 100644
--- a/sys/arch/armv7/vexpress/vexpress.c
+++ b/sys/arch/armv7/vexpress/vexpress.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vexpress.c,v 1.4 2016/05/02 15:27:24 patrick Exp $	*/
+/*	$OpenBSD: vexpress.c,v 1.5 2016/06/04 18:09:16 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015 Jonathan Gray <jsg@openbsd.org>
@@ -52,11 +52,10 @@ struct board_dev vexpress_devs[] = {
 struct armv7_board vexpress_boards[] = {
 	{
 		BOARD_ID_VEXPRESS,
-		"ARM Versatile Express",
 		vexpress_devs,
 		NULL,
 	},
-	{ 0, NULL, NULL, NULL },
+	{ 0, NULL, NULL },
 };
 
 struct board_dev *
@@ -64,7 +63,7 @@ vexpress_board_devs(void)
 {
 	int i;
 
-	for (i = 0; vexpress_boards[i].name != NULL; i++) {
+	for (i = 0; vexpress_boards[i].board_id != 0; i++) {
 		if (vexpress_boards[i].board_id == board_id)
 			return (vexpress_boards[i].devs);
 	}
@@ -91,18 +90,6 @@ vexpress_board_init(void)
 		vexpress_a15_init();
 }
 
-const char *
-vexpress_board_name(void)
-{
-	int i;
-
-	for (i = 0; vexpress_boards[i].name != NULL; i++) {
-		if (vexpress_boards[i].board_id == board_id)
-			return (vexpress_boards[i].name);
-	}
-	return (NULL);
-}
-
 int
 vexpress_match(struct device *parent, void *cfdata, void *aux)
 {
diff --git a/sys/arch/armv7/vexpress/vexpress_machdep.c b/sys/arch/armv7/vexpress/vexpress_machdep.c
index f03331289fa..2d9104276a9 100644
--- a/sys/arch/armv7/vexpress/vexpress_machdep.c
+++ b/sys/arch/armv7/vexpress/vexpress_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vexpress_machdep.c,v 1.2 2016/05/20 01:42:56 jsg Exp $	*/
+/*	$OpenBSD: vexpress_machdep.c,v 1.3 2016/06/04 18:09:16 jsg Exp $	*/
 /*
  * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
  *
@@ -35,7 +35,6 @@
 
 extern void sysconf_reboot(void);
 extern void sysconf_shutdown(void);
-extern char *vexpress_board_name(void);
 extern struct board_dev *vexpress_board_devs(void);
 extern void vexpress_board_init(void);
 extern int vexpress_legacy_map(void);
@@ -85,12 +84,6 @@ vexpress_platform_powerdown(void)
 	sysconf_shutdown();
 }
 
-const char *
-vexpress_platform_board_name(void)
-{
-	return (vexpress_board_name());
-}
-
 void
 vexpress_platform_disable_l2_if_needed(void)
 {
@@ -104,8 +97,6 @@ vexpress_platform_board_init(void)
 }
 
 struct armv7_platform vexpress_platform = {
-	.boot_name = "OpenBSD/vexpress",
-	.board_name = vexpress_platform_board_name,
 	.board_init = vexpress_platform_board_init,
 	.smc_write = vexpress_platform_smc_write,
 	.init_cons = vexpress_platform_init_cons,