From d08fedf691dcf4137df406110b7c6f6007f42ee3 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2016 15:25:46 -0400 Subject: [PATCH] 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 --- board/Synology/common/Makefile | 7 ------- board/Synology/ds414/Makefile | 5 ++++- board/Synology/{common => ds414}/cmd_syno.c | 0 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 board/Synology/common/Makefile rename board/Synology/{common => ds414}/cmd_syno.c (100%) 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 -# -# 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 similarity index 100% rename from board/Synology/common/cmd_syno.c rename to board/Synology/ds414/cmd_syno.c -- 2.25.1