boards: Remove the duplicated prototype of CONFIG_INIT_ENTRYPOINT

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/samv7/same70-xplained/kernel/sam_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/samv7/samv71-xult/kernel/sam_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c

@@ -60,10 +60,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/risc-v/c906/smartl-c906/kernel/c906_userspace.c

@@ -63,10 +63,6 @@ extern uint8_t _ebss[];            /* End+1 of .bss */
 
 extern uint8_t __ld_usram_end[];   /* End+1 of user ram section */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/risc-v/esp32c3/esp32c3-devkit/kernel/esp32c3_userspace.c

@@ -59,10 +59,6 @@ extern uint8_t _ebss[];            /* End+1 of .bss */
 
 extern uint8_t __ld_udram_end[];   /* End+1 of user ram section */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/risc-v/k210/maix-bit/kernel/k210_userspace.c

@@ -61,10 +61,6 @@ extern uint8_t _edata[];           /* End+1 of .data */
 extern uint8_t _sbss[];            /* Start of .bss */
 extern uint8_t _ebss[];            /* End+1 of .bss */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/risc-v/mpfs/common/kernel/mpfs_userspace.c

@@ -59,10 +59,6 @@ extern uint8_t _ebss[];            /* End+1 of .bss */
 
 extern uint8_t __ld_usram_end[];   /* End+1 of user ram section */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

boards/xtensa/esp32/common/kernel/esp32_userspace.c

@@ -59,10 +59,6 @@ extern uint8_t _ebss[];            /* End+1 of .bss */
 
 extern uint8_t __ld_udram_end[];   /* End+1 of user ram section */
 
-/* This is the user space entry point */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */

include/nuttx/init.h

@@ -94,10 +94,6 @@ EXTERN uint8_t g_nx_initstate;  /* See enum nx_initstate_e */
  * Public Function Prototypes
  ****************************************************************************/
 
-/* This entry point must be supplied by the application */
-
-int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
-
 /* Functions contained in nx_task.c *****************************************/
 
 /* OS entry point called by boot logic */

include/sys/types.h

@@ -300,10 +300,29 @@ enum
   OK = 0,
 };
 
-#endif /* __ASSEMBLY__ */
-
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
 
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/* This entry point must be supplied by the application */
+
+#ifdef CONFIG_INIT_ENTRYPOINT
+int CONFIG_INIT_ENTRYPOINT(int argc, FAR char *argv[]);
+#endif
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+
 #endif /* __INCLUDE_SYS_TYPES_H */