wandboard: Rework Makefile to prevent spl.o from being built

The spl.c source was entirely conditioned by CONFIG_SPL_BUILD.
Change this moving CONFIG_SPL_BUILD to be used in the Makefile,
which is slightly cleaner and more readable.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>

diff --git a/board/wandboard/Makefile b/board/wandboard/Makefile
index 6e886f729a85643335cf1eb4f7fabf6039277c11..c3d80536b3a322acb5161c0d4451529955c43719 100644 (file)
--- a/board/wandboard/Makefile
+++ b/board/wandboard/Makefile
@@ -2,4 +2,5 @@
 #
 # (C) Copyright 2013 Freescale Semiconductor, Inc.
 
-obj-y  := wandboard.o spl.o
+obj-y  := wandboard.o
+obj-$(CONFIG_SPL_BUILD) += spl.o

diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c
index 000cb109fc15527cbc554a88d9d74181f798f871..7b0f15a5c4d1fc64ccb79a7a5d005d1e996ca0bb 100644 (file)
--- a/board/wandboard/spl.c
+++ b/board/wandboard/spl.c
@@ -20,7 +20,6 @@
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
 
-#if defined(CONFIG_SPL_BUILD)
 #include <asm/arch/mx6-ddr.h>
 /*
  * Driving strength:
@@ -513,5 +512,3 @@ int board_mmc_init(bd_t *bis)
 
        return 0;
 }
-
-#endif