From patchwork Mon Oct 15 13:52:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 984203 X-Patchwork-Delegate: simon.k.r.goldschmidt@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qulHRWPo"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42YfzG6YsYz9s5c for ; Tue, 16 Oct 2018 00:53:14 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9A2E7C21DA2; Mon, 15 Oct 2018 13:53:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id EC84FC21CB1; Mon, 15 Oct 2018 13:53:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D4B67C21D4A; Mon, 15 Oct 2018 13:53:06 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by lists.denx.de (Postfix) with ESMTPS id 5B300C21C50 for ; Mon, 15 Oct 2018 13:53:05 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id q19-v6so6272254pll.5 for ; Mon, 15 Oct 2018 06:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=lq5rdvKu2AScSTYSP3IwLoNiHC7x4hXfb+iLDh8MOY8=; b=qulHRWPodvdIvEqz8mSpDmGYHQYGopVdebKIa+xjwJ14IWDI3p1myiJBDpZ0ertF9U LeoU5XP97Kgs5MtuKMPafDM9yN9yfOkyr6gtvq8zWy32ttFLiCCuO85UvF93q4yQsUqa f4+U9Ne3d449KD+IzEERcNLeNhxcauqTtx/CgMBkqPCnCWYKgqj508Dd8tkUImGwfQd5 mPur3n5Q1jO2FoMtvHtN+cYlBZtZXMmY3zFLXIQIKZVlPkMLEvIbV4holhmgqr0Iaw5Z DLA5DFsiiT31osbGmds3Xd3JC5kfv34nu8f6K2TEi7Wdybl+e8//DODC6lDFi3VzOG7E iG3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lq5rdvKu2AScSTYSP3IwLoNiHC7x4hXfb+iLDh8MOY8=; b=Svt92ib6suTua5SY948/A8H6nr2aYi4/PWp2qIAT22tIb0GAAL+oIqz38GdDRpbl51 desrR1S6CD/cV5nBSOS4mHuV3yz3yTbMpm4oTLSB+lYuGpPvtmSjHPeGwrB07xsv+vbw nFtwDSG+4vXMX+hOY/8PuBYLtgRGEPDx2Zx9L+uTfzmLLGTNy6GiI7kx954Z4JBzGD3q EREP/0+hCC8JZMlltdliH8wrVubaD5JrslUd1HDpcCqucAKRQpZSGs3xxuRTj3TZ3fho uXexFtnC43ImHT2KGpl1uy5uE3OGoeHjKYNvEQCTPrAfkZgV3DPjVkK1O500BqSAjY95 l2Tg== X-Gm-Message-State: ABuFfogd63UAJDj8Epsx9GpSYwA2SrV/pYTlF4sI5ix3I0ySLDm+lMRe BvF4oJqyBtJhpwenVKajBjb752E3 X-Google-Smtp-Source: ACcGV613eJtg/wG81kA7Z3aPByF5zxmclR5BU05QY7F5+UxxyI/iPKClKPG5G225VOfpRqunEomVgg== X-Received: by 2002:a17:902:d68e:: with SMTP id v14-v6mr17241187ply.140.1539611583440; Mon, 15 Oct 2018 06:53:03 -0700 (PDT) Received: from dwesterg-mobl.amr.corp.intel.com (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id t64-v6sm22769307pfb.44.2018.10.15.06.53.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Oct 2018 06:53:02 -0700 (PDT) From: Dalon Westergreen To: u-boot@lists.denx.de, marex@denx.de, chin.liang.see@intel.com, tien.fong.chee@intel.com Date: Mon, 15 Oct 2018 06:52:42 -0700 Message-Id: <20181015135242.14893-1-dwesterg@gmail.com> X-Mailer: git-send-email 2.17.2 Cc: Dalon Westergreen Subject: [U-Boot] [Patch v3] socfpga: clean up sfp generation X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Dalon Westergreen Move the sfp file generation entirely to the root Makefile. This means that the u-boot-spl.sfp will only be generated when required and only for the socfpga variants that require it. sfp generation is now entirely controlled by CONFIG_BUILD_TARGET being set to either spl/u-boot-spl.sfp or more likely u-boot-with-spl.sfp Signed-off-by: Dalon Westergreen Tested-by: Simon Goldschmidt --- v3: -> Change ifdef to ifneq -> Fix error, should not use $(SPL_BIN) as it was not defined in Makefile v2: -> condense changes to 1 patch to avoid breaking git bisect --- Makefile | 11 ++++++++--- scripts/Makefile.spl | 12 ------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index aadd1ec8c6..5f03e534a5 100644 --- a/Makefile +++ b/Makefile @@ -1207,6 +1207,14 @@ u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE $(call if_changed,pad_cat) ifneq ($(CONFIG_ARCH_SOCFPGA),) +ifneq ($(CONFIG_TARGET_SOCFPGA_ARRIA10),) +MKIMAGEFLAGS_u-boot-spl.sfp = -T socfpgaimage_v1 +else +MKIMAGEFLAGS_u-boot-spl.sfp = -T socfpgaimage +endif +spl/u-boot-spl.sfp: spl/u-boot-spl.bin FORCE + $(call if_changed,mkimage) + quiet_cmd_socboot = SOCBOOT $@ cmd_socboot = cat spl/u-boot-spl.sfp spl/u-boot-spl.sfp \ spl/u-boot-spl.sfp spl/u-boot-spl.sfp \ @@ -1542,9 +1550,6 @@ spl/sunxi-spl.bin: spl/u-boot-spl spl/sunxi-spl-with-ecc.bin: spl/sunxi-spl.bin @: -spl/u-boot-spl.sfp: spl/u-boot-spl - @: - spl/boot.bin: spl/u-boot-spl @: diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 7416abec62..a58113cee2 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -198,10 +198,6 @@ ifdef CONFIG_SAMSUNG ALL-y += $(obj)/$(BOARD)-spl.bin endif -ifdef CONFIG_ARCH_SOCFPGA -ALL-y += $(obj)/$(SPL_BIN).sfp -endif - ifdef CONFIG_ARCH_SUNXI ALL-y += $(obj)/sunxi-spl.bin @@ -324,14 +320,6 @@ LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE) endif endif -ifdef CONFIG_TARGET_SOCFPGA_ARRIA10 -MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage_v1 -else -MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage -endif -$(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE - $(call if_changed,mkimage) - quiet_cmd_mksunxiboot = MKSUNXI $@ cmd_mksunxiboot = $(objtree)/tools/mksunxiboot \ --default-dt $(CONFIG_DEFAULT_DEVICE_TREE) $< $@