From patchwork Mon Jun 27 03:41:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1648586 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=PRweYQzH; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LWXVB2wH6z9sGt for ; Mon, 27 Jun 2022 12:58:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 43CDD84398; Mon, 27 Jun 2022 04:58:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="PRweYQzH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5909A8438D; Mon, 27 Jun 2022 04:58:18 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60082.outbound.protection.outlook.com [40.107.6.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0810D83C35 for ; Mon, 27 Jun 2022 04:58:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L5uGpBdDPwUL4kh0MBMmVuE0K9xuDLgZ+B7/a0zhJxyoswkNTI6VMlZ0/9Hbz77RRw023IQr4S0VcIdAAJIbD2DAMUDW6HsmH+d5YrFxCW2x6yy8pkBkcY23ueveHEXFrIteiG5vWBRrlcCFgcGL1om3h/ndbXhL5w5ASvJPqI/vr4PHdhWgnKTkFbHgUcy7bcBME+Nw1GCMcVB0wno5olbN7BSGdZ9CGFRe/jv/LhkD/3R5jyQrJdQkhgwyhdd0bLTwZi9NLjK2RdyxyLct1x27OiOCfePiNUVWGlxeyuGZaKX6rdcjjF7xhmbsjl1qaTeFXtbqvu1EM5HhaqVnrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Hfp3YXTVnJDaZLWYmGNalRIW8em2IR8hB/xqBascfss=; b=OPt4rbPGWFVQAe0+2ibUH9TKv8Y7q5pXJ0va9RbX3atlD4eilQOfMlYqv8XpsAvyy8eYGP6aqZDdk9IkMHM20YaKjRFudHX290kWICYdzvaxIPshM6hs9+qRM/HN0NMtodlykFadneDifQPi5X9XVL9EmDJDtmLNUeHmC7a1z3khKaku6ggcObUjAVbz49/zYCNrEpZuDwMN4OV63y8KpVHqknsFs9zGILI9N5VD2blI6gFvyYN8NEvno5wpMkGWjoBACY25XJkvpcvdARgvJDMaH40nNeTkroGCEOHMd1iPowQ0SiPu7xymEGKaYIzR78O/dDPozawadLlaXAAAcQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Hfp3YXTVnJDaZLWYmGNalRIW8em2IR8hB/xqBascfss=; b=PRweYQzHXscjH6rDbRT485MJF1sZpWzR81q7+UZX4284Iq1F2BXoXK+xijzhFYeSATtItQ6X1yEJ9pnulynO8udC2RcEF2vjHY5U+0P3kNdWPLnUgFREHbJhtX7UMArWLDYAcLUbxMQSp4mg1A3p9x43V/OmPCt8b2RB21tPwtY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DBBPR04MB6218.eurprd04.prod.outlook.com (2603:10a6:10:d0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Mon, 27 Jun 2022 02:58:12 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fdd4:8557:334b:180d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fdd4:8557:334b:180d%6]) with mapi id 15.20.5373.018; Mon, 27 Jun 2022 02:58:12 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" , "Ariel D'Alessandro" , Michael Trimarchi , Tim Harvey Cc: u-boot@lists.denx.de, Peng Fan , Alper Nebi Yasak Subject: [PATCH V7 1/4] arm: dts: imx8m: update binman ddr firmware node name Date: Mon, 27 Jun 2022 11:41:27 +0800 Message-Id: <20220627034130.5892-2-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220627034130.5892-1-peng.fan@oss.nxp.com> References: <20220627034130.5892-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR06CA0009.apcprd06.prod.outlook.com (2603:1096:4:186::17) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e4991fac-1f0f-4b52-8bae-08da57e8dfc9 X-MS-TrafficTypeDiagnostic: DBBPR04MB6218:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LUaFNg99qrATjf6XsuUzpdy7ePvlK65IYuPpBpPktIkQ5AN+QbYtbb80og+LS24eTjlsqKj5Hd2NHNEw9jEqQ16YW66vMgsoyS0SNb2Ddbcj6jV2L1Hkm0YMqL4lia2XinNDN2RwLBAKSLUcg6c487q/ZBfmfDJtt7odoAHJM8Gicacm3OIBJxqhKpDtHPosXLVnTrK2fAraLo4dxFDjTmzjHxNIb0eit3yiaCCf8k4fY042GuNzp1Bl/5Te7eo6Bgqx9j15Xarj/1GAXNxAHWrdMH79tXBsVl1+wKHWSosotCMrT8qpKYU1xQm99vm4GnvIfVQ0JHbDdjM/KJa1uX58v4rI5+KVGHe4LkN9eDFksCEj3Ymga/bbXsCsurWE8JTF8hP6dzre6B43YPnN9SQ0qBJUNtc/2EqjRrmX9KSoc7q3aU1F9AustRoshIkB1W+PIV4Gjh6fOgPURxalGtaxNmRY4O9U9Sk8V/KaxbEZ4FAJyc5FupwSXgTzAbCX1esoPPPeWaPqhiHc9rQ5eAop9CBFX8UiCm0HkjLg36gruxPVPaJvxYq5D+ujf+0IXD8jetBq/rCmo51jbf5GR3f3lGjizNL5LvRe1CifdSUUBTJTwaUpXuQEWTZ0JioPf43RRsWQ8o/FT2HaXbd5A1JlE1or+5gGapMH65yWteKv2dGzuLIQB9v2uvdyGc5IFoynpHekE8YXWcvMUWtporfW0yBGawX0rV9iknLTU2IsTE+ahLQuUowQbrEGn43LhiHY/09VgIRsKNbKZuM/Jmwyp90OfdRSh8bAJ0j10gwdnjNGi8maI1LHOIDenG/swgmYCebn3vYGyPj4eMDR6g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(346002)(136003)(376002)(366004)(396003)(6512007)(5660300002)(2616005)(66556008)(66476007)(1076003)(186003)(6506007)(38100700002)(86362001)(15650500001)(316002)(41300700001)(66946007)(478600001)(8936002)(8676002)(4326008)(2906002)(52116002)(6486002)(83380400001)(110136005)(54906003)(38350700002)(6666004)(26005)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JL3tybTLoJNTO26kAO8oGsKz6l0kYX1ncw+zSX+5EOvNDCgbfD0Z3hr+y4QKJJLONtDgLB3jgG7P1t/KrPovzC3gvu+WtAvSnlKXzxnoKZ2z2WSVTeh6fr2zO56iJ7Vr1yBvWnpUp/dU2oPDg0PbuIrKwOJoF7gSfohTCEEzYv5Qvb+RVgSWH7iSJkGamGEh++IHICMzjp5JAGN8u1PgSs5KaSP+Fs24HBd3V4Qzf8Soy2ees4uHQmiN5/hV+MttyZtqWmIDuhHBh2QVvhmyOzN61YrAlHoKVLLAcqSeKFgBZOBnMHJujL38KbeinL7+/frdUQuyioixtyZGqeE3OWwFV05DblrHevGXvb66eghMbEjvN14AnTgkZ9IVgE8R1umjMZ6O6tIdH2EIEwod+yBqv00SoztH6Te5HM+jYlny/TOr/dOHZfojad63uDEDdSkpcfU7cJd0xXvPWQdgT6Q2lva6SaPNUICz2o92vObht1eUA0Y3G8o6NqyCBM7xxe3VXozse5rKCmU/Qj2wX0J1eX0d7PpbrW6J/MCHZ7sKRETI32cZYSB25NEmk8gQg3fZdZjHpxtcdSaNbVWVOML1k/amzHbtOaGbJd++9PZ6qZ06uBRT+K4MQxxUkxZTLnMFAi6Oa2ujznAyP2IwbnI9OVrtRmS0GQNYxbhqB/Zr/HIeYpADZipM7Wk27Vp1sBXwIsO+Twb3KcYyY8myAFlaVPyRFld++piQCJkl2gGjRh9ZQTI8OvOZDKQB4d9gQpcr/wk6Q6UwN2NkF3RUk7AgCzBvTVe3aHZivMUPp+iOPQfu84LOBHhqDvikGMEGBla3X3eenTgK+2+idVShUtapEbeiG9tSiQ0LFIZ6ROx5Xzx5laAml48Dgh1MOOuDVYCFxj2PaSdqCWz2rurJHaoPfjy2JfXqL1K5CJN0X8Msz/HF/YYWQl1aKAoNGhcYIiPrjyD4XoZbg43IaNAgipjWI87JFaC+02tbvOZP0rYw14l5LZhlEB8RlMfptvIGwIDaylj4r/rqG8O3z0Fgj3iCI9qfduaCq0akmVa1+ymJ6AlkDoQfz7Kn6TaI/xyqF7FwmFaB3+xVgqKdgSaLXtpji+C+6B/g4ABZww3ytHN5fX1pKLksEbdAxTuvp7hrTLdkBs7ATwfl/CVkSE4JrQrdYAM6AJRzfrQbXjHetFIIAoTtgks+cC4ar5BdPhPTRaOw1d4Lt+2Lnq33mvCwZtKX+voYVAxnHOKX8tGTpSYZx9VpF7XaTGBMrB48ES0QsWj8PmGgfX0ubm6rV8Vqqk2ztTPDtqAUA0MO04nBuq/dO+BMhwOk9bCo+yMmF4+RL+G6VUhmSRym/FOcI9u5zuaNr7Iwu8RLzPdmE9HdR0DujEyxxWQre9XsXuTHIwJ/PtYPezIZav/QzMsNUxCv0esDz6TPQocRr5VkfiapniSGNfp+PwNP3bXR8nrEZlsw0dI/h0MBenLRT6/9oihjbcNZcVOgTQcbVbKJZ618E7sIcdlEZULNSmA7GbulxrmxRH8J6BsePwEYTIWSd3UUohW6zgp11ymQlTcNx/z/MQ1Dzp7CkWQqULzGQr+y28iw X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4991fac-1f0f-4b52-8bae-08da57e8dfc9 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2022 02:58:12.8183 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xTar7p5dFcpw1oTG+7a/OzgpGGNp+4Yg4IRbxo+7geDeBifW6WQsSNt+N5E6G4W+9DdCqakskzxS2JeqxvVu2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB6218 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan We are migrating to use binman symbols, the current names are inconsistent across different boards, so unify them. Also add `type = "blob-ext";`, since the new names are not valid binman types. Tested-by: Tim Harvey #imx8m[m,n,p]-venice Signed-off-by: Peng Fan Reviewed-by: Alper Nebi Yasak [Alper: Edit commit message] Signed-off-by: Alper Nebi Yasak --- arch/arm/dts/imx8mm-u-boot.dtsi | 8 ++++---- arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi | 12 ++++++++---- arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi | 4 ++-- arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 12 ++++++++---- arch/arm/dts/imx8mn-evk-u-boot.dtsi | 12 ++++++++---- arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi | 8 ++++---- arch/arm/dts/imx8mn-venice-u-boot.dtsi | 8 ++++---- arch/arm/dts/imx8mp-u-boot.dtsi | 12 ++++++++---- arch/arm/dts/imx8mq-cm-u-boot.dtsi | 12 ++++++++---- arch/arm/dts/imx8mq-u-boot.dtsi | 8 ++++---- 10 files changed, 58 insertions(+), 38 deletions(-) diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi index 9f66cdb65a9..86f8e1a284b 100644 --- a/arch/arm/dts/imx8mm-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-u-boot.dtsi @@ -39,25 +39,25 @@ filename = "u-boot-spl.bin"; }; - 1d-imem { + ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem.bin"; size = <0x8000>; type = "blob-ext"; }; - 1d-dmem { + ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem.bin"; size = <0x4000>; type = "blob-ext"; }; - 2d-imem { + ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem.bin"; size = <0x8000>; type = "blob-ext"; }; - 2d-dmem { + ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem.bin"; size = <0x4000>; type = "blob-ext"; diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi index eb1dd8debba..d28bb2b2ffe 100644 --- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi @@ -147,24 +147,28 @@ align-end = <4>; }; - blob_1: blob-ext@1 { + ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem.bin"; size = <0x8000>; + type = "blob-ext"; }; - blob_2: blob-ext@2 { + ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem.bin"; size = <0x4000>; + type = "blob-ext"; }; - blob_3: blob-ext@3 { + ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem.bin"; size = <0x8000>; + type = "blob-ext"; }; - blob_4: blob-ext@4 { + ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem.bin"; size = <0x4000>; + type = "blob-ext"; }; }; diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi index 46a9d7fd78b..dc4cec250ef 100644 --- a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi +++ b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi @@ -111,13 +111,13 @@ filename = "u-boot-spl.bin"; }; - 1d-imem { + ddr-1d-imem-fw { filename = "ddr3_imem_1d.bin"; size = <0x8000>; type = "blob-ext"; }; - 1d_dmem { + ddr-1d-dmem-fw { filename = "ddr3_dmem_1d.bin"; size = <0x4000>; type = "blob-ext"; diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi index 4d0ecb07d4f..30ef8bc47d9 100644 --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi @@ -155,24 +155,28 @@ align-end = <4>; }; - blob_1: blob-ext@1 { + ddr-1d-imem-fw { filename = "ddr4_imem_1d_201810.bin"; size = <0x8000>; + type = "blob-ext"; }; - blob_2: blob-ext@2 { + ddr-1d-dmem-fw { filename = "ddr4_dmem_1d_201810.bin"; size = <0x4000>; + type = "blob-ext"; }; - blob_3: blob-ext@3 { + ddr-2d-imem-fw { filename = "ddr4_imem_2d_201810.bin"; size = <0x8000>; + type = "blob-ext"; }; - blob_4: blob-ext@4 { + ddr-2d-dmem-fw { filename = "ddr4_dmem_2d_201810.bin"; size = <0x4000>; + type = "blob-ext"; }; }; diff --git a/arch/arm/dts/imx8mn-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-evk-u-boot.dtsi index 593cf06eb95..31c05e45cfb 100644 --- a/arch/arm/dts/imx8mn-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-evk-u-boot.dtsi @@ -36,24 +36,28 @@ align-end = <4>; }; - blob_1: blob-ext@1 { + ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem.bin"; size = <0x8000>; + type = "blob-ext"; }; - blob_2: blob-ext@2 { + ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem.bin"; size = <0x4000>; + type = "blob-ext"; }; - blob_3: blob-ext@3 { + ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem.bin"; size = <0x8000>; + type = "blob-ext"; }; - blob_4: blob-ext@4 { + ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem.bin"; size = <0x4000>; + type = "blob-ext"; }; }; diff --git a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi index 6e37622cca7..b8df6f749b0 100644 --- a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi @@ -130,25 +130,25 @@ filename = "u-boot-spl.bin"; }; - 1d-imem { + ddr-1d-imem-fw { filename = "ddr4_imem_1d.bin"; size = <0x8000>; type = "blob-ext"; }; - 1d_dmem { + ddr-1d-dmem-fw { filename = "ddr4_dmem_1d.bin"; size = <0x4000>; type = "blob-ext"; }; - 2d_imem { + ddr-2d-imem-fw { filename = "ddr4_imem_2d.bin"; size = <0x8000>; type = "blob-ext"; }; - 2d_dmem { + ddr-2d-dmem-fw { filename = "ddr4_dmem_2d.bin"; size = <0x4000>; type = "blob-ext"; diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi index 35819553879..bcf2abd0676 100644 --- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi @@ -126,25 +126,25 @@ filename = "u-boot-spl.bin"; }; - 1d-imem { + ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem.bin"; size = <0x8000>; type = "blob-ext"; }; - 1d_dmem { + ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem.bin"; size = <0x4000>; type = "blob-ext"; }; - 2d_imem { + ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem.bin"; size = <0x8000>; type = "blob-ext"; }; - 2d_dmem { + ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem.bin"; size = <0x4000>; type = "blob-ext"; diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index 20edd90cfad..dc57ee20411 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -61,24 +61,28 @@ align-end = <4>; }; - blob_1: blob-ext@1 { + ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem_202006.bin"; size = <0x8000>; + type = "blob-ext"; }; - blob_2: blob-ext@2 { + ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem_202006.bin"; size = <0x4000>; + type = "blob-ext"; }; - blob_3: blob-ext@3 { + ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem_202006.bin"; size = <0x8000>; + type = "blob-ext"; }; - blob_4: blob-ext@4 { + ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem_202006.bin"; size = <0x4000>; + type = "blob-ext"; }; }; diff --git a/arch/arm/dts/imx8mq-cm-u-boot.dtsi b/arch/arm/dts/imx8mq-cm-u-boot.dtsi index e2f4b0e740d..bc7e9756c23 100644 --- a/arch/arm/dts/imx8mq-cm-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-cm-u-boot.dtsi @@ -28,24 +28,28 @@ align-end = <4>; }; - blob_1: blob-ext@1 { + ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem.bin"; size = <0x8000>; + type = "blob-ext"; }; - blob_2: blob-ext@2 { + ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem.bin"; size = <0x4000>; + type = "blob-ext"; }; - blob_3: blob-ext@3 { + ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem.bin"; size = <0x8000>; + type = "blob-ext"; }; - blob_4: blob-ext@4 { + ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem.bin"; size = <0x4000>; + type = "blob-ext"; }; }; diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi index 912a3d4a356..462c470091a 100644 --- a/arch/arm/dts/imx8mq-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-u-boot.dtsi @@ -46,25 +46,25 @@ filename = "u-boot-spl.bin"; }; - 1d-imem { + ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem.bin"; size = <0x8000>; type = "blob-ext"; }; - 1d-dmem { + ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem.bin"; size = <0x4000>; type = "blob-ext"; }; - 2d-imem { + ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem.bin"; size = <0x8000>; type = "blob-ext"; }; - 2d-dmem { + ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem.bin"; size = <0x4000>; type = "blob-ext"; From patchwork Mon Jun 27 03:41:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1648587 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=J4C4ypqZ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LWXVN2WsTz9sGt for ; Mon, 27 Jun 2022 12:58:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 85F9883C35; Mon, 27 Jun 2022 04:58:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="J4C4ypqZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8081384462; Mon, 27 Jun 2022 04:58:23 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60060.outbound.protection.outlook.com [40.107.6.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6BDD584191 for ; Mon, 27 Jun 2022 04:58:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IolSTrVnTzZ/in4RbuB6cVfht0NS9rdmh6rPCQd7at+4tllhK3vF6peLVAM5D6kNkKNMJ7QOK+RLBxkQyojvJBXSDjCBRLjg+3TwH21R+wbEMnZqOhimMG+2m9CT6JkuHGn58zRurKpYyfKppUltoFPwVx2CJjGOa4jgGoUo1fMgl8sJQTydpkx0tOWXZNj+zrHHwGU+HJOFK175CwnFsAMtNnzKhkiunDKkLEmCjwLsyf8JG2ikPA2ym9vizaJYLZdf8ZcJrPVz15vJdFVeSjrEEB6odss6+mYPKKYDsjGdfMOU+cVnkcNutM2aEZy58XZaunRmnWwnTZl4a1/PvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UCMg5sCrkR53aWWAIcW7VzywN/z+mULYgJ0/PpCbgb0=; b=nCOYsnOy5xm5UoCI5k4SZnXtCDC6zD7m7yWqi/+vShkJmRSOxGdRpwG8BDq5dzgoMxVTm5ctF81S4Iy9xY4riY6i3htrpc8sLYVZraEp7pfnkxgMPf9+HiUgbj0AlOiidAq7xmOyDBlLQ2PnxZyp1kL92DJUyiQWTXwidU3hhjdHxMJbKJmdQ2qQKz9Edfdqb8RCzZH8o+iUbkML0NWpN7HHJJ5PWHab0uIUZi2BnVJckd8cdXMxL4F8Vj64dFdBbujv9zSh8b1zdvyZFjHwvJo+kRxikAzpcvcN24ntiL3JGpLBx/p8XBPT9wWIwPD12OtzhagGkxgYRQnltuD5qA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UCMg5sCrkR53aWWAIcW7VzywN/z+mULYgJ0/PpCbgb0=; b=J4C4ypqZNFyFWHNpgJngBCrz4HuGlIRJfySYPxRvunu2XmVMovkjMlbxT+aS/pcYrbkYtJX7Glq568OgB9j8T8ZzOfF6WRBgV9oN7DFEkTAhmMwgXufLa3Cr4OA/HMwz11Tv6XQ95QSS2SmUWHkMswuRdqqazJ8+7362nKAe0KA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DBBPR04MB6218.eurprd04.prod.outlook.com (2603:10a6:10:d0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Mon, 27 Jun 2022 02:58:16 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fdd4:8557:334b:180d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fdd4:8557:334b:180d%6]) with mapi id 15.20.5373.018; Mon, 27 Jun 2022 02:58:15 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: u-boot@lists.denx.de, Peng Fan , Tim Harvey , Alper Nebi Yasak Subject: [PATCH V7 2/4] ddr: imx8m: helper: load ddr firmware according to binman symbols Date: Mon, 27 Jun 2022 11:41:28 +0800 Message-Id: <20220627034130.5892-3-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220627034130.5892-1-peng.fan@oss.nxp.com> References: <20220627034130.5892-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR06CA0009.apcprd06.prod.outlook.com (2603:1096:4:186::17) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7082d5a2-ed7c-4d96-951d-08da57e8e1b2 X-MS-TrafficTypeDiagnostic: DBBPR04MB6218:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: U/wMpXK/7FAcUn2rMiLJV5km7w7f9upcq0CL9TFNTrx5Fs7Whwtbe+oKw4yprCpWz4bPwD/hZAIgg6ez4baDXHqn5ktQMOpI5tbIgrYSXlJZPTFVDaoukzKVbVTm8uK64J67p9VMcO89qiOHlMYbv9oMUVCCzwH7YYMjLD+bujtSCqg7tsef7xfSLCKC/rgRzYy3XfvZLsInYu6vAVwZxThVsxTLzuU2lxckwBbKxv2nk4KEbb4iCc7vIwwfIaDICspQQPWtBML7DSHsTIuH0/J3FpCCsVW0JGn6EbH9TUQPQT9itL92TiTwi7ppb271Erstg6pumM5BLre0NLbDanyDYKNuCoWLzVuQCL/s0ulxUfLZxrQ1ba3gRif/aNQgYA+uEG9zPW2tjn4tXwHik9NGEBBgjGUyuzJCP9y/0GO4nzXD2JP7FWvNnhTkYhIqUhkUs1ZU6jDyEiRi60onDlLB30vXX0wIlEwCtzwvZRaZYEmMZ3hEb7XlQ7wyiyzfteu7UTkurVlt7xfJ8Jla9zBPLjO8BPe8tLJGI1k3srXBgp6LSDmZq2K5QKD6ngQDbrVzER2rHi2YY9N+PBb/8r4H8k6wt1lzQJqNp5Cy9umNg15xXPympQ9s+rm3ZRU9yC/nCUCZVAgQnYRTesyvYjRtC8p7sjDaLvvoQll6sDllHZatQVuqD6B5m577H1v539FV3jDeJsi849UPWK5i9xZ/KxJl0knLrbGv6wiNh+oKmYIAWiQMErZrrI8h7RsvydJWuV5Vg0LQlFVg8Dm7JTKGPh2kbD9fAKoTrwer71bBIAzGSN/nu68JykRMheKEFhUi9uImsy8GpYNqQ39T7g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(346002)(136003)(376002)(366004)(396003)(6512007)(5660300002)(2616005)(66556008)(66476007)(1076003)(186003)(6506007)(38100700002)(86362001)(316002)(41300700001)(66946007)(478600001)(8936002)(8676002)(4326008)(2906002)(52116002)(6486002)(83380400001)(54906003)(38350700002)(6666004)(26005)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Vbg3RB4VxNE2SFAScb6SG5fIMNG/GSq6IKqLORaxFtEKvew2mtQ9Dj0c8zEfzibE6mWOu5KHLbeyzsqpltKQ/t9cJYuIiMyvZZZ4bJ/NWidxbbl+rYJlJNqcRoB2iebgiguwfxFFs1yXGjC+eRN5TvQsoQbDmpNWj4h62nLLzANxfg0hbI//VpjZBY6JnB+urRydKMLkzocl5vAXsRsoe9Gl1SQOUeEd4shlfQ0rGLtHoJamycr+D8W9twkSNU430pXwL5f6iVDcIYpvcJ5gFvANbI3jXvjr5QdqXUJFi/bTQcDMvXztSa0rID8ogtpm5xrKiK7o1z7f9PlDPFhGUwSD4rXKzze2cSZx/cCJmxaRIEGjLYBR3XDnRCKbWFNbtsyZTOHq9AzJivKgoRRt8LEB5NF5KI9pf9Un/2h4MijOfWfNptS6l6f7prOL/kr0pNMUHmJHOwDbZNU5cW0S9KjtGjtKdYXtYVeHK5NH7vYo0x5NO7RXhSVgeahk5HP6lGhT24UlEcxcHQn1NPMJj0uUDPROAWwWox5yVBu13qZh8XMM6gxoXa/x4dySItNwAf/FEFR5SZYv8eAZ7RT1QpIWYmL2cwgaluHQEQBqLIY8Ao9uYt7ku/EgrhsAcSHCtjfSV1wudTJ9TNwUMKL3CXDbQCaJCyxJJWHTFq0lsfD+hKYb+NCcz6zDDYOxnQf9tXgG+OpVtn7WlrbOkXUtK6ay8xa8f0pJ2FXKLv0yIZv7M3nCs4Kqlfrj1VOAlk/ioHzbCthmYP3h11KltEeMjMDVBl3YJtnPeUP+aKu1HCJMx3duNQQjZSnYrUGMGp1rCT8Dh2JLTyXc5eO0+jTP6RzI+XmjFnsS4irDpU6yylbu5oxe5ZRLTSBLNf0TXswVBuXMlN12DWyJqe41B88TYQChGJvDpg6q9a9oNsyzQm/FZA8/OzrR8ZdXrZIBWMMfIFQhJNbuGucbt5p6M4RNwX2iE1Bn1Q0BKsUYd4C2qNWJ5bfYMTHqjwpwBul5Qi8CyIDbIRwW/NQkVBeSY22QjXshBdKXn1/rkq8wuiOF76fUFNnhRmDu7067BP1wM7DYFAfl5F4E6MmhyUNB3ZscJwa6NXX74YADc0rm48BksPS9ZY7tfbrHZ2g/lA+H6xhvOftOprgKV1Z4TEs4Tv6cMeZEoS1lkzX5WrcSf0wvlHR7LJAiE5HFivAsgiSl+0Fikw8lXvYJj0Fcc4B5BiJ4ZeaNajxw2RorqjGQjax1Jo8/3xEkmnuG2mS17BkguVbD+9WvTtFQwM78kyFk7MzDaHklrcs1IeWbzlW2wfBVw7onIfetGncUeI7JO861dSGBDD8tiEI8I5UV8OWeIdDufvK6//f6oJ2sgh5HYJf12fOddbOwLvwphfzphgL4j46+/TM8fUSEYST9BPuPkq2UM8lhbAc/2Jpe26W+U8IveIvl2FUp6IGy7/Kh7PVDItUDe8ejalcmF/vFx+kfrEUMYHvQsnYiFjOjceFY9isOj/xxd6NY3qs//xFH6BUTi7C6asSZcRvjDoZ37gFpt2t2yUTq3CB7cQ9LxcVyXUavhpWcpufyhU3IrbmyX8ZWHu5Q X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7082d5a2-ed7c-4d96-951d-08da57e8e1b2 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2022 02:58:15.8826 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: koNs7GrOfjKKiOnM1yzOnKQNdahja03ObFFEeTPMB9craP0z2Q/zB1EXf7dgzmf2ItDgw55x+50cluxGRYHL/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB6218 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan By reading binman symbols, we no need hard coded IMEM_LEN/DMEM_LEN after we update the binman dtsi to drop 0x8000/0x4000 length for the firmware. And that could save binary size for many KBs. Tested-by: Tim Harvey #imx8m[m,n,p]-venice Signed-off-by: Peng Fan Reviewed-by: Alper Nebi Yasak [Alper: Check BINMAN_SYMS_OK instead] Signed-off-by: Alper Nebi Yasak --- drivers/ddr/imx/phy/helper.c | 47 +++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/drivers/ddr/imx/phy/helper.c b/drivers/ddr/imx/phy/helper.c index 60d650e3089..e9e0294f87d 100644 --- a/drivers/ddr/imx/phy/helper.c +++ b/drivers/ddr/imx/phy/helper.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include @@ -24,15 +25,30 @@ DECLARE_GLOBAL_DATA_PTR; #define DMEM_OFFSET_ADDR 0x00054000 #define DDR_TRAIN_CODE_BASE_ADDR IP2APB_DDRPHY_IPS_BASE_ADDR(0) +binman_sym_declare(ulong, ddr_1d_imem_fw, image_pos); +binman_sym_declare(ulong, ddr_1d_imem_fw, size); + +binman_sym_declare(ulong, ddr_1d_dmem_fw, image_pos); +binman_sym_declare(ulong, ddr_1d_dmem_fw, size); + +#if !IS_ENABLED(CONFIG_IMX8M_DDR3L) +binman_sym_declare(ulong, ddr_2d_imem_fw, image_pos); +binman_sym_declare(ulong, ddr_2d_imem_fw, size); + +binman_sym_declare(ulong, ddr_2d_dmem_fw, image_pos); +binman_sym_declare(ulong, ddr_2d_dmem_fw, size); +#endif + /* We need PHY iMEM PHY is 32KB padded */ void ddr_load_train_firmware(enum fw_type type) { u32 tmp32, i; u32 error = 0; unsigned long pr_to32, pr_from32; - unsigned long fw_offset = type ? IMEM_2D_OFFSET : 0; + uint32_t fw_offset = type ? IMEM_2D_OFFSET : 0; unsigned long imem_start = (unsigned long)&_end + fw_offset; unsigned long dmem_start; + unsigned long imem_len = IMEM_LEN, dmem_len = DMEM_LEN; #ifdef CONFIG_SPL_OF_CONTROL if (gd->fdt_blob && !fdt_check_header(gd->fdt_blob)) { @@ -42,11 +58,30 @@ void ddr_load_train_firmware(enum fw_type type) } #endif - dmem_start = imem_start + IMEM_LEN; + dmem_start = imem_start + imem_len; + + if (BINMAN_SYMS_OK) { + switch (type) { + case FW_1D_IMAGE: + imem_start = binman_sym(ulong, ddr_1d_imem_fw, image_pos); + imem_len = binman_sym(ulong, ddr_1d_imem_fw, size); + dmem_start = binman_sym(ulong, ddr_1d_dmem_fw, image_pos); + dmem_len = binman_sym(ulong, ddr_1d_dmem_fw, size); + break; + case FW_2D_IMAGE: +#if !IS_ENABLED(CONFIG_IMX8M_DDR3L) + imem_start = binman_sym(ulong, ddr_2d_imem_fw, image_pos); + imem_len = binman_sym(ulong, ddr_2d_imem_fw, size); + dmem_start = binman_sym(ulong, ddr_2d_dmem_fw, image_pos); + dmem_len = binman_sym(ulong, ddr_2d_dmem_fw, size); +#endif + break; + } + } pr_from32 = imem_start; pr_to32 = IMEM_OFFSET_ADDR; - for (i = 0x0; i < IMEM_LEN; ) { + for (i = 0x0; i < imem_len; ) { tmp32 = readl(pr_from32); writew(tmp32 & 0x0000ffff, DDR_TRAIN_CODE_BASE_ADDR + ddrphy_addr_remap(pr_to32)); pr_to32 += 1; @@ -59,7 +94,7 @@ void ddr_load_train_firmware(enum fw_type type) pr_from32 = dmem_start; pr_to32 = DMEM_OFFSET_ADDR; - for (i = 0x0; i < DMEM_LEN; ) { + for (i = 0x0; i < dmem_len; ) { tmp32 = readl(pr_from32); writew(tmp32 & 0x0000ffff, DDR_TRAIN_CODE_BASE_ADDR + ddrphy_addr_remap(pr_to32)); pr_to32 += 1; @@ -73,7 +108,7 @@ void ddr_load_train_firmware(enum fw_type type) debug("check ddr_pmu_train_imem code\n"); pr_from32 = imem_start; pr_to32 = IMEM_OFFSET_ADDR; - for (i = 0x0; i < IMEM_LEN; ) { + for (i = 0x0; i < imem_len; ) { tmp32 = (readw(DDR_TRAIN_CODE_BASE_ADDR + ddrphy_addr_remap(pr_to32)) & 0x0000ffff); pr_to32 += 1; tmp32 += ((readw(DDR_TRAIN_CODE_BASE_ADDR + @@ -95,7 +130,7 @@ void ddr_load_train_firmware(enum fw_type type) debug("check ddr4_pmu_train_dmem code\n"); pr_from32 = dmem_start; pr_to32 = DMEM_OFFSET_ADDR; - for (i = 0x0; i < DMEM_LEN;) { + for (i = 0x0; i < dmem_len;) { tmp32 = (readw(DDR_TRAIN_CODE_BASE_ADDR + ddrphy_addr_remap(pr_to32)) & 0x0000ffff); pr_to32 += 1; tmp32 += ((readw(DDR_TRAIN_CODE_BASE_ADDR + From patchwork Mon Jun 27 03:41:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1648588 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=TDAaqCmn; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LWXVZ5YSSz9sGt for ; Mon, 27 Jun 2022 12:58:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8325D84449; Mon, 27 Jun 2022 04:58:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="TDAaqCmn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D5E3884456; Mon, 27 Jun 2022 04:58:26 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2063.outbound.protection.outlook.com [40.107.104.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8E85C84449 for ; Mon, 27 Jun 2022 04:58:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iqPsYhtiUjaD99dJChQ1CUx0Vf1xFN+zgHNJXnqsQbgRBgqOcrIa6k9nqzBSd/gcLyxa3pOoDxdalNsJPDUXJjo6I2Yh5sK07mb+HDFQlRhkCihJ1bpEz3jdb+jpmmAIGp0ZNIhooKkUSsLC23wXIX6VUw2qcv70NRU3bZbLK/dJCdusxeY56S4QIRYvCoFxowNyCv9pMXCNzjN8uawMp5vCan8OBUR5LpBEg6RD5yCeiLFk4rDrR4ZaVlfQrNtYzhAxpkSDzSxP7kVgHHgzNlqnzWG2ArobI0ACbarwZ8c6XuRQlTl3Dgl08cIx6fmunpM7lvDFO2r9LipqmsPHSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=34O1FGfB4pHvp5asTxrPe8Zt6mQrfrEmGe7gyDUJ3oI=; b=Hk+ZPtE5w67OAdyOcXhgiFM0OE3jrixCYtqCrZpMNJedqbNbEfFAKYtmh8Q1we9qNem0veFKTSVR2pCE3k5JVryql0zHjBysg5qXVVbKv+WGlWlE4YwqRumJy7JqbPo8vSBm9jTR7eRs9o2bE4nmJLE0vPtm7dWXTFilB8ItMQenXWvTSFIgAkcpKDrrxCc5V8g2wRC1Z0RHddBL0+Jsa9SoyRmpn4P8ZOw1b9ovaUfC4DHQrd7HHqy+ULhBqt2xzhfecKXEtTEyh/P7jKFHsh8k5gd3IeU0LCi4OsU+WsPxwEWf+XNBtC8X6lGO7jLTDXbDEmh0PgnuEy56j1mb2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=34O1FGfB4pHvp5asTxrPe8Zt6mQrfrEmGe7gyDUJ3oI=; b=TDAaqCmnEBIEJ4vkSXwjI764PnJDRUNT+3zfdYNFuJmc1qTyOgOlHVIzszu6jzqm5QMQBn1fW7jAlsJIffRD7+pUFRyo7qbhA/y2rxddDM+v+QbmflfVC0JGOqmo7KwPZsQiKuwRMvrEBYeqZQBLlBFDztUoavKgnGBOdRJKMnM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DBBPR04MB6218.eurprd04.prod.outlook.com (2603:10a6:10:d0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Mon, 27 Jun 2022 02:58:20 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fdd4:8557:334b:180d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fdd4:8557:334b:180d%6]) with mapi id 15.20.5373.018; Mon, 27 Jun 2022 02:58:20 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" , "Ariel D'Alessandro" , Michael Trimarchi , Tim Harvey Cc: u-boot@lists.denx.de, Peng Fan , Alper Nebi Yasak Subject: [PATCH V7 3/4] arm: dts: imx8m: shrink ddr firmware size to actual file size Date: Mon, 27 Jun 2022 11:41:29 +0800 Message-Id: <20220627034130.5892-4-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220627034130.5892-1-peng.fan@oss.nxp.com> References: <20220627034130.5892-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR06CA0009.apcprd06.prod.outlook.com (2603:1096:4:186::17) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d660657-04d1-4d84-fc79-08da57e8e470 X-MS-TrafficTypeDiagnostic: DBBPR04MB6218:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QyqBH8r/WyEJPMv46Sdcz+kWYZMZoGhW5b6R1PD5l4FxGlZdoXHwdX9RLnCFl9A0FPaJkfi9cQyyVtBXlek7bz7K8epY4OsmF0p6tAE3xd0hLOWfK3BZ3RjhD736AZLaZ3+wE/0pQWOA2EZ7VKJCt/lmu5avYohyq2NVz49u9oQxFCSHbjdIilV9gRlCL4/D3arpyslnzVpiyroT5ODQKXDejABfW/dlf6yDLzT7Y57KjksOU8H6UNCg7hfMGSJ2WcIWRUN+9fgXiEhdvwRLkY8KILm/QZSJqLZY6NlntGNT+tuLFaFi0prZPQl19oeFWNxINJlu8nTim4qTSOHFmA9aUMnF70ToK4WeilR0779INMoqIZ6cTMHkbliveNQsZelSku/8ZsXblYj0LQ31jzFT6VV7G5meW0zvKwasgV8q1GMJd01JMYSLt/GW/dVONamqiEsgpZ4X/qJHzdyYtrudxkxTMU+r3Ri6669/pzNraJ4H63L+ND1pSBmEHYMNQl7SIlIYthJrLP5h5k36F4PRmHhSi4QsJ3nfabOGkz1ZIY5VJsyORnwRYcQsTNtptqwaVtCVc3T0S2mNUavv3up0GjyZM1WvjgVBekmahcb9ikl/lnhJhCtYxBPjj5LqJHdjy/LBPfjA2psgkCvgP0azpXRFiCGD2EAk9t7XK0Y17zJtzF/DU/9DuF9TC3jckOyPsIV9rxReYH/UVIu1Thbut0TG9L7doNqV+3D0BhTfghDea8RY+4Gt0cth9hvwGr3kBW1Fjlln81qwo/cqBvF21/gAdyrCM4g7HMhnD2SAm5pBiL169yuOwxffi+sO6E4FoXgS2gCV36H/YxwRyQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(346002)(136003)(376002)(366004)(396003)(6512007)(5660300002)(2616005)(66556008)(66476007)(1076003)(186003)(6506007)(38100700002)(86362001)(316002)(41300700001)(66946007)(478600001)(8936002)(8676002)(4326008)(2906002)(52116002)(6486002)(83380400001)(110136005)(54906003)(38350700002)(26005)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lMD0GCUewu1NTefyR//HFZJ5ERVqmwSZIzCQOQZQK96NLo0incNbX1pjY9QjBw1CNk8jEYnz/0CCNbcR0SXy5aOa1kB/hVRmJEKg8ZafJ/e08ClhlHaLNDLFRvVOH5FZMQY2SxMDbQsd479p4StNHM/WXmz7YU2CNiKN+83NBrkirS1JdNDMXoOaU+95taqBw+4RX9bhfDAW6GFr+uQRwuw+kUOoPcvqUV4HksVJNo4fU7uofc7P3GcSloVFn7xUhVfnprgNSJ/Q81VYwq1gUV/MZWJ7Zpja3q/+31j1G0ztmpfMNgTCVZR+nWYXdM1RvSuKjqDtn3gwJJg4a2xFGX50PDrbKDAZn561ATRFgCGmPv0BJaRavh3eUx5dYiM/54jumJ1IfvaliBMI5fl+Ng6DFFAMLuNGQPNoXwHLyQnLmuwCnX5L/DGV2z4ApT7Nlf50sc1B/TDtBaDCwrbkeTUzYcgTE0M2E7sQRGCzekKgGnlL1f4csf2jSbRMgewpe6HChJsTHT02PvrBUTEdBXppU6lEchW8pv8WJoR5v6Glo2+6/FlgmcP7fU4IcEBxoSBWXbN1DzuwxuT8MlVOXrSF0DVNstIwfIUsWxL0c73ssjsy+6UKurX5/j/qQruNLWkULVVtNKjMi12V5fRm8RZTkL1IZpIPqUNNCcS5fKHbAyhYmBxCeMkfsUej0s+Llf/RAFLS8wM2KNoozGUqu0odxcAZh5HXxgE22jFUfjV1ypJmvNshQ4/GUdaN++gY/A/8FlEA9m2waje+thvU9tUZhQf9Y9e304uvgcZ0PECWNoUJn2oiMDmueczal6LBVjxCmMnPW34i56eOsY5yPUbqSFpdl6OlZh3iN1nsHaldfmi72/ZvZaXSPzJ/Q1tBkKdtXhAlqoUx9KAhj5qOMJov99359a7y+h36w9c4e0OaxKDdi3lSzwsUc491nv1K3LD9jBd05yhYPHAH9QqS9sq/R7Znf2ayCsiNkPeEBYmyLoHVAXuZnSEbRk3BJMMVP9lEokUgUO6jOThrnsOY6DtPD9zlX7zqTAOGDKJZ3lbIR3zdnxlF6GERBJEcy7mRCd2Ae8zG7d86HBVxcZEChYbZT/io62psMrqiz5QY4PvDvcqGXnMGpe8m71MIjOBzYoN2gCEZiKHK86M3G6dDWlAzQ1WCXjjGDhbxm05Zly4IZ4ekXzenvWfLA+808UpYZLc433gPM40vURDYdwmdRN6qNWZ7J3xSam9ls/sXCpcqAKA60rlkwnr2EhnRWgyTBnNtyEAJXDLSUiRyP3TEctI7352ZwQ3eRWl+UZs7z+8maADJcWWyB7GzOfs04WOCV48L2ntwhwCOgykjqiMMQwF8EP2VjsNr0S3tjBDNLAjeNycelrBVrKsZXT7zFQXtoCvXi01N4byHWYGaZM/0uS9NWECZsY2sEOBfEUj+0Pld/wI5AwuPuE5EK02eVy8zkpPAbpPMKx2+Uo4nBpcU1lrkpu6JaOYCwKpSFXA8XV9rpwQe/kSvOtvw58UZGEnxJ81h6cFuuVGKuJXgTgmLqX22UWlGjiBE1oPHtiHMJqs+fK+l9rOa8G18g2rSDF+g X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d660657-04d1-4d84-fc79-08da57e8e470 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2022 02:58:20.5797 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MddHZYAxJr4fZssgVzhIa7Ju/5ABeZKbMdv2BQ8QXKEJdrbMktthucB+iVdRPES0Ko3d848yAYd1fPHjLlrZsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB6218 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan After we switch to use BINMAN_SYMBOLS, there is no need to pad the file size to 0x8000 and 0x4000. After we use BINMAN_SYMBOLS, the u-boot-spl-ddr.bin shrink about 36KB with i.MX8MP-EVK. Tested-by: Tim Harvey #imx8m[m,n,p]-venice Signed-off-by: Peng Fan Reviewed-by: Alper Nebi Yasak --- arch/arm/dts/imx8mm-u-boot.dtsi | 8 ++++---- arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi | 8 ++++---- arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi | 4 ++-- arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 8 ++++---- arch/arm/dts/imx8mn-evk-u-boot.dtsi | 8 ++++---- arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi | 8 ++++---- arch/arm/dts/imx8mn-venice-u-boot.dtsi | 8 ++++---- arch/arm/dts/imx8mp-u-boot.dtsi | 8 ++++---- arch/arm/dts/imx8mq-cm-u-boot.dtsi | 8 ++++---- arch/arm/dts/imx8mq-u-boot.dtsi | 8 ++++---- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi index 86f8e1a284b..8c48678625d 100644 --- a/arch/arm/dts/imx8mm-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-u-boot.dtsi @@ -41,25 +41,25 @@ ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem.bin"; - size = <0x8000>; + align-end = <4>; type = "blob-ext"; }; ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem.bin"; - size = <0x4000>; + align-end = <4>; type = "blob-ext"; }; ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem.bin"; - size = <0x8000>; + align-end = <4>; type = "blob-ext"; }; ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem.bin"; - size = <0x4000>; + align-end = <4>; type = "blob-ext"; }; }; diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi index d28bb2b2ffe..5f839524028 100644 --- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi @@ -149,26 +149,26 @@ ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem.bin"; - size = <0x8000>; type = "blob-ext"; + align-end = <4>; }; ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem.bin"; - size = <0x4000>; type = "blob-ext"; + align-end = <4>; }; ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem.bin"; - size = <0x8000>; type = "blob-ext"; + align-end = <4>; }; ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem.bin"; - size = <0x4000>; type = "blob-ext"; + align-end = <4>; }; }; diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi index dc4cec250ef..c4ae7ca4f31 100644 --- a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi +++ b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi @@ -113,13 +113,13 @@ ddr-1d-imem-fw { filename = "ddr3_imem_1d.bin"; - size = <0x8000>; + align-end = <4>; type = "blob-ext"; }; ddr-1d-dmem-fw { filename = "ddr3_dmem_1d.bin"; - size = <0x4000>; + align-end = <4>; type = "blob-ext"; }; }; diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi index 30ef8bc47d9..78773c198e4 100644 --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi @@ -157,26 +157,26 @@ ddr-1d-imem-fw { filename = "ddr4_imem_1d_201810.bin"; - size = <0x8000>; type = "blob-ext"; + align-end = <4>; }; ddr-1d-dmem-fw { filename = "ddr4_dmem_1d_201810.bin"; - size = <0x4000>; type = "blob-ext"; + align-end = <4>; }; ddr-2d-imem-fw { filename = "ddr4_imem_2d_201810.bin"; - size = <0x8000>; type = "blob-ext"; + align-end = <4>; }; ddr-2d-dmem-fw { filename = "ddr4_dmem_2d_201810.bin"; - size = <0x4000>; type = "blob-ext"; + align-end = <4>; }; }; diff --git a/arch/arm/dts/imx8mn-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-evk-u-boot.dtsi index 31c05e45cfb..e15a41f1190 100644 --- a/arch/arm/dts/imx8mn-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-evk-u-boot.dtsi @@ -38,26 +38,26 @@ ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem.bin"; - size = <0x8000>; type = "blob-ext"; + align-end = <4>; }; ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem.bin"; - size = <0x4000>; type = "blob-ext"; + align-end = <4>; }; ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem.bin"; - size = <0x8000>; type = "blob-ext"; + align-end = <4>; }; ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem.bin"; - size = <0x4000>; type = "blob-ext"; + align-end = <4>; }; }; diff --git a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi index b8df6f749b0..ed1ab10ded3 100644 --- a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi @@ -132,25 +132,25 @@ ddr-1d-imem-fw { filename = "ddr4_imem_1d.bin"; - size = <0x8000>; + align-end = <4>; type = "blob-ext"; }; ddr-1d-dmem-fw { filename = "ddr4_dmem_1d.bin"; - size = <0x4000>; + align-end = <4>; type = "blob-ext"; }; ddr-2d-imem-fw { filename = "ddr4_imem_2d.bin"; - size = <0x8000>; + align-end = <4>; type = "blob-ext"; }; ddr-2d-dmem-fw { filename = "ddr4_dmem_2d.bin"; - size = <0x4000>; + align-end = <4>; type = "blob-ext"; }; }; diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi index bcf2abd0676..9fb38714523 100644 --- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi @@ -128,25 +128,25 @@ ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem.bin"; - size = <0x8000>; + align-end = <4>; type = "blob-ext"; }; ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem.bin"; - size = <0x4000>; + align-end = <4>; type = "blob-ext"; }; ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem.bin"; - size = <0x8000>; + align-end = <4>; type = "blob-ext"; }; ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem.bin"; - size = <0x4000>; + align-end = <4>; type = "blob-ext"; }; }; diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index dc57ee20411..adb24cccc3b 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -63,26 +63,26 @@ ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem_202006.bin"; - size = <0x8000>; type = "blob-ext"; + align-end = <4>; }; ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem_202006.bin"; - size = <0x4000>; type = "blob-ext"; + align-end = <4>; }; ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem_202006.bin"; - size = <0x8000>; type = "blob-ext"; + align-end = <4>; }; ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem_202006.bin"; - size = <0x4000>; type = "blob-ext"; + align-end = <4>; }; }; diff --git a/arch/arm/dts/imx8mq-cm-u-boot.dtsi b/arch/arm/dts/imx8mq-cm-u-boot.dtsi index bc7e9756c23..cb4e36c387d 100644 --- a/arch/arm/dts/imx8mq-cm-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-cm-u-boot.dtsi @@ -30,26 +30,26 @@ ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem.bin"; - size = <0x8000>; type = "blob-ext"; + align-end = <4>; }; ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem.bin"; - size = <0x4000>; type = "blob-ext"; + align-end = <4>; }; ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem.bin"; - size = <0x8000>; type = "blob-ext"; + align-end = <4>; }; ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem.bin"; - size = <0x4000>; type = "blob-ext"; + align-end = <4>; }; }; diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi index 462c470091a..e8b5f83706e 100644 --- a/arch/arm/dts/imx8mq-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-u-boot.dtsi @@ -48,25 +48,25 @@ ddr-1d-imem-fw { filename = "lpddr4_pmu_train_1d_imem.bin"; - size = <0x8000>; + align-end = <4>; type = "blob-ext"; }; ddr-1d-dmem-fw { filename = "lpddr4_pmu_train_1d_dmem.bin"; - size = <0x4000>; + align-end = <4>; type = "blob-ext"; }; ddr-2d-imem-fw { filename = "lpddr4_pmu_train_2d_imem.bin"; - size = <0x8000>; + align-end = <4>; type = "blob-ext"; }; ddr-2d-dmem-fw { filename = "lpddr4_pmu_train_2d_dmem.bin"; - size = <0x4000>; + align-end = <4>; type = "blob-ext"; }; }; From patchwork Mon Jun 27 03:41:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1648589 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=lyDyOpLK; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LWXVn0r0Vz9sGt for ; Mon, 27 Jun 2022 12:58:57 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EB1C684424; Mon, 27 Jun 2022 04:58:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="lyDyOpLK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C8D784462; Mon, 27 Jun 2022 04:58:29 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60045.outbound.protection.outlook.com [40.107.6.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 62B1C84191 for ; Mon, 27 Jun 2022 04:58:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fz6p8K54wAqxeEjXG8kHcsN1vRh0aq1TsSFLj8/vrkVHgJ31cRDPubnoDmbig2P/D3ysloaUiAJrxzY7FzU+faMZWAvqtUCHPptoQ6nscokCD7iQjobK0X1zkv5gDuF+ITn9jdvhjlGpsbFeFYhc84JVs3m9Tvzn9eJwolYr4iPuhGIfHLbyXWJnazD89wJc/MNqODX3ipG7ofm62U6I8st8oe9QtRj4YgWwYUt6YZZTRfvjOil5St3bxQvpToUorECx1ujOoPXqPykmzUcE9qmUeG0cz8VH1hIJ09Xfj5LCtGfcGpm6PX04+U7yjeFf3F1yqMMYMMOvjpTJuRosLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=r+sY7PXJIw8Df+rgCMVqz+Pe7EZzWJrLfHsLcWXZCPM=; b=XJVitfqC0YzMhoKF8g7wCTASLbsJM1K7wWuGuABTI34QRM8I00TQY1bZ4CUkwqgI358Ea3pBSrI86zNRNPC3vooeI44XGuzrG73S+DDv2o+Tk/fOUW+3Norb3WMPAsqjMLRzSMPY35oaWE+XuTqkCcGZvu7BSWiUPiMQrBvoENxFw8fSxSlBng1Jyo26ahGiaWzxp5IO1J6sKzq2cTL25OdHXHrfYWvQm2MV6et4OOJRyh6nLSDdOmdMIIXndDS4Qa/H4jIQ76sqtgoxxyfle277Ag6+JyYUcVYuPlURxHI+W6fBFrMqHu1zlYe5LLnua8Mw0utX7+NEZ2i97hXc+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r+sY7PXJIw8Df+rgCMVqz+Pe7EZzWJrLfHsLcWXZCPM=; b=lyDyOpLKBh8D4FcRowWGeLuu2qD4LuzIJZmuFWKElkVjiS83N7coUFRaBiL1l3vyVt395+ezdFSs6ezMXn387HtCdUMJRZtLz8wOFG+iTEHRINCVzdy7aRvPkJfwWvdESflbTbWfwi4XaeZ+2i2ijJygVF4auS3HbkX3ynw7uGs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DBBPR04MB6218.eurprd04.prod.outlook.com (2603:10a6:10:d0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Mon, 27 Jun 2022 02:58:24 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fdd4:8557:334b:180d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fdd4:8557:334b:180d%6]) with mapi id 15.20.5373.018; Mon, 27 Jun 2022 02:58:24 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" , Jagan Teki , Matteo Lisi Cc: u-boot@lists.denx.de, Peng Fan , Alper Nebi Yasak Subject: [PATCH V7 4/4] imx: imx8mm-icore: migrate to use BINMAN Date: Mon, 27 Jun 2022 11:41:30 +0800 Message-Id: <20220627034130.5892-5-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220627034130.5892-1-peng.fan@oss.nxp.com> References: <20220627034130.5892-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR06CA0009.apcprd06.prod.outlook.com (2603:1096:4:186::17) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c081693c-e82b-4543-5679-08da57e8e6df X-MS-TrafficTypeDiagnostic: DBBPR04MB6218:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7oSycwv2V6ty6bWOSb32fu1FIzrzeAXKxC8k+W8mtby3qSW7Rt5KjX7zv3iNmTp63MflgKrLQCgQitm4Z3wtMhpLjROs9oKfieDj6nmbjSHTyqW+2iIqhfhLrvllhEn8gRwcL2wfNh49syZVZniC+7FWYv86HQvn3jxf+coECdj9g4AferiG/+IFY+im7UhQfBLPlevxT4NspQzq1xomzVTS0DZbemkk1mNH0uWXydAqqL3B8XXir4QuyBkQUaOT9sfLT+mvlDFBiOCLerMht5erRhl1N6ZNemO392vq9HkXZjgbfUF/JaHydRTKmzDN+EUhRlfQhc0v4bTMgKw77ZVksAnCYiVdQVO3LLKxJMF8HaiMAlbvZNX3qxx1li2rHB+mjeZS8gwVbUKSN8N8zDrp5c5t0PYJxZk4DEnhyHCImxRQsu0JYNJcDHEDzL/QLGbnLk3M7tBQzOiFWf7Iv/RFoXicSdImb35z3SZiSDSazrlW5dYYf39Tu3BiNSNuQOjGsYBKlNXQVzNXIxTR4bM29zaHJSTsAfrVdX4vJ7WE4EU8okwNUkrwpoS2mUoDIH48vgp0MAtO1pSkqvVrJ5q0BM7b6y5wQMWXUvSU1APRXZUjkt0ygWeNeygYQkLqalYrGT4UrcQr1UMoWD/4AmzNoa4JnG4MbNk48ZpqxRO8YhmmDwzG7oJZsWWe5Jxupx3xG/UzYt279dRKk/8Rx/8Ha6IOEsELb++8kC+hG4rX6/bhVx5aH/81fgqc21zcxzIhZXOdgN5l4cq6Xo+VJ4OezEUwBtplvSgOivJgm2i/DBN2sAGOqmh08eMXp78/I849T/AUlQ0Zmd6FYhYS7w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(346002)(136003)(376002)(366004)(396003)(6512007)(5660300002)(2616005)(66556008)(66476007)(1076003)(186003)(6506007)(38100700002)(86362001)(316002)(41300700001)(66946007)(478600001)(8936002)(8676002)(4326008)(2906002)(52116002)(6486002)(83380400001)(110136005)(54906003)(38350700002)(6666004)(26005)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cygUBAt10jqk1qtw2rEJi0PcBzSWXkbqztQafztSnYwKjRSIts4XR6R+Rq4ikvNgmCaOCu8iqAyx18AmwSd9irqcwXJu9Glik6Kykch3MDpeTefe+o4tRHwE414rsP/vH+zUxbcqebH1l9aQd0l/uJlCDggedALPTWBnwvzZx5NoFravHHzoNed+fS6kwhqOwl4oSTKRFtsf4fBJIx0KrltpsSWSJZQqfiTAQYFsEnaHNBrdLsRcGsvsdgzcuOYPS1EZA9Q+NJe9pKt5kpjgw+piq+Qt+viqn1d2AYXnSZ8pNWy+ug0NMB9k0vbitgevpDJaOtkIJnE0zEaij9YHlv6sSW2O18Ug2Z/hZCvuTG2hzoDH6eZRveWTe73y742UZcaaoSiWFOKC6xIQHoRsX4d/lYfk8Y9fAIbmDevMMx/OU7zxAlxGmtARgPldeUT75dz3T62brlQPz9fSa1wjpTXfijuz+U8PI8azn1DgQJmM4UXY4nqWxHM03tbJTmB9iC0eqMO2+710BgrC/wFF9YTwp+EbZWEKPqoZuDQFkGVI3TcytvGENZYq1hjgxwx+4YD7pPBApOaMXk/fjxl79UnhTf4TyI0z4/2qkoH8iiJyJRjxZIZvT8K7lh7IyjhS4ApRcoRtfrNtAkWc7hIzW2tejKt3dLgjt1BVrKuZYKYTv2ULgJ2tprW+t6o/ludfbhUBVQW8hrqH9xdSgW5BQB4KRgz9DDC5hBvGFXMhpuLdwZXXNhN2IcivC1slZbxaqhnLfQT6qZgdVv7pdQuS81yaTbczyntURQgWpGEmK/5UIeBs5XAr0n5Bd9e98xf9WnsDu0UQMRtpwOhoSLUCjVMKnfmpLZPKswMFNgS4hgxz3UCQx0QsSX8EV5TqaodUaBdwUkxveM9ZQJMTQP0F4OFPQIb55/1AShWTqmCh7+60M3VRfFvVtkzcNXfRss6001MIn9zd6vSWJ2rWsE9nVejrpc3TXZBcdQpdoE8wr0WIvnQgD/2VmGJjxt1x8BjkBxMr96+T3zf3/QVcbtSDaniDDg6qMKBYvMgchEck95hB53wVZnVnecmZGfO8BPrcQSP8jAl0rx7AA3OHw43YWblwE+H+MF1JDm7gZpiTj964PZReB71m8HtndZhFyOMGkQtbG8hQZxQM/EsJ23j3Hk2gvFl4QFCBYOIkZV6MNRjjBnCa5q5N5XH8lOIE23X4PyI8iSx9F87KV3idsQQ7AbHwaTNkfR/siOJSImJe2Z7htS5MONeBwlxayGCE/YlNTH9ZMdFBqPougXfJETHbIrheRuybmnxDEjNKdwrkQqxJB32pgbNkgBm7exEun3DXwDenPVzy7va+/S3qs9Fii7MgzR873Db5P9GERBAqk0gMHfcU54EEMc3ui8lFShcZPInaMyZlRw3wUCLmsuq3xewe2AQKJxnvxsc8iDinicJ1qwEaYslKjjiMAOJKi6KvDNdhX4TyeA71c2o+SFrXoD6nEUFJUhAUlKOFMPvW1O0T2yOl8gqcu0OBh1nKB6dfl19rBHTUWG6WghplCXEYQAI8xtX3KGqOjZYmAogdX2HqJ93+LY2iV1MUlOc+WFX7 X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c081693c-e82b-4543-5679-08da57e8e6df X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2022 02:58:24.7989 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xcu5ziCflsVS3aG66MPx68BGzlrrsB39SjDJ+xrq8I4FaL63R3hPsIboHEH99tpuiRFbEm66MdOb90iUUy8E3Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB6218 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan Use BINMAN instead of imx specific packing method. Signed-off-by: Peng Fan Reviewed-by: Alper Nebi Yasak --- arch/arm/mach-imx/imx8m/Kconfig | 1 + arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg | 10 +--------- configs/imx8mm-icore-mx8mm-ctouch2_defconfig | 2 +- configs/imx8mm-icore-mx8mm-edimm2.2_defconfig | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig index ef8518c06bd..e01e9e8a96e 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -69,6 +69,7 @@ config TARGET_IMX8MM_EVK config TARGET_IMX8MM_ICORE_MX8MM bool "Engicam i.Core MX8M Mini SOM" + select BINMAN select IMX8MM select SUPPORT_SPL select IMX8M_LPDDR4 diff --git a/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg b/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg index e06d53ef417..5dcb8ae72f0 100644 --- a/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg +++ b/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg @@ -3,13 +3,5 @@ * Copyright 2019 NXP */ - -FIT BOOT_FROM sd -LOADER spl/u-boot-spl-ddr.bin 0x7E1000 -SECOND_LOADER u-boot.itb 0x40200000 0x60000 - -DDR_FW lpddr4_pmu_train_1d_imem.bin -DDR_FW lpddr4_pmu_train_1d_dmem.bin -DDR_FW lpddr4_pmu_train_2d_imem.bin -DDR_FW lpddr4_pmu_train_2d_dmem.bin +LOADER u-boot-spl-ddr.bin 0x7E1000 diff --git a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig index 7d08b244f2c..30f842aef3b 100644 --- a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig +++ b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig @@ -20,7 +20,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" +# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="imx8mm-icore-mx8mm-ctouch2.dtb" CONFIG_SPL_HAS_BSS_LINKER_SECTION=y diff --git a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig index acc5d34659b..721c72c719c 100644 --- a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig +++ b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig @@ -20,7 +20,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" +# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="imx8mm-icore-mx8mm-edimm2.2.dtb" CONFIG_SPL_HAS_BSS_LINKER_SECTION=y