diff options
Diffstat (limited to 'sys/arch/armv7/vexpress')
| -rw-r--r-- | sys/arch/armv7/vexpress/vexpress.c | 19 | ||||
| -rw-r--r-- | sys/arch/armv7/vexpress/vexpress_machdep.c | 11 |
2 files changed, 4 insertions, 26 deletions
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, |