From da0e75fcc5e61c391cf52a4be946714df3d0fba0 Mon Sep 17 00:00:00 2001 From: jcar Date: Thu, 22 Dec 2011 08:32:14 +0100 Subject: [PATCH] missed saving the merge of board_common. Now the new fls for ppc should be merged correctly --- boards/board_common.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/boards/board_common.mk b/boards/board_common.mk index d82bb6f0..3528e093 100644 --- a/boards/board_common.mk +++ b/boards/board_common.mk @@ -62,11 +62,9 @@ obj-$(USE_MCU) += Mcu_Cfg.o # Flash obj-$(USE_FLS) += Fls.o obj-$(USE_FLS) += Fls_Cfg.o -ifeq ($(CFG_MPC5606S),y) -obj-$(CFG_MPC55XX)-$(USE_FLS) += Fls_C90FL.o -else -obj-$(CFG_MPC55XX)-$(USE_FLS) += Fls_H7F.o -endif +obj-$(CFG_MPC55XX)-$(USE_FLS) += flash_h7f_c90.o +obj-$(CFG_MPC55XX)-$(USE_FLS) += flash_ll_h7f_c90.o + # Bring in the freescale driver source inc-$(CFG_MPC55XX) += $(ROOTDIR)/$(ARCH_PATH-y)/delivery/mpc5500_h7f/include -- 2.39.2