summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nuttx/arch/arm/src/common/up_initialize.c4
-rwxr-xr-xnuttx/arch/hc/src/common/up_initialize.c4
-rw-r--r--nuttx/arch/sh/src/common/up_initialize.c4
-rwxr-xr-xnuttx/configs/nucleus2g/src/nucleus2g_internal.h10
-rwxr-xr-xnuttx/configs/nucleus2g/src/up_boot.c12
5 files changed, 6 insertions, 28 deletions
diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c
index 1e8fca47c..e9cb2248b 100644
--- a/nuttx/arch/arm/src/common/up_initialize.c
+++ b/nuttx/arch/arm/src/common/up_initialize.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/common/up_initialize.c
*
- * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -161,7 +161,7 @@ void up_initialize(void)
up_netinitialize();
- /* Initializ USB */
+ /* Initialize USB */
up_usbinitialize();
diff --git a/nuttx/arch/hc/src/common/up_initialize.c b/nuttx/arch/hc/src/common/up_initialize.c
index 38e70be19..9385cee1c 100755
--- a/nuttx/arch/hc/src/common/up_initialize.c
+++ b/nuttx/arch/hc/src/common/up_initialize.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/hc/src/common/up_initialize.c
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -160,7 +160,7 @@ void up_initialize(void)
up_netinitialize();
- /* Initializ USB */
+ /* Initialize USB */
up_usbinitialize();
diff --git a/nuttx/arch/sh/src/common/up_initialize.c b/nuttx/arch/sh/src/common/up_initialize.c
index 1b4ceb8be..92587ba31 100644
--- a/nuttx/arch/sh/src/common/up_initialize.c
+++ b/nuttx/arch/sh/src/common/up_initialize.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/sh/src/common/up_initialize.c
*
- * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -152,7 +152,7 @@ void up_initialize(void)
up_netinitialize();
- /* Initializ USB */
+ /* Initialize USB */
up_usbinitialize();
diff --git a/nuttx/configs/nucleus2g/src/nucleus2g_internal.h b/nuttx/configs/nucleus2g/src/nucleus2g_internal.h
index 6a84314ee..fe9551c33 100755
--- a/nuttx/configs/nucleus2g/src/nucleus2g_internal.h
+++ b/nuttx/configs/nucleus2g/src/nucleus2g_internal.h
@@ -144,16 +144,6 @@
extern void weak_function lpc17_sspinitialize(void);
-/************************************************************************************
- * Name: lpc17_usbinitialize
- *
- * Description:
- * Called to setup USB-related GPIO pins for the NUCLEUS-2G board.
- *
- ************************************************************************************/
-
-extern void weak_function lpc17_usbinitialize(void);
-
#endif /* __ASSEMBLY__ */
#endif /* _CONFIGS_NUCLEUS2G_SRC_NUCLEUS2G_INTERNAL_H */
diff --git a/nuttx/configs/nucleus2g/src/up_boot.c b/nuttx/configs/nucleus2g/src/up_boot.c
index 2871a1dd5..8e2a5c72c 100755
--- a/nuttx/configs/nucleus2g/src/up_boot.c
+++ b/nuttx/configs/nucleus2g/src/up_boot.c
@@ -101,18 +101,6 @@ void lpc17_boardinitialize(void)
}
#endif
- /* Initialize USB if 1) USBDEV is selected, 2) the USB controller is not
- * disabled, and 3) the weak function lpc17_usbinitialize() has been brought
- * into the build.
- */
-
-#if defined(CONFIG_USBDEV) && defined(CONFIG_LPC17_USBDEV)
- if (lpc17_usbinitialize)
- {
- lpc17_usbinitialize();
- }
-#endif
-
/* Configure on-board LEDs if LED support has been selected. */
#ifdef CONFIG_ARCH_LEDS