From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751454AbbJaXVY (ORCPT ); Sat, 31 Oct 2015 19:21:24 -0400 Received: from smtprelay2.synopsys.com ([198.182.60.111]:35594 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750783AbbJaXVV (ORCPT ); Sat, 31 Oct 2015 19:21:21 -0400 From: Alexey Brodkin To: linux-snps-arc@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Alexey Brodkin , Vineet Gupta Subject: [PATCH] arc: dts - remove default value if CONFIG_ARC_BUILTIN_DTB_NAME is blank Date: Sun, 1 Nov 2015 02:21:11 +0300 Message-Id: <1446333671-32095-1-git-send-email-abrodkin@synopsys.com> X-Mailer: git-send-email 2.4.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As of today default .dtb will be built (and subsequently will be built-in kernel binary) even if CONFIG_ARC_BUILTIN_DTB_NAME is not set. But it is possible we're going to use external .dtb and so we don't want to have .dtb built-in kernel binary. For example that could be the case with: a) U-Boot which loads .dtb in DDR and passes its address to the kernel b) OpenWRT which embeds .dtb in existing kernel binary This change excludes .dtb building if CONFIG_ARC_BUILTIN_DTB_NAME is blank. Signed-off-by: Alexey Brodkin Cc: Vineet Gupta --- arch/arc/Makefile | 2 ++ arch/arc/boot/dts/Makefile | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arc/Makefile b/arch/arc/Makefile index 8a27a48..b0cb6de 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -94,7 +94,9 @@ head-y := arch/arc/kernel/head.o core-y += arch/arc/ # w/o this dtb won't embed into kernel binary +ifneq ($(CONFIG_ARC_BUILTIN_DTB_NAME),"") core-y += arch/arc/boot/dts/ +endif core-$(CONFIG_ARC_PLAT_SIM) += arch/arc/plat-sim/ core-$(CONFIG_ARC_PLAT_TB10X) += arch/arc/plat-tb10x/ diff --git a/arch/arc/boot/dts/Makefile b/arch/arc/boot/dts/Makefile index b0e3f19..4dcab5b 100644 --- a/arch/arc/boot/dts/Makefile +++ b/arch/arc/boot/dts/Makefile @@ -1,13 +1,11 @@ # Built-in dtb -builtindtb-y := nsim_700 ifneq ($(CONFIG_ARC_BUILTIN_DTB_NAME),"") builtindtb-y := $(patsubst "%",%,$(CONFIG_ARC_BUILTIN_DTB_NAME)) + obj-y += $(builtindtb-y).dtb.o + targets += $(builtindtb-y).dtb endif -obj-y += $(builtindtb-y).dtb.o -targets += $(builtindtb-y).dtb - .SECONDARY: $(obj)/$(builtindtb-y).dtb.S dtbs: $(addprefix $(obj)/, $(builtindtb-y).dtb) -- 2.4.3