Merge in from arm-cm3

diff --cc boards/board_common.mk
index 15e3efc57a53f585f5ea5c005f30863b42d6d894,612374c6ab97e3aae685284f6161ecb05e09523b..c166eeb4f7acb046be6bf9ad6f2e203947b1684f
--- 1/boards/board_common.mk
--- 2/boards/board_common.mk
+++ b/boards/board_common.mk
@@@ -1,8 -1,22 +1,22 @@@
  obj-$(CFG_PPC) += crt0.o\r
 -obj-$(CFG_HCS12D) += crt0.o\r
 +obj-$(CFG_HC1X) += crt0.o\r
- vpath-$(CFG_ARM_CM3) += $(ARCH_PATH-y)kernel\r
+ vpath-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/kernel\r
+ vpath-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/drivers/STM32F10x_StdPeriph_Driver/src\r
+ vpath-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/drivers/STM32_ETH_Driver/src\r
+ inc-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/drivers/STM32F10x_StdPeriph_Driver/inc\r
+ inc-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/drivers/STM32_ETH_Driver/inc\r
  obj-$(CFG_ARM_CM3) += core_cm3.o\r
  obj-$(CFG_ARM_CM3) += startup_stm32f10x.o\r
+ #stm32 lib files needed by drivers\r
+ obj-$(CFG_ARM_CM3) += stm32f10x_rcc.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_CAN) += stm32f10x_can.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_DIO) += stm32f10x_gpio.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_ADC) += stm32f10x_adc.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_ADC) += stm32f10x_dma.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_FLS) += stm32f10x_flash.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_PWM) += stm32f10x_tim.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_LWIP) += stm32_eth.o\r
+ \r
  \r
  \r
  # OS object files. \r