From patchwork Wed Dec 19 13:31:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1016063 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=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="CxfFtBZs"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43KbXZ2jDWz9s55 for ; Thu, 20 Dec 2018 00:37:02 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E3742C220D4; Wed, 19 Dec 2018 13:32:35 +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=SPF_HELO_PASS, 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 2C62FC220B0; Wed, 19 Dec 2018 13:31:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 13FD0C22026; Wed, 19 Dec 2018 13:31:17 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130080.outbound.protection.outlook.com [40.107.13.80]) by lists.denx.de (Postfix) with ESMTPS id 964E2C220C4 for ; Wed, 19 Dec 2018 13:31:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZV+JiUngZ/dhaFF0mgWqxRGZeQSDzyoNC6w2D9XQc/s=; b=CxfFtBZstO2PM+2gWyjXU/qzQC5cGHi1AxNY+GX0i6gGcNZ1EEO3yNqK1yNqg/lJ4Byq7RlLvSCQf3ZmGX9NXtstI9FfO85c0ZasrBpuIS6t9cbW7z1gETP2HWcQzkJLtmidmP5yAoyDK3rleNblAoEkLTAI4VFmQboUqcghiG8= Received: from DB7PR04MB4490.eurprd04.prod.outlook.com (52.135.138.16) by DB7PR04MB4890.eurprd04.prod.outlook.com (20.176.234.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1425.22; Wed, 19 Dec 2018 13:31:10 +0000 Received: from DB7PR04MB4490.eurprd04.prod.outlook.com ([fe80::a83e:5abb:13aa:32c1]) by DB7PR04MB4490.eurprd04.prod.outlook.com ([fe80::a83e:5abb:13aa:32c1%2]) with mapi id 15.20.1446.018; Wed, 19 Dec 2018 13:31:10 +0000 From: Peng Fan To: "sbabic@denx.de" , Fabio Estevam Thread-Topic: [PATCH 08/10] imx: build flash.bin for i.MX8 Thread-Index: AQHUl58aRVM+YKnG30ul7SBFWUnigA== Date: Wed, 19 Dec 2018 13:31:10 +0000 Message-ID: <20181219133951.21194-9-peng.fan@nxp.com> References: <20181219133951.21194-1-peng.fan@nxp.com> In-Reply-To: <20181219133951.21194-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.14.1 x-clientproxiedby: HK0PR01CA0046.apcprd01.prod.exchangelabs.com (2603:1096:203:3e::34) To DB7PR04MB4490.eurprd04.prod.outlook.com (2603:10a6:5:35::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [92.121.68.129] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR04MB4890; 6:nW/spS7nBOx0+THaknRUBxQFFi6KddkRrSEsuLKxIml7UTsVj06XShkMGBVfQmswr5ySEQGrwYZzOfVEtx+cHtiWECWJmegtEcLBiwfdZiXuA7/Y51qywMt2F6gLJvGoEL5KTXikGeUWTsSi0qAWndEpsxoVtgUPi/l4PBeRjIlq4zrU0lyh0YVnbxIfR/a9YVMz8cD6qvI/EWXHnsS6RrIALOcIl8h5bjsExQnz/fXiXLv0fF9W4hCh/srdWA1elnlh022LtV3sq4/L0QUQMUVpHx3NLvUXJKjhLkTkJP1+jBnix6zXM8hStoQ0lQD0cGEvN4oCYAHktrZwMmwh7D/F2F4m9YTnFVpgtmkl1Xo6e8BMFPCxiM7aa9SCCprEckZLpBe9GufR5+qn3DcXtWV1fj2kDtpvZZ6/2nhIJMHpAs/iJxZuBmQcE+ZI304tgL51UsXvHRF8pK38vBW0Gw==; 5:+JwQR3xqLFoQbgkaoe/d+RlgFMRMQ3M9eFVYoBnnHkgG6uCuuUYgZmzGxad6bMYY65bIIOlE/FftkewHML0C00Z8Cy3S0qR9MOtHhxHhPgnLVpUUEJ3+2NEAEQjxLUomY5SaK2ZgK6mMWZAZJ01F7+l8sDxNjG6+WZ+gBC0sHEc=; 7:eAsc8o9/qsKcYrcbSNdxcIdNwYTpC4bWNPSdvZqGFjGZlkn4oDny3OOArywK9rfo6q3+ySZ6kYg8+HQDCqMx6lOKsuOKo71TA2sXgFmLyreL3jsppLI/PtgcVOYKEBJAq/WIfKfJP5KWdjpQcorbgw== x-ms-office365-filtering-correlation-id: aa3c1bd4-e562-4bc5-7678-08d665b63ccf x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:DB7PR04MB4890; x-ms-traffictypediagnostic: DB7PR04MB4890: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(6040522)(2401047)(8121501046)(5005006)(3231475)(944501520)(52105112)(93006095)(93001095)(3002001)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123558120)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:DB7PR04MB4890; BCL:0; PCL:0; RULEID:; SRVR:DB7PR04MB4890; x-forefront-prvs: 0891BC3F3D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(366004)(39860400002)(136003)(189003)(199004)(86362001)(575784001)(6116002)(2906002)(305945005)(478600001)(316002)(5660300001)(1076003)(110136005)(54906003)(7736002)(3846002)(53936002)(71190400001)(71200400001)(4326008)(99286004)(25786009)(6512007)(14444005)(256004)(66066001)(2501003)(6486002)(14454004)(76176011)(68736007)(52116002)(6436002)(186003)(102836004)(386003)(6506007)(97736004)(26005)(81166006)(8676002)(11346002)(106356001)(36756003)(105586002)(446003)(6636002)(486006)(81156014)(44832011)(50226002)(8936002)(476003)(2616005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB4890; H:DB7PR04MB4490.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: xsWxNUD8yWxnziAXKF7SATBIkPgMN74sUsQtlw/8S7gMyWRfKPvHyc++/SWt15uPoMF26JZFcWwtVrdhqe9KYgfX58+lewr4qCVpKKGy2eDrSaRbLVhI1AQBgtLDlUGi5ZqTCL92LDq/9UQyWnGtrVmSfprFsU4jVFSfcBRU0KsHIhl5Ihh95d1kJ3N+7NZeP6ForrqLvtUsKt94I4aDKjua56darHGZPLZC8ZsxQJ4WxwPeSU51mAr97XT3lNA5/yIWXkIAUoPbckgay9T8qqkD9XAJmeshJyAGwC+A0ct5l4Y2+4+0DUCzSGbRac1U spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa3c1bd4-e562-4bc5-7678-08d665b63ccf X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Dec 2018 13:31:10.2859 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4890 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH 08/10] imx: build flash.bin for i.MX8 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Build flash.bin for i.MX8 when SPL enabled. Signed-off-by: Peng Fan --- Makefile | 2 +- arch/arm/mach-imx/Makefile | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 74d4259eb6..e9a0d3ab3a 100644 --- a/Makefile +++ b/Makefile @@ -1200,7 +1200,7 @@ tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin FORCE SPL: spl/u-boot-spl.bin FORCE $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@ -ifeq ($(CONFIG_ARCH_IMX8M), y) +ifeq ($(CONFIG_ARCH_IMX8M)$(CONFIG_ARCH_IMX8), y) flash.bin: spl/u-boot-spl.bin u-boot.itb FORCE $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@ endif diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 5424848ad3..e84798b35c 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -105,6 +105,7 @@ IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%) ifeq ($(CONFIG_ARCH_IMX8), y) CNTR_DEPFILES := $(srctree)/tools/imx_cntr_image.sh IMAGE_TYPE := imx8image +SPL_DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o spl/u-boot-spl.cfgout $(srctree)/$(IMX_CONFIG); if [ -f spl/u-boot-spl.cfgout ]; then $(CNTR_DEPFILES) spl/u-boot-spl.cfgout; echo $$?; fi) DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o u-boot-dtb.cfgout $(srctree)/$(IMX_CONFIG); if [ -f u-boot-dtb.cfgout ]; then $(CNTR_DEPFILES) u-boot-dtb.cfgout; echo $$?; fi) else ifeq ($(CONFIG_ARCH_IMX8M), y) IMAGE_TYPE := imx8mimage @@ -153,6 +154,18 @@ ifeq ($(DEPFILE_EXISTS),0) endif endif +ifeq ($(CONFIG_ARCH_IMX8), y) +SPL: + +MKIMAGEFLAGS_flash.bin = -n spl/u-boot-spl.cfgout -T $(IMAGE_TYPE) -e 0x100000 +flash.bin: MKIMAGEOUTPUT = flash.log + +flash.bin: spl/u-boot-spl.bin u-boot.itb FORCE +ifeq ($(SPL_DEPFILE_EXISTS),0) + $(call if_changed,mkimage) +endif +endif + else MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \ -T $(IMAGE_TYPE) -e $(CONFIG_SPL_TEXT_BASE)