From patchwork Wed May 27 05:07:46 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: 1298616 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.138; helo=whitealder.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=aWIYnirp; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49WzQB2JTyz9sRW for ; Wed, 27 May 2020 15:09:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 17EF487D36; Wed, 27 May 2020 05:09:03 +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 S+87TwsQUaHr; Wed, 27 May 2020 05:09:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B83BD823DF; Wed, 27 May 2020 05:09:01 +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 951521BF86C for ; Wed, 27 May 2020 05:08:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8F12981F17 for ; Wed, 27 May 2020 05:08:55 +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 4lsaI4QIdnB2 for ; Wed, 27 May 2020 05:08:53 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70059.outbound.protection.outlook.com [40.107.7.59]) by whitealder.osuosl.org (Postfix) with ESMTPS id C1FEF823DF for ; Wed, 27 May 2020 05:08:52 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oOAA/+aD+i/6pG8qMvqg/UrG4K+JjkJHwpZM8FfpqkR7jUDvR7UBp++V+nPVrmfLyi3JHYUzimUlFCchqXlQx1q0v3+m+PBj4limW0tj//8/jXA6bfu7Qfo/mUyvncyplBOlNVknUTMS57RU5Gh2TM/6HRq3iKxhSjmXIpXXuuBW09dU+sugkofiQ2wibXkctQa63J9afJJlnpulfa1dCLkm/qcSUlCCvfMvn6dFIhkt3Vq91AIpC07JlgEJN1qFutKZXDW3Pr+5Vde4/F5X15LKzhNgS9pPQtUzACh2+kOoM9DmgE+Hd1Pu69mXPK0LwEKQX1rhOkes1Ipn5YqPJA== 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=0BkyieGygRbJdbjsiTOGYQAlqtR9T0G4F+kvK7qZw8g=; b=kmJcBnYYLNR7pAQ7hBTGlc270jHFFlMzjqch8lLV3QN4wekhAn6EPxu7fU3jKFRSBhk/L3p4jOaJWdIKyxq0DnhG6SN9hbFERvJITcg0WH5Bj1NUp+ZW0NJ3LVNIH+igveb2gjrhHDJYqzqGDllNQL4BeV39dPaiUBEleOuVkqSIjCI+zU7irJyLd1n9zWL8c8TJzeV+usnd+/q2p8kn13/3un2us0hsTFRxUFTBWK6vnoJAb1ZAsySTxdU5Q5NL+ao5Ifw1MmL2CimDQ+Tg9uokoXd504VySPJ/Sl0BrnJrLZkCKPBBYGG34hvdehsZJVEwTbyK14dNecgRvnlv6w== 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=0BkyieGygRbJdbjsiTOGYQAlqtR9T0G4F+kvK7qZw8g=; b=aWIYnirpG2CJJMYTkKFEA296pJ1lpEIhuQ/I4FO7OUzN0L7OMHBciAJEoyK3/1cangw9OYrpzFNCSX04ks1W+MNRHcveNRipbsJT4tOtMm8dDJLCzJL+Z8RB0nuCqyCa46jOA7YAVQZ5E8It6+Rl++jb6q8kl5V1waah26GT/RY= 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 AM0PR04MB5412.eurprd04.prod.outlook.com (2603:10a6:208:10f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.23; Wed, 27 May 2020 05:08:43 +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; Wed, 27 May 2020 05:08:43 +0000 From: Stephane Viau To: buildroot@buildroot.org Date: Wed, 27 May 2020 07:07:46 +0200 Message-Id: <1590556068-7043-4-git-send-email-stephane.viau@oss.nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590556068-7043-1-git-send-email-stephane.viau@oss.nxp.com> References: <1590556068-7043-1-git-send-email-stephane.viau@oss.nxp.com> X-ClientProxiedBy: PR0P264CA0199.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1f::19) 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 PR0P264CA0199.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3045.17 via Frontend Transport; Wed, 27 May 2020 05:08:42 +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: 4f3d658d-bd12-4160-bc92-08d801fc06e8 X-MS-TrafficTypeDiagnostic: AM0PR04MB5412: 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: 04163EF38A X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R1pA5+2XvEiZwJAq28434MFWaDHZ6PHGiicY/rNlLePSHpMRyhB2Y+fiNTLh/ZD5iOmvdU/xhoEMuqjT+kwqG+DT9M9yKfqAgwjPsNxL63QC755ALb1naEkTSxklhrFpkBskoBMgQu9mQI0+svwo6AcvGTyHEIf9O3KudKtzaanWewD6oVltPPwNjzwCGUlE4M81Ydfs3m3Kz1lSimSFNmGjuejVlxj/otXSK63aPR77Jh0tZI90Hz6RgFAVu8SXW7Wm6y3BjmIFX/hqkBs+16veoHQAde3t8ptEc+QbgwDWSRBTLE1ZMFyucApabXu6Z2EZPhHnGgQIE54Tu1uF38JcshcGJ6BJTj7sv/htsn6pll1UdhBs3OdTfcGtQINtKtajqWbrYCn0DRZU8ZxmsyrXiAJdyNem2LTcPqlbBXQ= 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)(376002)(346002)(366004)(396003)(136003)(39860400002)(6486002)(54906003)(52116002)(6506007)(478600001)(316002)(6916009)(2906002)(44832011)(4326008)(8676002)(2616005)(8936002)(5660300002)(69590400007)(66476007)(66556008)(66946007)(6512007)(83380400001)(186003)(16526019)(86362001)(41533002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: BM7qtdG5cQ45sCNNU9Na541hp6cOsp8eAQyD7B6UYrdWWNIyS7RJUa47XB56NpEE0QWZp6nUVUzv4WrNF+z6RpZ6m7qALQIjM0Q0K0Jz8QTUXWgbBeqslNU0AtCINqmiMjErac4ypIivXWURg7wYzm96rlG5i84P4dLY4Z0kxJ+maYJbdrMLBzmXLeS5YSR8r+1XJk3qdeCeXFYHQn7c4ttHD/mhcDEL52XIL9cwZ4olUNRm+1kjlzFL335luTksBPwd01xp585HwIquqQnrxwxjVyvc9Vhax5G/BuEq8cENXZ1meLm5N9ffVwFgjZNHoSmrBPNbVm/puT3XyriW8s6dbz1HCVVqtNgVJhFWScuhQnBNNEj8NgQWaDuZOfe1Q8dP+iVi3tpZ2cV5GSw0RCFb6A5eyAOS5TOKjKUAk01BttsSDkFmdjkEHrmTYWA4p9ASR88610jto6cxHcYnJ1km2qnojSPfM+CG+yC0xr2PDBO0T2tfgk4zXDRzP+QO6GA4gnQSSi1qxkNK3PQ5F8Ha4NbJbIgxVi4kP/DoVynaH1LUGJru1CYaZEWaqVjG X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f3d658d-bd12-4160-bc92-08d801fc06e8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2020 05:08:43.4376 (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: LFy40zbe6LXrd+s0BF0mj4uUa9UGa908zQbX0QrRE2KhN05A3Osfh0P6o7p+1HKR4tPhbiVXbMa1auGLJrsk8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5412 Subject: [Buildroot] [PATCH v4 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 --- v4: - add Gary's reviewed-by 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