From patchwork Wed Apr 29 09:12:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Stephane Viau (OSS)" X-Patchwork-Id: 1279113 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (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=j1OXCZ+s; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49BtCx4XHCz9sPF for ; Wed, 29 Apr 2020 19:15:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D7BB288175; Wed, 29 Apr 2020 09:15:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p5m+oOGp2ael; Wed, 29 Apr 2020 09:15:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id F16D78828C; Wed, 29 Apr 2020 09:15:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5FB9D1BF309 for ; Wed, 29 Apr 2020 09:15:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5A0F987789 for ; Wed, 29 Apr 2020 09:15:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HdkVDUDqx1xg for ; Wed, 29 Apr 2020 09:15:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80070.outbound.protection.outlook.com [40.107.8.70]) by whitealder.osuosl.org (Postfix) with ESMTPS id D1B3A87784 for ; Wed, 29 Apr 2020 09:15:50 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TUJC7Vynopb+Nd7Q6k4F+vY4xCEDzNOUFyJU+tWliMh4rfpYc43sExJYndBcNbUmL7lkE/VMdw70nhlZH+xbRhWajVh962QKnQ87OVrqOSvV23rhQjHw7gd1JyKvq7ZrHexCrNxbMMPwIR+kfMIt/vxN4RmiDdTznUae2TpvBMHhmVn+dO4ko3gTlqV0FKNc+Sh9JmLCzREVGqiE9ZSTR0DHQva1h7YH5nXPI6YBqf+oaSwk1Uv2ODHMKPIl6C1t1rmvu7YzRRWxO/YfMiulYZuMtfauqBclBrEGX8gicMq9fWNVkTRn9IOx22M9Lap5M128h4q1cltVVo8kre/27g== 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-SenderADCheck; bh=16W6Kgho76vIJVqzIVQPPuO3jHiQHy0Ztr0SUBzuoYA=; b=H2bZVttACgFoI+8e160uqWNlP9OXM4Ra7+qGQKex3tlRMy/Qs4+DaWZOpmh1XCPGKtZs2JMZd4vblHaqRzxtLdYqf3+ZejpOYwCbPB3cx9zb1NwfEq5CItxpSINadXTO2TMzx+rfjYVnMjzmrostvF6KU3oIUhFadF2o0UmUO5WFbM6B7pfcqOKzrsWM3fXrSib1u13wrV10lNU5k+DjfJypnUcRuEKLlyVZkLrDaGgWuXdk8W33OdNB0BcF49hwdkbNw6oFhKaXEs7bPDBr33j0qaEiVxFLw7yWsnyeqyQLLAlkjHtS0utUodvfwL7VVOeRKqFckuYSzwPKFqQNPQ== 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=16W6Kgho76vIJVqzIVQPPuO3jHiQHy0Ztr0SUBzuoYA=; b=j1OXCZ+sp4ZLvnx/7BWsRL8Z5240pn756o6nwpG7XwZ7xNyjBDhErOgyXOUpj0rxHmKLgQ9jtxYIENmlaDDMWdE4cCLG2Ui/Q6Kg/jUZdj1MYCPastrEekL0TqVAPs3dWb+OGYwb+V9GZdoGoD0fVxLyFe5M4rNnZf+UZRarVRs= Authentication-Results: buildroot.org; dkim=none (message not signed) header.d=none;buildroot.org; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB4786.eurprd04.prod.outlook.com (2603:10a6:208:cf::25) by AM0PR04MB6497.eurprd04.prod.outlook.com (2603:10a6:208:16c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13; Wed, 29 Apr 2020 09:15:48 +0000 Received: from AM0PR04MB4786.eurprd04.prod.outlook.com ([fe80::715c:fa5c:5b68:5e2c]) by AM0PR04MB4786.eurprd04.prod.outlook.com ([fe80::715c:fa5c:5b68:5e2c%4]) with mapi id 15.20.2937.023; Wed, 29 Apr 2020 09:15:48 +0000 From: Stephane Viau To: buildroot@buildroot.org Date: Wed, 29 Apr 2020 11:12:23 +0200 Message-Id: <1588151545-9346-4-git-send-email-stephane.viau@oss.nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1588151545-9346-1-git-send-email-stephane.viau@oss.nxp.com> References: <1588151545-9346-1-git-send-email-stephane.viau@oss.nxp.com> X-ClientProxiedBy: SGBP274CA0003.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::15) To AM0PR04MB4786.eurprd04.prod.outlook.com (2603:10a6:208:cf::25) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (81.1.10.98) by SGBP274CA0003.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2958.19 via Frontend Transport; Wed, 29 Apr 2020 09:15:44 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [81.1.10.98] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0d2e51a4-14a4-46e6-19b2-08d7ec1de76d X-MS-TrafficTypeDiagnostic: AM0PR04MB6497:|AM0PR04MB6497: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-Forefront-PRVS: 03883BD916 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR04MB4786.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(136003)(39860400002)(396003)(376002)(346002)(366004)(44832011)(5660300002)(2616005)(2906002)(956004)(54906003)(316002)(69590400007)(86362001)(52116002)(26005)(8676002)(186003)(6512007)(8936002)(66476007)(6666004)(66946007)(478600001)(4326008)(16526019)(6916009)(6506007)(66556008)(6486002)(41533002); DIR:OUT; SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0uVFm5/xL2YQeJsjQU1yVOmneYHEpI3a3EhQCDdI6FwvvAM7UqefaOLMWFQRA/tuQSaVOuXAYk7+r/1nSe1/uBGsbxgLr5Qx8EXadfSUBkUgDxaej7z6AFqXH2ACfkay4meBi4dX9dQw5GluL0oKJoDFjaUQZhJu0JdB8maF5pwQG33qYlKNL8sB7ynL4NSS0bGFpTatZEgosOBVwlJEQeEXYVqe5MDxop8Gaj6bixCOkFOHY2qX9mJibk1RTYoJM4LrBPjW3yZcfJ4GRs+O5LHtbz6JP0yJLk2E7A9N1UvhoroO6G+h4gVBFAq3NPKZng2WSub0kpV/COIjHK6/TixAldzofQj5VejcB49TMN1dRYa65EyqeBnjidvkjj44d36yrZCTXWrFw5qLJ0GpgK+E/KXhF9Hd2SFEV5HnKxbSRsiv8IEKaYYENKws48618AV3GrTkaFqXzyUbwaPhEc8B3wUvbrIDMJ2OBx0z8BY7V1R6fyI4Uzp+NPkesKzd7eL5gW4nuUmNJCLzxLHqXQ== X-MS-Exchange-AntiSpam-MessageData: /5K98KL3dIn1adtotKqn2wvBDvVy4OlIp3rWB929QfCOXUAoODcfJewP7hZyw6N2KqD7YX9cdAbS38ArSUuuUny0ddHOAfVePm5SPR1GXoV1iydmpjKK3ueM/6fnPdS4pgk4hI3iUpFiYhxgBN/TFvUAMjotoA4CkYYeTIQ3CT9YcA41Gt67dxRaEK/9wZ120Pza/UQDyPMkWbNlWzRPRhXPqNV66kKILPVpOulVp8j4VL0kFtPmyJg5mlQyPxkmdIOdeMU4j9C/OSgNYf54VGGgbKq1AJzB/GAXu33Qu/rROtQo1+7WVz8cXQTVivkip7b/bD7RzEjxclpf82pDFAoPxRiIgqbHBVpye03+EAgfLLQfW7pcenQl9t+prnpe041i6V7TZj9CAoQDKcNr2sHeaLci2dOaAPwrmdQVSYtLP7r9t7lFU8Wz4IdPa2BW2U2pZXMSIdRbfOfefXaOqSesWWZKVKE2a4Selq3ZPX9/xYQpgYhHOje3l35thwoAWXJY554T1GBAlsEtFjgfP+6ucoEdZUmZhwyr8gGfk/eOwTJpNycN928fH5upkc/hwwheFvF/moWvgAZi0FHTxyPomM7O0xPWYHt0Fpd6O/e0rYpu8NiTOApLlDSeU60rWbV5Gf5Ae1RMPXu/jUAE3QSYYsHS8eRRgSSbRuBP9qC44J5i6St7tTc6VScnjmhyv+W+984BJjrVQqGw5HNH1Jf2yNZUsVn2GxOgMH2eYjGUugWlXVB4qJTK7wiXSYbx/S4+V8Sj5XMvQlzD0BHcruq+GU+J6ZSnzBHNvCveiBA= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d2e51a4-14a4-46e6-19b2-08d7ec1de76d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 09:15:47.9986 (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: 6DqQo6bqi8GAwpdfKKRLCW2rfWuuMxN3zSlVpO70fBPeFVhkVVAWGW4jzI9ClSL6A/hp4heacSP5sdeByIYB1A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6497 Subject: [Buildroot] [PATCH v2 3/5] board/freescale/common/imx: use generic ddr_fw.bin name X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Maeva Manuel , Gilles Talis , Refik Tuzakli , Julien Olivain , Stephane Viau , Fabio Estevam Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" For some SoCs (i.e.: i.MX8M Nano for now), the DDR training firmware in the boot image depends on the type of memory installed on a board (LPDDR4, DDR4, etc...). The previous patch makes this firmware name agnostic of the DDR type and uses ddr_fw.bin as a generic name. This patch makes imx8-bootloader-prepare.sh use this generic name, independently of the kind board DDR type. Signed-off-by: Stephane Viau Reviewed-by: Maeva Manuel Reviewed-by: Julien Olivain --- v2: - generic ddr_fw.bin name is now used also for 8M and 8MM, along with 8MN (suggested by Gary) Signed-off-by: Stephane Viau --- board/freescale/common/imx/imx8-bootloader-prepare.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index abf2e43..cb7c37b 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -9,21 +9,21 @@ main () fi if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its