summaryrefslogtreecommitdiff
path: root/board/Synology
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-03-16 15:25:46 -0400
committerTom Rini <trini@konsulko.com>2016-03-16 15:27:54 -0400
commitd08fedf691dcf4137df406110b7c6f6007f42ee3 (patch)
treeece1aaa587a03e7f58ad57f3e3005393ef401fab /board/Synology
parentf5af0827f27638a437dada1c1cbcbb11a6a36b18 (diff)
mvebu: ds414: Move cmd_syno into ds414 directory
When we switch to including all linker lists in SPL it is important to not include commands as that may lead to link errors due to other things we have already discarded. In this case as we don't have other common code nor other Synology borads, move the cmd_syno.c file (which claims to be ds414 specific anyways!) into the ds414 directory and only build it for non-SPL builds. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/Synology')
-rw-r--r--board/Synology/common/Makefile7
-rw-r--r--board/Synology/ds414/Makefile5
-rw-r--r--board/Synology/ds414/cmd_syno.c (renamed from board/Synology/common/cmd_syno.c)0
3 files changed, 4 insertions, 8 deletions
diff --git a/board/Synology/common/Makefile b/board/Synology/common/Makefile
deleted file mode 100644
index e66aeb8467..0000000000
--- a/board/Synology/common/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (C) 2015 Phil Sutter <phil@nwl.cc>
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y := cmd_syno.o
diff --git a/board/Synology/ds414/Makefile b/board/Synology/ds414/Makefile
index 0f4c32d57c..93be101575 100644
--- a/board/Synology/ds414/Makefile
+++ b/board/Synology/ds414/Makefile
@@ -4,4 +4,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-y := ds414.o
+obj-y += ds414.o
+ifndef CONFIG_SPL_BUILD
+obj-y += cmd_syno.o
+endif
diff --git a/board/Synology/common/cmd_syno.c b/board/Synology/ds414/cmd_syno.c
index 20544e29c4..20544e29c4 100644
--- a/board/Synology/common/cmd_syno.c
+++ b/board/Synology/ds414/cmd_syno.c