From patchwork Wed Apr 29 08:31:21 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: 1279096 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.136; helo=silver.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=H5cWmXsn; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49BsJb0JgFz9sSG for ; Wed, 29 Apr 2020 18:34:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 61417203AE; Wed, 29 Apr 2020 08:34:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pEW31drCeuEJ; Wed, 29 Apr 2020 08:34:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id DC9B120406; Wed, 29 Apr 2020 08:34:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id AFBD71BF35B for ; Wed, 29 Apr 2020 08:34:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9CC6120406 for ; Wed, 29 Apr 2020 08:34:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vdokoCMQ2d6H for ; Wed, 29 Apr 2020 08:34:49 +0000 (UTC) X-Greylist: delayed 00:18:41 by SQLgrey-1.7.6 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2062.outbound.protection.outlook.com [40.107.20.62]) by silver.osuosl.org (Postfix) with ESMTPS id BAEFF203AE for ; Wed, 29 Apr 2020 08:34:48 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ngeLGTEVo7YZGHHuJksaWwJf6T6AyGM0ne/D74oGbFL0L9R+NvEaTQxEUvP7uYbt9YU/Zvvfx3IXuTdId0bOG/VE8daaJq6sVeSWBVAro1GgRNgZyD2oKvz1HJoInvAwWMwQ9ny/v1olC1ybIu21GOHEwPgvblXnSWD0hA7KP3TxkYZCblabt8B+GS1MZj9tQ1LECst36NMGaSLGdzyeLb1isqls0ruR97aPcJEkIvlg/bxdYExYyr3hlUXBciWnfoPCglC8ei+vVBVnJ05EXGdhE/4CBJBxDJwWi0MriICi2CEWO2OgrlVKadHklsBQ/0MIp84uCxdfGYFsizIkMA== 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=Cub4f6ZECFf9SLgOJgV/qc8C9feh16oEQKB8XIGo9yoKtMxLkvANAOyac8BoJs465RXMVENqtFqq8+D5PD5+JRH4NoxpBMnc+wF5yq2+aHGGcW57GDNgsHTInEVrEmhYohPsnXu7IQnjLjyqy8Hywer2G8elvQ2u0y6ObOGoVUjUx7RqKkdHolKlmLykgFajdVEoWMCtSEq+DOVf48N7QqKj9QV07ZBRrENE/MmBuOjJmN04ZdYfC83/SB/rqBEh1H27SoSe/YPoyLcECUGVisExkI0p0ytm/iIWFepc1iavaXHhBSwdP8LKwFXA0dmxqNalylrGEfn9X99UWlqHzg== 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=H5cWmXsnHOwsmKm2bQcY2qEgbx0Y5+8Hwj2JpbTah1cVTyzXrtnjGx0VGPux1/9Mg57PLZV02u5SJj0lhJ9UIyXkxLTfdgPrRruFerIEWiPdhteznud3xbxs6x7kylVxvG3ETa7rkOk83ExYMc16TVyKLOIk6CFVLed8IVk40/c= 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 AM0PR04MB5060.eurprd04.prod.outlook.com (2603:10a6:208:cb::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 08:34:45 +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 08:34:45 +0000 From: Stephane Viau To: buildroot@buildroot.org Date: Wed, 29 Apr 2020 10:31:21 +0200 Message-Id: <1588149083-8229-4-git-send-email-stephane.viau@oss.nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1588149083-8229-1-git-send-email-stephane.viau@oss.nxp.com> References: <1588059233-11467-1-git-send-email-stephane.viau@oss.nxp.com> <1588149083-8229-1-git-send-email-stephane.viau@oss.nxp.com> X-ClientProxiedBy: SG2PR02CA0083.apcprd02.prod.outlook.com (2603:1096:4:90::23) 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 SG2PR02CA0083.apcprd02.prod.outlook.com (2603:1096:4:90::23) 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 08:34:41 +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: 7a6ac284-a0d8-4197-a8e1-08d7ec182bb4 X-MS-TrafficTypeDiagnostic: AM0PR04MB5060:|AM0PR04MB5060: 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)(366004)(396003)(39860400002)(376002)(346002)(136003)(6916009)(66946007)(6506007)(66476007)(66556008)(52116002)(8676002)(16526019)(86362001)(478600001)(6666004)(2616005)(44832011)(186003)(69590400007)(6486002)(4326008)(8936002)(956004)(6512007)(26005)(316002)(2906002)(54906003)(5660300002)(41533002); DIR:OUT; SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DK23EKIpci72doqKqLvnUbMZOciDAYT7Ru74I8i1PhBEEvgmrIr66jZfcHl5w/2z8sNPKasUC9G34YGzIsKHRgH21rGzq9ATSxZS9mA1r8JmNVBdQvaDriDNWoVan0aC8KoN6oTHQ7QzNuVwJ2hNHmHTZvfjYXze+w+UnW6tQzRDE9abjeyH3a1JeflD5vOpWDCRW8P6fiwMguBa1Kt0NljdONKMVoj4kQqVy0JcOHulC9MC5mk6DyKvvQYLuXM3eRzfNdgLU3VLOJmQDR0qNYBIoe9fRQ39rZHbPKM8j1AL9TbKGWXqJeCsZI3rCiXqh72CdntcUKHpxFNKR/hyXPG9jcD0wcRKt0HLvMvaGkgduIKzba/Hx74APNFVnaxnYKiYMPoSxnZ3DEkDSFDGha0sPVtU5j9vNLK25/3+5imHe6GNGN/GwcaY1/ZZeOWXhrZ57RwRQ/A+QP+5AQTxla1FkhnudMhmtnJlNRNhSSvBjskHwGqyO4Y1Lzl5NlNCLSdqBX75f2rBFlwslrC0Yg== X-MS-Exchange-AntiSpam-MessageData: 9d22/oKf5hgVi8g+9IIXm1La6tm+RAcZnm7tXhnspgMUsUQyUkEHSjhfzrUBDCIX/D9bIGJfGqkqhBr2d77KmMyWDa15wsufi41ty6pVjexWS/a2WSSNIu1g518jZs0f9nbnXn6Cj3IIQswcoXAK5xjNpi0wdibG2wgZZwrUKDpNtIj3LJAtw5vq3Pmz+HWOMt8gDJgebsHbzhhkLe5gADIzIQSOsJ/k6UyJzJBjw1FJTUECLfRcWus4TbLJw2ewiv0ediQ1+rjO7UKmA46+Twadmqf4Z2Y7RRhZHURT99sjddA8Pj7CfLYGDDIYQYqOtXYbRSibyauTFprj+CeG73RtLnDUcSmf25lIRahKfRBET/Zg3Oi14dKvKLrQvKOf0TUQ0rKRlmsFNY9IOXWBPnYvfSwHNXJxwRTDozebOlAbq42YvUqCPN469VJUGXvvG8fYO4owZf/mgEeY7gn8dLtzFgv3+b9/e1DDrvjinFSBZZK7nzozmZ2orIWeM8lT0c2GMMFIuEB7xaOdkIwMNPgHhlw8m5KksiZM2xNyKiqPdFYtDQ2qhC9c+hCHaXusZHMSzRvXl/LbWR0FSVLVOOBwkdAlKAYyWV76UYoQhYfsG0rTAFkkYn2r9iqVBJUHaQTn509av4sDznbIIW8Pp6QbQFBRFBynnR5BTIyDvp9CtVgCDXNKUpDCdCDOZAj20EYhK6NZfTYLGrTIOz9eGQfv692oitNyBVFkWAOT51Y0UGrDeEyz/C876LJqBYXAE3D7L7AnhjFWIXcDuP5JOOaGRswhSrNzs+bIntIfbaQ= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a6ac284-a0d8-4197-a8e1-08d7ec182bb4 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 08:34:45.5962 (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: WXg9NL6avlbyGbhcRDxKlkLTPF0A+afC7V4I+OKfwaJ8w3oTXrBBrtiMAigmi68hURhSrUyfbF6yTgQWGlwYDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5060 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