From patchwork Fri Jul 10 12:00:42 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: 1326721 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=fail (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=ZAA8uKHJ; 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 4B3BVd5mR5z9sRN for ; Fri, 10 Jul 2020 22:02:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B489C88A37; Fri, 10 Jul 2020 12:01:10 +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 FOtIQeg5w-Xs; Fri, 10 Jul 2020 12:01:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6723988328; Fri, 10 Jul 2020 12:01:09 +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 587DF1BF35C for ; Fri, 10 Jul 2020 12:01:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4DEFF87C03 for ; Fri, 10 Jul 2020 12:01:05 +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 mTzrRwHL6k7e for ; Fri, 10 Jul 2020 12:01:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80078.outbound.protection.outlook.com [40.107.8.78]) by whitealder.osuosl.org (Postfix) with ESMTPS id E64B6887DF for ; Fri, 10 Jul 2020 12:01:01 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V0LJZ/8Nbcw5Ihf+XNAzGor1afjFfrxqlr0vlX9j8ZanoVNhAU9H8gtUE+uHzxMniBXZ9lSkQqwlxuhRO6iAm1AwjvxeKvvkiPlXZHfWQPxkIGlwhivVQqRbcE1Nmi4OlLyQ0iDCdwyMmBZWbLFT0AnvNIoK+WqsAHobj4fQEwassGULw4XtqodT2Y+WgCfrzZm+6NxbapGJNdU1HZsxBAVyP7uU/sFlCpYpqvi2h74Fk/TF6CjCJHEkR/34/qDIISJnUbDsVu6JtBKG/rLP7chEJ9TEyXSfPdNFB2qyivvYuOdaAPnJA2w1d5jyGOsUwCEfr3xMwCyrv7vNyvsPDA== 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=mqqN4jUJZs55VB7borHPnvf4pdj487VNyrL0cYNVYRI=; b=izxgdGfy1y+TvhSc+6hDK5sDIOvxdJFwH0mHBorwiGR6a3R/0XuTBCs9zblrdBoLkewJFdy0YlsyIFKXnOBPLiWy2HwJSkWx+uEv5erg3QPAfhgdhiffWvj9wjEEMDdM+UnpLq8w76Jb5txjdWAPtBeHqqbz86Ok7JonREZTxqlT7I3rJK15HMJzqqhIGQ0voercyQxLDKfumJEcs4O9APlI34mXyj/L6bsCYokEr7M8VkiAam1c+kMNtXIzCY90O66Krttw18vioVla1ryxLpfOtNaByts955/VCK5aAcJgt8hvrZrFCV7jvL2YIo6FDLgeMXFRWCU69pxrU+gXLw== 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=mqqN4jUJZs55VB7borHPnvf4pdj487VNyrL0cYNVYRI=; b=ZAA8uKHJAnCLMU89K8SJ+zuuITKBCYMqLz9DRrdk2NW30ShvFq3nyQxz1YfE/MG6cQD7iCYuEQvOb0bNPYS7rvyDltRoj+csCY1W4GVzlXh9GY+yK7JpQ6IuZ+NwHrzH2dZCw3L0oK33cUwZVHdigR9xGbavCPKQar8xVY99Qyw= 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 AM0PR04MB5217.eurprd04.prod.outlook.com (2603:10a6:208:bf::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Fri, 10 Jul 2020 12:01:00 +0000 Received: from AM0PR04MB4786.eurprd04.prod.outlook.com ([fe80::a900:801:e20:3812]) by AM0PR04MB4786.eurprd04.prod.outlook.com ([fe80::a900:801:e20:3812%4]) with mapi id 15.20.3174.023; Fri, 10 Jul 2020 12:01:00 +0000 From: Stephane Viau To: buildroot@buildroot.org Date: Fri, 10 Jul 2020 14:00:42 +0200 Message-Id: <1594382445-4464-2-git-send-email-stephane.viau@oss.nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1594382445-4464-1-git-send-email-stephane.viau@oss.nxp.com> References: <1594382445-4464-1-git-send-email-stephane.viau@oss.nxp.com> X-ClientProxiedBy: AM0PR05CA0082.eurprd05.prod.outlook.com (2603:10a6:208:136::22) 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:b92e:36e7:4200:e0d6) by AM0PR05CA0082.eurprd05.prod.outlook.com (2603:10a6:208:136::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3174.20 via Frontend Transport; Fri, 10 Jul 2020 12:00:58 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [2a01:e0a:43f:82f0:b92e:36e7:4200:e0d6] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 012c602e-143c-44e0-0fbc-08d824c8e932 X-MS-TrafficTypeDiagnostic: AM0PR04MB5217: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VoHLjlfdYg8HgYs2IGvaLOYzePOLI00omrjAN79Bp9J9kP/TvZEPbvwBWsaieC4Q6MVKztV2cC9xEtjCN2mc4HWYzP/SVgUs29WKwX4ryk7UoAk0cmuQtvhAdI73WbGAseaK+l4AzJ1990U+5IrrGnAdab8Hvmx1jJXjdctV736+GaW6X5s5kggVnwn8P06pfnu2+scAONVfIhWAK4fxyYZSg9lsNxk9jcYJJ/hxT0EjosjfSaq0rEidG/bkpInFmmBqNzdv5OSisrzKWYO0ihbe92+z0CLnRkmRAWngrKzkqY5z1fJXAxd0Jw3Vq2Um4Gjdq01Ao0021amEgANxempHRTcGZdmaOuFMcgH8kV9fiROp0fK54THwsoC03bUpKCB8iI4U+wDjWdUqwC5GEg== 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)(366004)(376002)(396003)(346002)(6916009)(16526019)(186003)(4326008)(86362001)(54906003)(316002)(6666004)(6486002)(6512007)(69590400007)(83380400001)(8676002)(2616005)(44832011)(478600001)(6506007)(2906002)(5660300002)(8936002)(52116002)(66476007)(66556008)(66946007)(21314003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: +103+qsclOwsOangLuqTZo1lLWOozMjCxsYye91dEP4f33+OmDq4ER+SMecooMqogdG7URQkfEcLWyJ6eyQ2gpEgcqvP1zYsA8Xi4sBqoHBff2SaSAL+lDA5s72TsZ/oHMeMC/yAvRboLAbtOwTJ+o/aYqEFvpjEARpIGijz+68c61PBRQDQl9PklVPfC3ynqL3SBVXh8C5mwMKuVCRBBo+8E+9CRTFiDNxe8B0xzxgRGW17RcC4VLDYCo38KnI/a5ANSdd+rA0MhwnJFFZpqE4NwvFG2VHUOts24/XU7WRK8QZAPM0hA1uqQG/EVPJnOx7/p732iQ5tl9biuSIR5LhHVPIcCqX0Rgx2HqBpeUC4q0TXA/lVQ/Ywd1+KcYpvzG+YylekkrbNEp+zxCs//y9IvDrVejdC0r1XVDgslGfJi9ShektVFtYQqiXWqMOy42QiJRYUIex7P3N8ZlAWcct6sfjGQcC6IO1vrv80Gq75Ti97S7cGt3y6dq/+D+u7aMi6zoaCwOMuEMdgod/7cnxXEe0IbnzeOb3ZQn3xBts= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 012c602e-143c-44e0-0fbc-08d824c8e932 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4786.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2020 12:01:00.2213 (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: fGMC24+tm4XjmL5fyodEzG95nyz7XCDMEfQ5C/llmSbBQNchVyyug0zLo6F8lTEOMyTflP7UBxAddDe4QEV6Hg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5217 Subject: [Buildroot] [PATCH v3 1/4] package/freescale-imx: Move DDR FW choice down to firmware-imx package 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 , Stephane Viau , Fabio Estevam , Refik Tuzakli , Thomas Petazzoni , "Yann E . MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The DDR FW along with all other FW code that need to be used in bootloader or installed on target are related to the firmware-imx package. This patch does this job as well as fixing the conjugation of NEED*s* in the symbol name. Also take advantage of this patch to make the DDR FW dependant on BR2_PACKAGE_FIRMWARE_IMX. Note that BR2_PACKAGE_FIRMWARE_IMX_xxx is the preferred naming convention for the upcoming couple of patches. Suggested-by: Thomas Petazzoni Signed-off-by: Stephane Viau --- v2: - Fix attributes order (make check-package) Signed-off-by: Stephane Viau --- configs/freescale_imx8mnevk_defconfig | 2 +- package/freescale-imx/Config.in | 6 ------ package/freescale-imx/firmware-imx/Config.in | 15 +++++++++++---- package/freescale-imx/firmware-imx/firmware-imx.mk | 6 +++--- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/configs/freescale_imx8mnevk_defconfig b/configs/freescale_imx8mnevk_defconfig index a859d1c..6d91e3a 100644 --- a/configs/freescale_imx8mnevk_defconfig +++ b/configs/freescale_imx8mnevk_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y BR2_PACKAGE_FIRMWARE_IMX=y -BR2_PACKAGE_FIRMWARE_DDRFW_DDR4=y +BR2_PACKAGE_FIRMWARE_IMX_DDR4=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 0be37ce..b0c7de8 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -45,15 +45,12 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M bool "imx8m" - select BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM bool "imx8mm" - select BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN bool "imx8mn" - select BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X bool "imx8x" @@ -99,9 +96,6 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X -config BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW - bool - source "package/freescale-imx/imx-alsa-plugins/Config.in" source "package/freescale-imx/imx-codec/Config.in" source "package/freescale-imx/imx-kobs/Config.in" diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index 4962992..7ff37ed 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -9,22 +9,29 @@ config BR2_PACKAGE_FIRMWARE_IMX This library is provided by Freescale as-is and doesn't have an upstream. -if BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW +config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + depends on BR2_PACKAGE_FIRMWARE_IMX + +if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW choice bool "DDR training binaries" - default BR2_PACKAGE_FIRMWARE_DDRFW_LPDDR4 + default BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 help Choose the DDR training binaries to be used depending on the kind of memory that is available on the target board (DDR4, LPDDR4, etc...). -config BR2_PACKAGE_FIRMWARE_DDRFW_LPDDR4 +config BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 bool "lpddr4" help Use LPDDR4 binaries (i.e.: lpddr4_pmu_train_*.bin) -config BR2_PACKAGE_FIRMWARE_DDRFW_DDR4 +config BR2_PACKAGE_FIRMWARE_IMX_DDR4 bool "DDR4" help Use DDR4 binaries (i.e.: ddr4_*_201810.bin). diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 6beacc0..55ca6fc 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -18,10 +18,10 @@ define FIRMWARE_IMX_EXTRACT_CMDS $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW),y) +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW),y) FIRMWARE_IMX_INSTALL_IMAGES = YES -ifeq ($(BR2_PACKAGE_FIRMWARE_DDRFW_LPDDR4),y) +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys define FIRMWARE_IMX_PREPARE_LPDDR4_FW $(TARGET_OBJCOPY) -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 \ @@ -46,7 +46,7 @@ define FIRMWARE_IMX_PREPARE_DDR_FW $(BINARIES_DIR)/lpddr4_pmu_train_fw.bin ln -sf $(BINARIES_DIR)/lpddr4_pmu_train_fw.bin $(BINARIES_DIR)/ddr_fw.bin endef -else ifeq ($(BR2_PACKAGE_FIRMWARE_DDRFW_DDR4),y) +else ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys define FIRMWARE_IMX_PREPARE_DDR4_FW $(TARGET_OBJCOPY) -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 \