Module Name: src
Committed By: jmcneill
Date: Mon Aug 27 09:52:16 UTC 2018
Modified Files:
src/sys/arch/evbarm/evbarm: autoconf.c
src/sys/arch/evbarm/include: autoconf.h
Log Message:
Add evbarm_cpu_rootconf callback for hooking into cpu_rootconf
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/evbarm/autoconf.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/include/autoconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/evbarm/autoconf.c
diff -u src/sys/arch/evbarm/evbarm/autoconf.c:1.21 src/sys/arch/evbarm/evbarm/autoconf.c:1.22
--- src/sys/arch/evbarm/evbarm/autoconf.c:1.21 Mon Oct 23 07:05:23 2017
+++ src/sys/arch/evbarm/evbarm/autoconf.c Mon Aug 27 09:52:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.21 2017/10/23 07:05:23 skrll Exp $ */
+/* $NetBSD: autoconf.c,v 1.22 2018/08/27 09:52:16 jmcneill Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.21 2017/10/23 07:05:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.22 2018/08/27 09:52:16 jmcneill Exp $");
#include "opt_md.h"
@@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
void (*evbarm_device_register)(device_t, void *);
void (*evbarm_device_register_post_config)(device_t, void *);
+void (*evbarm_cpu_rootconf)(void);
extern struct cfdata cfdata[];
@@ -148,6 +149,8 @@ void
cpu_rootconf(void)
{
#ifndef MEMORY_DISK_IS_ROOT
+ if (evbarm_cpu_rootconf)
+ (*evbarm_cpu_rootconf)();
set_root_device();
#endif
aprint_normal("boot device: %s\n",
Index: src/sys/arch/evbarm/include/autoconf.h
diff -u src/sys/arch/evbarm/include/autoconf.h:1.8 src/sys/arch/evbarm/include/autoconf.h:1.9
--- src/sys/arch/evbarm/include/autoconf.h:1.8 Sat May 10 20:12:16 2014
+++ src/sys/arch/evbarm/include/autoconf.h Mon Aug 27 09:52:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.8 2014/05/10 20:12:16 reinoud Exp $ */
+/* $NetBSD: autoconf.h,v 1.9 2018/08/27 09:52:16 jmcneill Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -40,5 +40,6 @@ struct mainbus_attach_args {
extern void (*evbarm_device_register)(device_t, void *);
extern void (*evbarm_device_register_post_config)(device_t, void *);
+extern void (*evbarm_cpu_rootconf)(void);
#endif /* _EVBARM_AUTOCONF_H_ */