Merge branch 'master' of https://github.com/RT-Thread/rt-thread

2 files changed, 61 insertions, 16 deletions

diff --git a/README.md b/README.md
index 8c58a9efd7..06502f4283 100644
--- a/README.md
+++ b/README.md
@@ -2,5 +2,41 @@
 
 [![Build Status](https://travis-ci.org/RT-Thread/rt-thread.png)](https://travis-ci.org/RT-Thread/rt-thread)
 
-RT-Thread is an open source real-time operating system for embedded devices.
+RT-Thread is an open source real-time operating system for embedded devices from China. RT-Thread RTOS is a scalable real-time operating system: a tiny kernel for ARM Cortex-M0, Cortex-M3/4, or a full feature system in ARM Cortex-A8, ARM Cortex-A9 DualCore etc. 
 
+## Overview ##
+
+RT-Thread RTOS like a traditional real-time operating system. The kernel has real-time multi-task scheduling, semaphore, mutex, mail box, message queue etc. However, it has two different things:
+
+* Device Driver;
+* Component. 
+
+The device driver is more like a driver framework, UART, SPI, USB device/host, EMAC, MTD NAND etc. The developer can easyly add low level driver and board configuration, then he/she can use lots of features. 
+
+The Component is a software concept upon RT-Thread kernel, for example a shell (finsh shell), virtual file system (FAT, YAFFS, UFFS, ROM/RAM file system etc), TCP/IP protocol stack (lwIP), POSIX interface etc. One component must be a directory under RT-Thread/Components and one component can be descripted by a SConscript file (then be compiled and linked into the system).
+
+## Board Support Package ##
+
+RT-Thread RTOS can support many architectures:
+
+* ARM Cortex-M0
+* ARM Cortex-M3/M4
+* ARM Cortex-R4
+* ARM Cortex-A8/A9
+* ARM920T/ARM926 etc
+
+* MIPS 
+* x86
+* PowerPC
+
+## License ##
+
+RT-Thread RTOS is released under GPLv2+ license, that means any modification of RT-Thread RTOS should be feed back to community, but it can be friendly used in commercial products when mention your product is using RT-Thread RTOS. 
+
+## Usage ##
+
+RT-Thread RTOS uses [scons](http://www.scons.org) as its building system. Therefore, please install scons and Python 2.7 firstly. 
+
+## Contribution ##
+
+Thank all of RT-Thread Developers. 
diff --git a/bsp/xplorer4330/libraries/startup_code/gcc_startup_lpc18xx43xx.s b/bsp/xplorer4330/libraries/startup_code/gcc_startup_lpc18xx43xx.s
index 70c0588bcb..56ed603169 100644
--- a/bsp/xplorer4330/libraries/startup_code/gcc_startup_lpc18xx43xx.s
+++ b/bsp/xplorer4330/libraries/startup_code/gcc_startup_lpc18xx43xx.s
@@ -16,7 +16,7 @@
 // </h>
 */
 
-    .equ    Stack_Size, 0x00000100
+    .equ    Stack_Size, 0x00000200
     .equ    Sign_Value, 0x5A5A5A5A
     .section ".stack", "w"
     .align  3
@@ -56,8 +56,8 @@ __cs3_heap_end:
     .type   __cs3_interrupt_vector_cortex_m, %object
 
 __cs3_interrupt_vector_cortex_m:
-    .long   __cs3_stack                 /* Top of Stack                 */
-    .long   __cs3_reset                 /* Reset Handler                */
+    .long   _estack                     /* Top of Stack                 */
+    .long   Reset_Handler               /* Reset Handler                */
     .long   NMI_Handler                 /* NMI Handler                  */
     .long   HardFault_Handler           /* Hard Fault Handler           */
     .long   MemManage_Handler           /* MPU Fault Handler            */
@@ -75,10 +75,10 @@ __cs3_interrupt_vector_cortex_m:
 
     /* External Interrupts */
     .long	DAC_IRQHandler	 			/* 16 D/A Converter */
-	.long	0				/* 17 Event Router */
+	.long	MX_CORE_IRQHandler			/* 17 M0/M4 IRQ handler (LPC43XX ONLY) */
 	.long	DMA_IRQHandler				/* 18 General Purpose DMA */
-	.long	0					/* 19 Reserved */
-	.long	0					/* 20 Reserved */
+	.long	UnHandled_Vector			/* 19 Reserved */
+	.long	FLASHEEPROM_IRQHandler		/* 20 ORed flash bank A, flash bank B, EEPROM interrupts */
 	.long	ETH_IRQHandler				/* 21 Ethernet */
 	.long	SDIO_IRQHandler				/* 22 SD/MMC */
 	.long	LCD_IRQHandler				/* 23 LCD */
@@ -94,7 +94,7 @@ __cs3_interrupt_vector_cortex_m:
 	.long	ADC0_IRQHandler				/* 33 A/D Converter 0*/
 	.long	I2C0_IRQHandler				/* 34 I2C0*/
 	.long	I2C1_IRQHandler				/* 35 I2C1*/
-	.long	0					/* 36 Reserved*/
+	.long	SPI_IRQHandler				/* 36 SPI (LPC43XX ONLY)*/
 	.long	ADC1_IRQHandler				/* 37 A/D Converter 1*/
 	.long	SSP0_IRQHandler				/* 38 SSP0*/
 	.long	SSP1_IRQHandler				/* 39 SSP1*/
@@ -118,13 +118,13 @@ __cs3_interrupt_vector_cortex_m:
 	.long	GINT1_IRQHandler			/* 57 GINT1*/
 	.long	EVRT_IRQHandler				/* 58 Event Router*/
 	.long	CAN1_IRQHandler				/* 59 C_CAN1*/
-	.long	0							/* 60 Reserved*/
+	.long	UnHandled_Vector			/* 60 Reserved*/
 	.long	VADC_IRQHandler				/* 61 VADC*/
 	.long	ATIMER_IRQHandler			/* 62 ATIMER*/
 	.long	RTC_IRQHandler				/* 63 RTC*/
-	.long	0							/* 64 Reserved*/
+	.long	UnHandled_Vector			/* 64 Reserved*/
 	.long	WDT_IRQHandler				/* 65 WDT*/
-	.long	0							/* 66 M0s*/
+	.long	UnHandled_Vector			/* 66 M0s*/
 	.long	CAN0_IRQHandler				/* 67 C_CAN0*/
 	.long 	QEI_IRQHandler				/* 68 QEI*/
 
@@ -136,11 +136,11 @@ __cs3_interrupt_vector_cortex_m:
 
 /* Reset Handler */
 
-    .section .cs3.reset,"x",%progbits
+    .section  .text.Reset_Handler
     .thumb_func
-    .globl  __cs3_reset_cortex_m
-    .type   __cs3_reset_cortex_m, %function
-__cs3_reset_cortex_m:
+    .globl  Reset_Handler
+    .type  Reset_Handler, %function
+Reset_Handler:
     .fnstart
 /* .if (RAM_MODE) */
  .if 0
@@ -168,7 +168,7 @@ BSSIsEmpty:
     .pool
     .cantunwind
     .fnend
-    .size   __cs3_reset_cortex_m,.-__cs3_reset_cortex_m
+    .size   Reset_Handler,.-Reset_Handler
 
     .section ".text"
 
@@ -237,13 +237,21 @@ Default_Handler:
     B       .
     .size   Default_Handler, . - Default_Handler
 
+    .globl  UnHandled_Vector
+    .type   UnHandled_Vector, %function
+UnHandled_Vector:
+    B       .
+    .size   UnHandled_Vector, . - UnHandled_Vector
+    
     .macro  IRQ handler
     .weak   \handler
     .set    \handler, Default_Handler
     .endm
 
     IRQ DAC_IRQHandler
+    IRQ MX_CORE_IRQHandler
 	IRQ DMA_IRQHandler
+	IRQ FLASHEEPROM_IRQHandler
 	IRQ ETH_IRQHandler
 	IRQ SDIO_IRQHandler
 	IRQ LCD_IRQHandler
@@ -259,6 +267,7 @@ Default_Handler:
 	IRQ ADC0_IRQHandler
 	IRQ I2C0_IRQHandler
 	IRQ I2C1_IRQHandler
+	IRQ SPI_IRQHandler
 	IRQ ADC1_IRQHandler
 	IRQ SSP0_IRQHandler
 	IRQ SSP1_IRQHandler