replace CONFIG_PRELOADER with CONFIG_SPL_BUILD

[oweals/u-boot.git] / nand_spl / board / davinci / da8xxevm / Makefile

diff --git a/nand_spl/board/davinci/da8xxevm/Makefile b/nand_spl/board/davinci/da8xxevm/Makefile
index 61026759e67fe6ea09c3fcf16948c89fcdaba0d4..b3f4bd64c157fd325329318ae0654161d8fe5068 100644 (file)
--- a/nand_spl/board/davinci/da8xxevm/Makefile
+++ b/nand_spl/board/davinci/da8xxevm/Makefile
@@ -28,21 +28,22 @@ CONFIG_NAND_SPL     = y
 
 include $(TOPDIR)/config.mk
 
+nandobj        := $(OBJTREE)/nand_spl/
+
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
-LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
-AFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
-CFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
+LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
+          $(LDFLAGS_FINAL)
+AFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
+CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
 
 SOBJS  = start.o _udivsi3.o _divsi3.o
 COBJS  = cpu.o davinci_nand.o ns16550.o div0.o davinci_pinmux.o psc.o  \
-       common.o hawkboard_nand_spl.o nand_boot.o
+       misc.o hawkboard_nand_spl.o nand_boot.o
 
 SRCS   := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
 __OBJS := $(SOBJS) $(COBJS)
-LNDIR  := $(OBJTREE)/nand_spl/board/$(BOARDDIR)
-
-nandobj        := $(OBJTREE)/nand_spl/
+LNDIR  := $(nandobj)board/$(BOARDDIR)
 
 ALL    = $(nandobj)u-boot-spl $(nandobj)u-boot-spl.bin \
        $(nandobj)u-boot-spl-16k.bin
@@ -116,9 +117,9 @@ $(obj)hawkboard_nand_spl.c:
        ln -s $(TOPDIR)/board/davinci/da8xxevm/hawkboard_nand_spl.c $@
 
 # from board directory
-$(obj)common.c:
+$(obj)misc.c:
        @rm -f $@
-       ln -s $(TOPDIR)/board/davinci/da8xxevm/common.c $@
+       ln -s $(TOPDIR)/board/davinci/common/misc.c $@
 
 $(obj)psc.c:
        @rm -f $@