From patchwork Thu Apr 30 23:35:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Olivari X-Patchwork-Id: 466771 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DD1314076B for ; Fri, 1 May 2015 09:36:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=qca.qualcomm.com header.i=@qca.qualcomm.com header.b=eJTkd0WZ; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 50AEB28BCEC; Fri, 1 May 2015 01:34:47 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id C078F28A9A6 for ; Fri, 1 May 2015 01:34:37 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from wolverine02.qualcomm.com (wolverine02.qualcomm.com [199.106.114.251]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Fri, 1 May 2015 01:34:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1430436943; x=1461972943; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=2Js0/PHl3cg8MR9wo7UdaKeJBJCZHgW5OoVvDDtF+9o=; b=eJTkd0WZbN7sS9I3+ATT4fW4E2sT29gOT7qMpFaexWCd/Uh4vr98a28F 1VtTvMshx2KVzh3mu3FLwUUQWmfBV9ktoDlJcnSjp0TZI2Ged807wV4jJ 2UduwCg+42JOzOf5YYQEPd+soPr6Wv5Idynwq3cLHp2menFSsIWrkv7xD o=; X-IronPort-AV: E=McAfee;i="5700,7163,7787"; a="208417464" Received: from ironmsg03-l.qualcomm.com ([172.30.48.18]) by wolverine02.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 30 Apr 2015 16:35:39 -0700 X-IronPort-AV: E=Sophos;i="5.11,679,1422950400"; d="scan'208";a="899941873" Received: from nasanexm01g.na.qualcomm.com ([10.85.0.33]) by Ironmsg03-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 30 Apr 2015 16:35:39 -0700 Received: from mathieu-linux.qualcomm.com (10.80.80.8) by NASANEXM01G.na.qualcomm.com (10.85.0.33) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Thu, 30 Apr 2015 16:35:38 -0700 From: Mathieu Olivari To: Date: Thu, 30 Apr 2015 16:35:25 -0700 Message-ID: <1430436925-29418-2-git-send-email-mathieu@qca.qualcomm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430436925-29418-1-git-send-email-mathieu@qca.qualcomm.com> References: <1430436925-29418-1-git-send-email-mathieu@qca.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01C.na.qualcomm.com (10.85.0.83) To NASANEXM01G.na.qualcomm.com (10.85.0.33) Subject: [OpenWrt-Devel] [PATCH 2/2] include: make dtb argument optional in MkFIT X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" As mkits.sh makes the -d argument optional, we'll make this same argument optional in the MkFIT function as well. With this change, MkFIT can be used both to generate FIT images with DT, and without DT. Signed-off-by: Mathieu Olivari --- include/image.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/image.mk b/include/image.mk index 788d593..a6237ff 100644 --- a/include/image.mk +++ b/include/image.mk @@ -121,7 +121,7 @@ endef define Image/BuildKernel/MkFIT $(TOPDIR)/scripts/mkits.sh \ - -D $(1) -o $(KDIR)/fit-$(1).its -k $(2) -d $(3) -C $(4) -a $(5) -e $(6) \ + -D $(1) -o $(KDIR)/fit-$(1).its -k $(2) $(if $(3),-d $(3)) -C $(4) -a $(5) -e $(6) \ -A $(ARCH) -v $(LINUX_VERSION) PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $(KDIR)/fit-$(1).its $(KDIR)/fit-$(1)$(7).itb endef