Merge with 611be225e1cd9a5cf482f394a0e53d3983ecb394

[arc.git] / boards / board_common.mk

diff --git a/boards/board_common.mk b/boards/board_common.mk
index 5c30afe9b75730664f9f516f8db5f6f993d17335..de00a1feaae09f3c152420d940bf77f07343680a 100644 (file)
--- a/boards/board_common.mk
+++ b/boards/board_common.mk
@@ -1,13 +1,8 @@
 obj-$(CFG_PPC) += crt0.o\r
 obj-$(CFG_HCS12D) += crt0.o\r
 vpath-$(CFG_ARM_CM3) += $(ARCH_PATH-y)kernel\r
-obj-$(CFG_ARM_CM3) += system_stm32f10x.o\r
 obj-$(CFG_ARM_CM3) += core_cm3.o\r
-\r
-obj-$(CFG_STM32_MD) += startup_stm32f10x_md.o\r
-obj-$(CFG_STM32_LD) += startup_stm32f10x_ld.o\r
-obj-$(CFG_STM32_HD) += startup_stm32f10x_hd.o\r
-obj-$(CFG_STM32_CL) += startup_stm32f10x_cl.o\r
+obj-$(CFG_ARM_CM3) += startup_stm32f10x.o\r
 \r
 #Ecu\r
 #obj-y += EcuM_$(BOARDDIR).o\r
@@ -34,7 +29,7 @@ obj-$(CFG_MPC55XX)-$(USE_MCU) += Mcu_Exceptions.o
 # Flash\r
 obj-$(USE_FLS) += Fls.o\r
 obj-$(USE_FLS) += Fls_Cfg.o\r
-obj-$(USE_FLS) += Fls_H7F.o\r
+obj-$(CFG_MPC55XX)-$(USE_FLS) += Fls_H7F.o\r
 \r
 # Bring in the freescale driver source  \r
 inc-$(CFG_MPC55XX) +=  $(ROOTDIR)/$(ARCH_PATH-y)/delivery/mpc5500_h7f/include\r