From patchwork Mon May 25 16:02:08 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: 1297420 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=L8sisTpK; 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 49W21L6J2Fz9sSd for ; Tue, 26 May 2020 02:02:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7EEDE22721; Mon, 25 May 2020 16:02:42 +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 uDNRExKUtmEI; Mon, 25 May 2020 16:02:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B911D226A0; Mon, 25 May 2020 16:02:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 274291BF378 for ; Mon, 25 May 2020 16:02:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 22F9587C76 for ; Mon, 25 May 2020 16:02:22 +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 wZYTx7+8tUrz for ; Mon, 25 May 2020 16:02:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80079.outbound.protection.outlook.com [40.107.8.79]) by hemlock.osuosl.org (Postfix) with ESMTPS id 0D8C7879C3 for ; Mon, 25 May 2020 16:02:21 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PAv/Yamp0kJzq6qredNaBgMBkFRxApAnnGSx9JIROZfO1NVWRjbmTihAeL0LaXR51ujZKDFhgWHBf+5d/zef0sqXhV+atPwOYq/u3r5l3oGNPDo0xMVgjquZNzDkhDNIXI/W1y0yiigLW33IIGyVVEagKGtMOECJRjxGTzgg42E0ioU6L3Ko9tnu7bV+tFdvRfNWnkLyjmZtP9rqemuAV/tTEBF8nXd3hezgYz/TpK7+bd96QXHO0BqtUiBr6ALfLzO76POQO56mWMDymR7NFUGPIdCHyrMDXtqDv/jyP+51eUvGLqsim9j1FyqqqFtH6qxuHvutPG892VRGlUyKwQ== 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=hcamYb6SlpBGKkXYsy/an1j1oss6Ywm8AebZd7xNCUA+3b4fVC/rYBA/z5xSLnUazrFwPwH2e5Lxv1v+CcOlY0PZzalPto/DbwvahmHok+/rGjaPaaiOgquqazQbn0UNliFZK+zHwUL1fh/e+hq/Ta8I4BexcJ0gRasAzbYP1cge4n874PAUFrBdDVWIGn7NuJJKL61cic75G/UbkiS9s+EaobCFo5T0AMCrNhPRvWXeMFw57z84hxkQcvf9v9HDuBZ+tcCMC44Uepz+n2D5JLV/tntkYqch+bDMNYszGDa9u3Mnvj0E+199/yh9aYpy6WlVBmxy6RBtWLjsMPDQJw== 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=L8sisTpKWDjA/+P/ZlhM6mpKbuE93fxSNy0JidkkxMP9cklZi87FKU/5mW2Srq4VrHzAnrILvdteci5NqrmFqoNlZhzGkOCjKprZ3eDiaE2Bz873fR7kN5ABwIH5bif331k1zlvsfEU+f5SYgUO+i2R3UZZTqyOtDWoeHNBwDSw= 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 AM0PR04MB5908.eurprd04.prod.outlook.com (2603:10a6:208:134::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.27; Mon, 25 May 2020 16:02:19 +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.3021.029; Mon, 25 May 2020 16:02:19 +0000 From: Stephane Viau To: buildroot@buildroot.org Date: Mon, 25 May 2020 18:02:08 +0200 Message-Id: <1590422530-4788-4-git-send-email-stephane.viau@oss.nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590422530-4788-1-git-send-email-stephane.viau@oss.nxp.com> References: <1590422530-4788-1-git-send-email-stephane.viau@oss.nxp.com> X-ClientProxiedBy: AM0PR03CA0056.eurprd03.prod.outlook.com (2603:10a6:208::33) To AM0PR04MB4786.eurprd04.prod.outlook.com (2603:10a6:208:cf::25) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a01:e0a:43f:82f0:e5ce:dba0:335b:3910) by AM0PR03CA0056.eurprd03.prod.outlook.com (2603:10a6:208::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3021.23 via Frontend Transport; Mon, 25 May 2020 16:02:18 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [2a01:e0a:43f:82f0:e5ce:dba0:335b:3910] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 3916d74e-c5e4-45fc-90fa-08d800c50067 X-MS-TrafficTypeDiagnostic: AM0PR04MB5908: 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: 0414DF926F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u7vKrOQbB8X03KmQ54v/BzMiWig7XeJynjqWzw38CbFsXIujtq3TXnNP+kVywmnBcHT5JRq2VtYqzmeJYe45VRvqWilhFLL4TEc+nhldfkthFomIluxg0h0gpYBKZpA619YBdkV0eF0WRJwxHFjIe5pro/C/IjXKuZaZKhCqqPvh+WUueDNAyeb0gas6xEZnWAIJ2pesdEH+yohrlUtVw0Bqs3v0h+iKz8+B5n138W86JxphQXakbewhx5/bKNpK3nsxup2ZvaDVd3z/Ih91kdj8AsQyO7p2vzKklDJstbCqOQ64IzPJo5PpdSogimv6FVjAPdQqj7tPESdZoiMen0ZujV1WZU2qBToDXBuqKeUCEfmZvcFNfDPDqwx2rtq/9oC1gXJ7Fdl7L9MbktXxkDjyJx+JWn0Vfy5U/9hLHpQ= 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)(376002)(136003)(396003)(346002)(39860400002)(478600001)(2616005)(2906002)(54906003)(66476007)(69590400007)(66556008)(86362001)(4326008)(6506007)(8936002)(44832011)(66946007)(186003)(6512007)(6916009)(16526019)(316002)(6666004)(52116002)(5660300002)(6486002)(8676002)(41533002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: YQHDD1hseU+6eltEBADJa1Y+wN2QmVJHGGk4JW5cDnjZnelOrM5kHO2G/tNTU3B7Gr0KiZtW3GzuQX3iBxuRMoiwrhQqY5WdOBh5TITjqPOSqnOXTjFb0gL8DFjy0ngklresZJAFUSobhcbOniAcb+7HkLXo5yDeqA9Niod943dfNu/myrX+4e+aini1TWC7GpOcEYyq0IgeAhDyqwKRguAsa8jOb+QrbNmEZD9CAQIxbJGICtWvTlTeIEow9oDyDbar1N9yQn3LHpPuK0WGgVFG9N183sP/6e70GxvByCMpxq2gxUaFaEMYb3LqwYlU2qtZg/+HzoskJhXAZjlNjOFf7QAPEFs4oRzdosvEtoLAPbKK2Y4WnccPTlgVyGCXyklSFIHya93vkWorP8ukebMFqirra2PMKqsDrVHoWszJslGqXpLpwI6Qc+LyQlnwUR3qStgnmEmN9gOpZzYGMSg81Bsv2hjbIe0LQ0zl2RQU7aT4HUzTrCzTkMLTyBIquf3q6TintvbQFg4X2Uk2bMZJCmn0N6AJJZUbqnF5bAo= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3916d74e-c5e4-45fc-90fa-08d800c50067 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2020 16:02:19.3316 (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: tZQIgmBJE1EuodNRcrP/K4cOdRtg9crFvr617MPHMPqOTPRSUGZZSckrqLauEJzeFID2JV8zn2NXnriiPprrNA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5908 Subject: [Buildroot] [PATCH v3 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 Reviewed-by: Gary Bisson --- 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