Revert "rename a df_board.c to board.c and move it to the correct place."

This reverts commit 02100a4878ccd46d2d17cba9c32842d421b103d3.

diff --git a/board/xilinx/dfe/Makefile b/board/xilinx/dfe/Makefile
index 2e7e643b817e76af4805c24ef78be06577bbb883..d94199e6c146cf56d2099af8232b6e6a1fa9a42e 100644 (file)
--- a/board/xilinx/dfe/Makefile
+++ b/board/xilinx/dfe/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  := flash.o pl353_x8.o xemacpss_g.o xbasic_types.o xemacpss_control.o xemacpss_sinit.o xemacpss_bdring.o xemacpss.o xgmac.o board.o
+COBJS  := flash.o pl353_x8.o xemacpss_g.o xbasic_types.o xemacpss_control.o xemacpss_sinit.o xemacpss_bdring.o xemacpss.o xgmac.o
 SOBJS  := # lowlevel_init.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)

diff --git a/cpu/arm_cortexa8/dragonfire/Makefile b/cpu/arm_cortexa8/dragonfire/Makefile
index 06918abd83089a2a289e1225a09234f51c05fb14..96d0c57227eb6c4d18e5792bc32359f3cb9d53a1 100644 (file)
--- a/cpu/arm_cortexa8/dragonfire/Makefile
+++ b/cpu/arm_cortexa8/dragonfire/Makefile
@@ -29,6 +29,7 @@ include $(TOPDIR)/config.mk
 LIB    = $(obj)lib$(SOC).a
 
 COBJS-y        = interrupts.o
+COBJS-$(CONFIG_DRAGONFIRE)     += df_board.o
 
 OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
 

diff --git a/board/xilinx/dfe/board.c b/cpu/arm_cortexa8/dragonfire/df_board.c
similarity index 100%
rename from board/xilinx/dfe/board.c
rename to cpu/arm_cortexa8/dragonfire/df_board.c