diff --git a/bsp/avr32uc3b0/startup.c b/bsp/avr32uc3b0/startup.c
index 481ff1448a..6f1a3d3ada 100644
--- a/bsp/avr32uc3b0/startup.c
+++ b/bsp/avr32uc3b0/startup.c
@@ -18,7 +18,7 @@ extern void rt_hw_board_init(void);
 extern void rt_application_init(void);
 
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/bf533/startup.c b/bsp/bf533/startup.c
index b1bf9884c2..8f1b83912a 100644
--- a/bsp/bf533/startup.c
+++ b/bsp/bf533/startup.c
@@ -70,7 +70,7 @@ void rtthread_startup(void)
 
 #ifdef RT_USING_FINSH
     /* init finsh */
-    extern void finsh_system_init(void);
+    extern int finsh_system_init(void);
     finsh_system_init();
     finsh_set_device("uart0");
 #endif
diff --git a/bsp/dm365/applications/startup.c b/bsp/dm365/applications/startup.c
index f4c02d17d7..8aacc3073c 100644
--- a/bsp/dm365/applications/startup.c
+++ b/bsp/dm365/applications/startup.c
@@ -62,7 +62,7 @@ extern void rt_application_init(void);
 #endif
 
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 #endif
 
 
diff --git a/bsp/efm32/copy_this_file_shell.c b/bsp/efm32/copy_this_file_shell.c
index 3a89e26391..24c2644e1e 100644
--- a/bsp/efm32/copy_this_file_shell.c
+++ b/bsp/efm32/copy_this_file_shell.c
@@ -468,7 +468,7 @@ void finsh_system_var_init(const void* begin, const void* end)
  *
  * This function will initialize finsh shell
  */
-void finsh_system_init(void)
+int finsh_system_init(void)
 {
 	rt_err_t result;
 
diff --git a/bsp/frdm-k64f/applications/startup.c b/bsp/frdm-k64f/applications/startup.c
index bc477c3f76..53c755cbf7 100644
--- a/bsp/frdm-k64f/applications/startup.c
+++ b/bsp/frdm-k64f/applications/startup.c
@@ -25,7 +25,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/lm3s8962/applications/startup.c b/bsp/lm3s8962/applications/startup.c
index 1f206a51b7..d598ee8fc7 100644
--- a/bsp/lm3s8962/applications/startup.c
+++ b/bsp/lm3s8962/applications/startup.c
@@ -30,7 +30,7 @@ extern void rt_hw_serial_init(void);
 
 /*@{*/
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(char* device);
 #endif
 
diff --git a/bsp/lm3s9b9x/applications/startup.c b/bsp/lm3s9b9x/applications/startup.c
index c13e80da50..2e8ad05d7b 100644
--- a/bsp/lm3s9b9x/applications/startup.c
+++ b/bsp/lm3s9b9x/applications/startup.c
@@ -30,7 +30,7 @@ extern void rt_hw_serial_init(void);
 
 /*@{*/
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(char* device);
 #endif
 
diff --git a/bsp/lm4f232/applications/startup.c b/bsp/lm4f232/applications/startup.c
index b22095f06e..e1f3b6efd1 100644
--- a/bsp/lm4f232/applications/startup.c
+++ b/bsp/lm4f232/applications/startup.c
@@ -30,7 +30,7 @@ extern void rt_hw_serial_init(void);
 
 /*@{*/
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(char* device);
 #endif
 
diff --git a/bsp/lpc178x/applications/startup.c b/bsp/lpc178x/applications/startup.c
index 2aebdb5f0d..989b74f924 100644
--- a/bsp/lpc178x/applications/startup.c
+++ b/bsp/lpc178x/applications/startup.c
@@ -21,7 +21,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/lpc2148/applications/startup.c b/bsp/lpc2148/applications/startup.c
index 5efc41fd80..e9a7967819 100644
--- a/bsp/lpc2148/applications/startup.c
+++ b/bsp/lpc2148/applications/startup.c
@@ -34,7 +34,7 @@
 /*@{*/
 
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 #endif
 
 extern int  rt_application_init(void);
@@ -43,7 +43,7 @@ extern void rt_show_version(void);
 extern rt_err_t rt_hw_serial_init(void);
 #endif
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 #endif
 
 #ifdef __CC_ARM
diff --git a/bsp/lpc2478/applications/startup.c b/bsp/lpc2478/applications/startup.c
index 036a61f4d7..33fc5c9933 100644
--- a/bsp/lpc2478/applications/startup.c
+++ b/bsp/lpc2478/applications/startup.c
@@ -18,7 +18,7 @@
 
 #ifdef RT_USING_FINSH
 #include <finsh.h>
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 #endif
 
 #include <LPC24xx.h>
diff --git a/bsp/m16c62p/applications/startup.c b/bsp/m16c62p/applications/startup.c
index a73fcd90ea..95b9484c1f 100644
--- a/bsp/m16c62p/applications/startup.c
+++ b/bsp/m16c62p/applications/startup.c
@@ -23,7 +23,7 @@
 extern void rt_hw_interrupt_init(void);
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/microblaze/startup.c b/bsp/microblaze/startup.c
index fdcf5a1713..b9dc03e588 100755
--- a/bsp/microblaze/startup.c
+++ b/bsp/microblaze/startup.c
@@ -20,7 +20,7 @@
 
 #ifdef RT_USING_FINSH
 #include <finsh.h>
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 #endif
 
 extern void rt_hw_led_flash(void);
diff --git a/bsp/mini2440/applications/startup.c b/bsp/mini2440/applications/startup.c
index 349d5f68f0..fab223d834 100644
--- a/bsp/mini2440/applications/startup.c
+++ b/bsp/mini2440/applications/startup.c
@@ -61,7 +61,7 @@ extern struct rt_device uart2_device;
 #endif
 
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 #endif
 
 /**
diff --git a/bsp/mini4020/applications/startup.c b/bsp/mini4020/applications/startup.c
index bb43044a39..575bd6f306 100644
--- a/bsp/mini4020/applications/startup.c
+++ b/bsp/mini4020/applications/startup.c
@@ -35,7 +35,7 @@ extern int Image$$RW_RAM1$$ZI$$Limit;
 #endif
 
 extern void rt_application_init(void);
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void sd_init(void);
 
 void rtthread_startup()
diff --git a/bsp/nios_ii/startup.c b/bsp/nios_ii/startup.c
index 25ebb5e4ac..8f2512630d 100644
--- a/bsp/nios_ii/startup.c
+++ b/bsp/nios_ii/startup.c
@@ -26,7 +26,7 @@
 extern int rt_application_init(void);
 
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/nuvoton_m05x/applications/startup.c b/bsp/nuvoton_m05x/applications/startup.c
index f35e595c9c..619a68315f 100644
--- a/bsp/nuvoton_m05x/applications/startup.c
+++ b/bsp/nuvoton_m05x/applications/startup.c
@@ -25,7 +25,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/nuvoton_m451/applications/startup.c b/bsp/nuvoton_m451/applications/startup.c
index af8375d697..bf50d4d782 100644
--- a/bsp/nuvoton_m451/applications/startup.c
+++ b/bsp/nuvoton_m451/applications/startup.c
@@ -25,7 +25,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/pic32ethernet/startup.c b/bsp/pic32ethernet/startup.c
index 4716ec668e..b841da98f3 100644
--- a/bsp/pic32ethernet/startup.c
+++ b/bsp/pic32ethernet/startup.c
@@ -20,7 +20,7 @@ extern int _ramfunc_end;
 #define PIC32_SRAM_END (0xA0000000 + 1024UL*128) //795F512L 512K FLASH 128KB SRAM
 
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/sam7x/applications/startup.c b/bsp/sam7x/applications/startup.c
index 441f41385f..ddf194b1d1 100644
--- a/bsp/sam7x/applications/startup.c
+++ b/bsp/sam7x/applications/startup.c
@@ -28,7 +28,7 @@ extern rt_err_t eth_system_device_init(void);
 
 #ifdef RT_USING_FINSH
 #include <finsh.h>
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 #endif
 
 /**
@@ -51,7 +51,7 @@ extern int  rt_application_init(void);
 extern rt_err_t rt_hw_serial_init(void);
 #endif
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 #endif
 
 void led_flash()
diff --git a/bsp/sep6200/application/startup.c b/bsp/sep6200/application/startup.c
index 1514b1114b..fc12985ce1 100644
--- a/bsp/sep6200/application/startup.c
+++ b/bsp/sep6200/application/startup.c
@@ -49,7 +49,7 @@ extern unsigned char __bss_end;
 
 extern void rt_hw_board_init(void);
 extern void rt_application_init(void);
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void sd_init(void);
 
 void rtthread_startup()
diff --git a/bsp/simulator/applications/startup.c b/bsp/simulator/applications/startup.c
index bd6502da6e..9745def978 100644
--- a/bsp/simulator/applications/startup.c
+++ b/bsp/simulator/applications/startup.c
@@ -25,7 +25,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char *device);
 #endif
 
diff --git a/bsp/stm32f0x/applications/startup.c b/bsp/stm32f0x/applications/startup.c
index b3ace8038c..db65b664f1 100644
--- a/bsp/stm32f0x/applications/startup.c
+++ b/bsp/stm32f0x/applications/startup.c
@@ -26,7 +26,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/stm32f20x/applications/startup.c b/bsp/stm32f20x/applications/startup.c
index d07e4ad5a5..476ff31ed2 100644
--- a/bsp/stm32f20x/applications/startup.c
+++ b/bsp/stm32f20x/applications/startup.c
@@ -26,7 +26,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/stm32f40x/applications/startup.c b/bsp/stm32f40x/applications/startup.c
index e0547efb78..c591ff3bce 100644
--- a/bsp/stm32f40x/applications/startup.c
+++ b/bsp/stm32f40x/applications/startup.c
@@ -27,7 +27,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/stm32f429-apollo/applications/startup.c b/bsp/stm32f429-apollo/applications/startup.c
index b91fa42c14..c1cabf7779 100644
--- a/bsp/stm32f429-apollo/applications/startup.c
+++ b/bsp/stm32f429-apollo/applications/startup.c
@@ -27,7 +27,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/stm32f429-disco/applications/startup.c b/bsp/stm32f429-disco/applications/startup.c
index d268104aa5..845606b0e9 100644
--- a/bsp/stm32f429-disco/applications/startup.c
+++ b/bsp/stm32f429-disco/applications/startup.c
@@ -27,7 +27,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/stm32l072/app/startup.c b/bsp/stm32l072/app/startup.c
index b6334e2335..87c47a1e2c 100644
--- a/bsp/stm32l072/app/startup.c
+++ b/bsp/stm32l072/app/startup.c
@@ -26,7 +26,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/stm32l475-iot-disco/applications/startup.c b/bsp/stm32l475-iot-disco/applications/startup.c
index 0dfa44462a..39dec62b61 100644
--- a/bsp/stm32l475-iot-disco/applications/startup.c
+++ b/bsp/stm32l475-iot-disco/applications/startup.c
@@ -27,7 +27,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/stm32l476-nucleo/applications/startup.c b/bsp/stm32l476-nucleo/applications/startup.c
index 0dfa44462a..39dec62b61 100644
--- a/bsp/stm32l476-nucleo/applications/startup.c
+++ b/bsp/stm32l476-nucleo/applications/startup.c
@@ -27,7 +27,7 @@
 
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char* device);
 #endif
 
diff --git a/bsp/taihu/applications/startup.c b/bsp/taihu/applications/startup.c
index 4afa6e4fdb..f52a185495 100644
--- a/bsp/taihu/applications/startup.c
+++ b/bsp/taihu/applications/startup.c
@@ -17,7 +17,7 @@
 
 #ifdef RT_USING_FINSH
 #include <finsh.h>
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 #endif
 
 extern int  rt_application_init(void);
diff --git a/bsp/upd70f3454/applications/startup.c b/bsp/upd70f3454/applications/startup.c
index 1a06957b04..d25ca73f28 100644
--- a/bsp/upd70f3454/applications/startup.c
+++ b/bsp/upd70f3454/applications/startup.c
@@ -29,7 +29,7 @@
 extern int  rt_application_init(void);
 
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char *device);
 #endif
 
diff --git a/bsp/wh44b0/startup.c b/bsp/wh44b0/startup.c
index 2f8b4b5bfa..4ea7a4f03d 100644
--- a/bsp/wh44b0/startup.c
+++ b/bsp/wh44b0/startup.c
@@ -35,7 +35,7 @@ extern int __bss_end;
 #endif
 
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 #endif
 extern int  rt_application_init(void);
 
diff --git a/bsp/x86/applications/startup.c b/bsp/x86/applications/startup.c
index 00d85af5f2..72a4eb0a96 100644
--- a/bsp/x86/applications/startup.c
+++ b/bsp/x86/applications/startup.c
@@ -27,7 +27,7 @@ extern int  rt_application_init(void);
 //extern void rt_thread_idle_init(void);
 
 #ifdef RT_USING_FINSH
-extern void finsh_system_init(void);
+extern int finsh_system_init(void);
 extern void finsh_set_device(const char *device);
 #endif