Remove model specific strings keyed off the board id.

We now pull the model string from fdt.

2 files changed, 5 insertions, 29 deletions

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,