[rtems-libbsd commit] Move core system initialization references

[Sebastian Huber]

Module:    rtems-libbsd
Branch:    master
Commit:    f3b2913422d3b80218bbe41a3f170e8efb1fe10a
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=f3b2913422d3b80218bbe41a3f170e8efb1fe10a

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Oct  9 14:29:38 2013 +0200

Move core system initialization references

---

 rtemsbsd/include/machine/rtems-bsd-sysinit.h   |    8 --------
 rtemsbsd/rtems/rtems-bsd-init.c                |    7 +++++++
 testsuite/include/rtems/bsd/test/nic-sysinit.h |    3 ---
 testsuite/usb01/usb-sysinit.h                  |    1 -
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/rtemsbsd/include/machine/rtems-bsd-sysinit.h b/rtemsbsd/include/machine/rtems-bsd-sysinit.h
index 6242d79..6721d41 100644
--- a/rtemsbsd/include/machine/rtems-bsd-sysinit.h
+++ b/rtemsbsd/include/machine/rtems-bsd-sysinit.h
@@ -27,14 +27,6 @@
 #include <sys/queue.h>
 #include <sys/kernel.h>
 
-#define SYSINIT_NEED_FREEBSD_CORE \
-	SYSINIT_REFERENCE(configure1); \
-	SYSINIT_REFERENCE(module); \
-	SYSINIT_REFERENCE(kobj); \
-	SYSINIT_REFERENCE(linker_kernel); \
-	SYSINIT_MODULE_REFERENCE(rootbus); \
-	SYSINIT_DRIVER_REFERENCE(nexus, root)
-
 #define SYSINIT_NEED_USB_CORE \
 	SYSINIT_REFERENCE(usb_quirk_init); \
 	SYSINIT_DRIVER_REFERENCE(uhub, usbus)
diff --git a/rtemsbsd/rtems/rtems-bsd-init.c b/rtemsbsd/rtems/rtems-bsd-init.c
index 22cb144..9e9fb1f 100644
--- a/rtemsbsd/rtems/rtems-bsd-init.c
+++ b/rtemsbsd/rtems/rtems-bsd-init.c
@@ -49,6 +49,13 @@
 
 #include <rtems/bsd/bsd.h>
 
+SYSINIT_REFERENCE(configure1);
+SYSINIT_REFERENCE(module);
+SYSINIT_REFERENCE(kobj);
+SYSINIT_REFERENCE(linker_kernel);
+SYSINIT_MODULE_REFERENCE(rootbus);
+SYSINIT_DRIVER_REFERENCE(nexus, root);
+
 /* In FreeBSD this is a local function */
 void mi_startup(void);
 
diff --git a/testsuite/include/rtems/bsd/test/nic-sysinit.h b/testsuite/include/rtems/bsd/test/nic-sysinit.h
index 752fe60..1fec896 100644
--- a/testsuite/include/rtems/bsd/test/nic-sysinit.h
+++ b/testsuite/include/rtems/bsd/test/nic-sysinit.h
@@ -39,9 +39,6 @@
  *  We "read" that and generate references and nexus devices
  */
 
-#if defined(CONFIGURE_NEED_NET)
-  SYSINIT_NEED_FREEBSD_CORE;
-#endif
 #if defined(CONFIGURE_NEED_USB)
   SYSINIT_NEED_USB_CORE;
 #endif
diff --git a/testsuite/usb01/usb-sysinit.h b/testsuite/usb01/usb-sysinit.h
index 0ee09dd..e42fec6 100644
--- a/testsuite/usb01/usb-sysinit.h
+++ b/testsuite/usb01/usb-sysinit.h
@@ -36,7 +36,6 @@
 	#define NEED_SDHC
 #endif
 
-SYSINIT_NEED_FREEBSD_CORE;
 SYSINIT_NEED_USB_CORE;
 #ifdef NEED_USB_OHCI
 	SYSINIT_NEED_USB_OHCI;