From patchwork Fri Dec 21 06:21:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1017330 X-Patchwork-Delegate: sbabic@denx.de 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="qhV0JSKC"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43Ldwl2d1Cz9sDN for ; Fri, 21 Dec 2018 17:28:07 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 00E97C21F18; Fri, 21 Dec 2018 06:27:00 +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 22CC2C21F79; Fri, 21 Dec 2018 06:22:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7D8E9C21FB0; Fri, 21 Dec 2018 06:21:37 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30064.outbound.protection.outlook.com [40.107.3.64]) by lists.denx.de (Postfix) with ESMTPS id CD59AC21F24 for ; Fri, 21 Dec 2018 06:21:32 +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=qhV0JSKC1BIdezM623mI3Beh+4L+pAy1ci8crPquu5WhWUqGqf+rTdOqCatcnFu/C8r1E3wRy1h+ywmcga/8wORZVNolzWCQ1c+P5BzFpsnRK10mtgdfav4xDg6BJ4vE6n1GJxtf8+/8buuCs0MyU/LOjOCNfIL8Sdaem44XTAg= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.148.143) by AM0PR04MB4978.eurprd04.prod.outlook.com (20.177.40.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1446.19; Fri, 21 Dec 2018 06:21:31 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5507:f6c1:df5d:ba18]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5507:f6c1:df5d:ba18%3]) with mapi id 15.20.1446.022; Fri, 21 Dec 2018 06:21:31 +0000 From: Peng Fan To: "sbabic@denx.de" Thread-Topic: [PATCH V2 08/10] imx: build flash.bin for i.MX8 Thread-Index: AQHUmPVqO2T2rtP1X0CH8XVhbLQheA== Date: Fri, 21 Dec 2018 06:21:31 +0000 Message-ID: <20181221063010.25256-9-peng.fan@nxp.com> References: <20181221063010.25256-1-peng.fan@nxp.com> In-Reply-To: <20181221063010.25256-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: HK0PR01CA0038.apcprd01.prod.exchangelabs.com (2603:1096:203:3e::26) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:73::15) 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; AM0PR04MB4978; 6:oqn2MxRiLe1iEGsPmsP+lmqM5oW6rUFKgKVCgExE6uoKnWJhbgnIT8zK50DCPrQdkEPkT9vyGL+XRXeTUnlOjcJCidw+hee/E9mOAEN5/buayFNKeKXY3y5EvvsEwEg7aCL/5CldfFqWVs01FgWhYdSzss6RXiw1NzwnmGRFKxImb9ITBGJBUOPhbu7r3EWVjZitOfyfvhp1LHOX0kN4zrm6NWSnNoKMxdQhh4nVBzU5S0QnWM/ow1DLUW4iNtE4NMi4jTzzmNdO/mrYQNq7qrqZc4KtX6xCOyrQaM6anaELofV87osU4opSwKCgbGXXBWaTRK6HhVHO+/LZIdVx6qLQinVPg0BvDxr2YJJiWvLl30EVaMaVNtcY5emQXHR6JeMYLmyA8qBlMroOT6XRNnfs/FDz0sR/TUrZzB2N5k+h7EtlEfUTlGzL47b5TWqbNjqPTcwyUy/E5bwdPk1Www==; 5:UqShj7lIkpwDAWyEuBHE2OaFVr0vn7sjA7kyDbiG0nSK348zyaTBoMu2stwozlvvSNY4K/9gcwSibUIRMuJ9VldgUmFmTPNh8HDqjPpiRLcRAEJn0VEvlsdqhMjh1yauxz77/8Ci1/4QZv+2yzfpoeokLksn0S4gO5Q0YoxCdYw=; 7:c4aNrrsKnvQ/S/d2QOtM32io3gEV57Y2d7LjAPsQB+CEfP4o12bMT0VLOVEl8lWmplzl97GnicrEN/DdDRcjYZ0C052Z4DQf0MyfJAwLTqyYWo9OmKsksP1AdphNFD+NNBKVQhORrNqeKplBwGSDgQ== x-ms-office365-filtering-correlation-id: 7c20590a-1467-45f3-7056-08d6670c8c98 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4978; x-ms-traffictypediagnostic: AM0PR04MB4978: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(5005026)(6040522)(2401047)(8121501046)(10201501046)(3231475)(944501520)(52105112)(3002001)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:AM0PR04MB4978; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4978; x-forefront-prvs: 0893636978 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(346002)(39860400002)(366004)(376002)(396003)(136003)(189003)(199004)(102836004)(36756003)(99286004)(66066001)(105586002)(50226002)(2351001)(106356001)(68736007)(6512007)(53936002)(2906002)(54906003)(316002)(486006)(186003)(26005)(478600001)(14444005)(2501003)(52116002)(14454004)(386003)(6506007)(575784001)(76176011)(256004)(44832011)(86362001)(97736004)(7736002)(305945005)(446003)(8676002)(1730700003)(81156014)(25786009)(81166006)(4326008)(71190400001)(2616005)(476003)(11346002)(8936002)(71200400001)(1076003)(6436002)(5640700003)(6486002)(6916009)(5660300001)(3846002)(6116002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4978; H:AM0PR04MB4481.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: Us4eSUyz86dPZmPr0UktBqBPv6pYfHVpiPGuIEqzNh1BlXP0CKFIGNDNGaRKdx9TlzuGaRW4oDGBZne2url/nWGjFPIAnDna8Bg03R6reAWio755sdZVqK73nThWzKn4IUOBGPrLZmLKMED5wJAl3oWGmcZ1CN5McDgexUgxkVbakj+P+NJm2Cl2sVonUpge+0M99ZkFKDRq0Crw0eLmY1VzTP/PXAPXoYkipi8HEjhO1wjz5KFNygQ58KqAS/XcTpWaU0eQz5CJwVI7Mh+Wf1p+eeBN8ygPL6ncWW7UzbHR8po6Kys7qlDE3uX5pfNo spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c20590a-1467-45f3-7056-08d6670c8c98 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Dec 2018 06:21:31.8304 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4978 Cc: Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH V2 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)