diff --git a/bsp/avr32uc3b0/startup.c b/bsp/avr32uc3b0/startup.c
index 481ff1448ad0f85555f16d76dce7e918c42bd120..6f1a3d3ada46764bb6afac7ca369ecd57cf646ca 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 b1bf9884c2624d97d7110d4be16373ffcad1a547..8f1b83912af536301d7311325c5191c77a8f0ad6 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 f4c02d17d713528662c30afdb6223227a465ad00..8aacc3073c1a3462f03fff28ee438e593a198889 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 3a89e26391faf7156ae634a042d34875768de4b6..24c2644e1e4ab5a241f08d32a4508161c872a733 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 bc477c3f7666c5e6e50407e08c7095415d439c70..53c755cbf70cfaa0a9706a94d3812be4f53931dd 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 1f206a51b7da8de1aa2c8e08a3b0870285aee718..d598ee8fc7824fcd420a2a885771de6dca2bb73c 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 c13e80da50f6aa86af53bbd2b85fdc5420f24d3b..2e8ad05d7b0e6479d1839c39f5cfcd555739d52d 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 b22095f06ed87bb452518b346315f36713259874..e1f3b6efd156c932b3411d0568560be608f74aeb 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 2aebdb5f0d1803108a36b5b709fcf3b8629d3b3b..989b74f924acc5409eb12aa67efd86466d9480c0 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 5efc41fd80b71e7edfd7a1be32aa7878ba2a431e..e9a79678191c7c670fd327b7eaf233888276021d 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 036a61f4d7e2cebc5db1c628f7580439cfc2bdf5..33fc5c99336c820154457af4cd4d0d65bdfbc359 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 a73fcd90ea3b0ad871f0ee950986b2918aece479..95b9484c1f0e9f3ac90f41631624ad1a9111c6cb 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 fdcf5a17135284b860508fe53b7bffcfd9c9e8c8..b9dc03e588242d8739eb05e8c4ae51a4c4a762c6 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 349d5f68f0affbbb33e83820d037034b66683418..fab223d8340173edd68dbdf44bfe2a32e4b699e2 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 bb43044a3990a2b87e5734bec23f039552340162..575bd6f306463160dda433e5d27e0aa9e4cd15cb 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 25ebb5e4ac5aa9b8ceb2a64f76bea0a0260fdf9f..8f2512630d58697a40b2d4b1e71c62db8fe0f689 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 f35e595c9c113b51f4981d0b33d50e7cfaaa100e..619a68315fe205ce0ecf2c1bdd878938794e82d4 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 af8375d697f66647ab6df9d90dbbb712e7396b79..bf50d4d7827338e08ed36279a7feeee60f340ed4 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 4716ec668e80df6832e06a4aca8ead7c443f34d6..b841da98f35c458a51d26be7aa12501341566a16 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 441f41385fcf9159f52dc57d68eb58131f8ead0c..ddf194b1d177ca2755a69f78d20ddc2427338288 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 1514b1114bd7b62080f69dc2ad5b72e9e77e359d..fc12985ce132737ece40e9114ae05be833501caf 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 bd6502da6e5c0dcdbed87eee72c95392acffd977..9745def9786c82206505d114ea8b7f954ce95023 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 b3ace8038cb45eee20ea17f59eb07414c9196daa..db65b664f1737732d0d2853542343db72466cba7 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 d07e4ad5a56614cce99bdf0246dca69de932915e..476ff31ed2eb1814644436977355238908f642ed 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 e0547efb7823e2a90c1a655334ef9ac775d9d725..c591ff3bcece2d39e22a3ed677be57883b0f5d5b 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 b91fa42c1444740f13d6e7086647cbefc59a8026..c1cabf77795032a84215469640746c8159e0ef58 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 d268104aa590bfdb4cda01a02e12eaea27e6b68b..845606b0e9fd473f16f464414bdf935e4c326a12 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 b6334e2335538cdde9df27cc7917b4e1976424a4..87c47a1e2caaa939e1e6ed99c30bda0ad81dba65 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 0dfa44462af45e168f6ae538044b2f08893ae7de..39dec62b61b5cec0fbe5a6596883da8b95efb066 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 0dfa44462af45e168f6ae538044b2f08893ae7de..39dec62b61b5cec0fbe5a6596883da8b95efb066 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 4afa6e4fdb65487ace9076c5c014c181f7df5350..f52a185495d8a80ff9764e5832f2ee1082b490b4 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 1a06957b045995d12564a0e937bb18268788bf9c..d25ca73f280bf0013919a971038860a097d81a37 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 2f8b4b5bfafd060d82b38497ae991b492b0a0cad..4ea7a4f03dc1bd91bd67b72f066d39fc9ca96f7b 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 00d85af5f2d09d14d68966aa7abec864754d3f78..72a4eb0a9668c70f0225388572beae7b2e59b3a7 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