summaryrefslogtreecommitdiff
path: root/board/wandboard
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel@collabora.com>2019-05-25 19:19:41 -0300
committerStefano Babic <sbabic@denx.de>2019-06-11 10:42:48 +0200
commit5ef237ad6faf0765985e2942c968f9834bc791ef (patch)
treec5f802e12801a8e645d75b3cb07569f11a069337 /board/wandboard
parentcc48c2a5cfdbd883078f6b17608090482e5f60ca (diff)
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>
Diffstat (limited to 'board/wandboard')
-rw-r--r--board/wandboard/Makefile3
-rw-r--r--board/wandboard/spl.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/board/wandboard/Makefile b/board/wandboard/Makefile
index 6e886f729a..c3d80536b3 100644
--- 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 000cb109fc..7b0f15a5c4 100644
--- 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