From patchwork Mon Jun 29 08:25:45 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: 1318785 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.137; helo=fraxinus.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=HS/Lfx6a; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49wLyR3lkFz9sQt for ; Mon, 29 Jun 2020 18:59:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0DDE987577; Mon, 29 Jun 2020 08:59:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IVuKvZ5xRNtT; Mon, 29 Jun 2020 08:59:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 14C8F87592; Mon, 29 Jun 2020 08:59:08 +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 15D981BF20D for ; Mon, 29 Jun 2020 08:59:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1139A87DA2 for ; Mon, 29 Jun 2020 08:59:07 +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 9UxwYOFbgWML for ; Mon, 29 Jun 2020 08:59:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2071.outbound.protection.outlook.com [40.107.21.71]) by whitealder.osuosl.org (Postfix) with ESMTPS id C3558868D8 for ; Mon, 29 Jun 2020 08:59:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nrEL+noN883T5uptcRRV52Lxt9nDIWT/wLJg8Wcdw4LfOSXl18hvGiGWrotLVnPLlkrTCx6Ywf1VLKOFHbm5D2DRBB0MWgMhUFW/O2hPx2p8GJYDEB+qqCI5XquiffkmMRxp5NuzRM8+dMG0xxFaYVzvdyYykqjHRGHNDFfRDsw+LkdzUYjNDpmG1xp71BCFsBiJWPBlIhmJJUPy0C0gBYkPy6Pn9Q8vJJUGokxQl+vEyZulIKKGUjLHMcRmeSoiEbcGTnVZ2pv6YsXWeII/mz4M+m8vU2gOGqRNNZt5PrXb6eeEgqu/4P2SFSBHFOiIrqrtfJ8V0NbCTFy4C9gsAg== 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=bzZ5VTdFHQNCI57zGnNuIRAxAhxRyAD/UhWo0s15gjs=; b=QUIU/PAuXpHnFeiXVljJeKNdJqWWnsJHMXyJeDnLfE8+AS0fwR5VXq+I5CoKvqaKC4OgAqYFNtY13XOtNTbl+C6Rf2oCwXHZ7txOEid/XSWxfrKwwKiizqcc/ki87tbXE5LTivDDxDYOAvNfd7SDQi7EFijzcPyYiiQoHlyyiwIqg2ymt1/CRodHk7vg0slzq6NOakaqfw1TA3/TmUlQ1rbYjI6VEINVQG6tPEYyVDJsWzXz67x82D5ukGLVgYUIMNQ5VU+HcpCCyza452jxEKxYkZICAYqAUche2GE5ZBEwel49HivI/ix0l+kq16mVa1OtjT3LPr3Lq0WL9ZZ4gA== 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=bzZ5VTdFHQNCI57zGnNuIRAxAhxRyAD/UhWo0s15gjs=; b=HS/Lfx6aS52zwNulbLQpsZqOFSBuOfETk2nDl7FdnyrfhbqB1AM/2t+Fs9mIWv+SDHt41JAMC219RDTpyafFWJ4QpIZ8pQoHm54J7ek8MoA6ZVl4oZVkINiB/GP5mBp0bjW5OFl2DzU0IwvcPGncAE9lBCndPgXUWWJTEwElvI0= 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 AM0PR04MB6163.eurprd04.prod.outlook.com (2603:10a6:208:13f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.21; Mon, 29 Jun 2020 08:25:54 +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.3131.026; Mon, 29 Jun 2020 08:25:54 +0000 From: Stephane Viau To: buildroot@buildroot.org Date: Mon, 29 Jun 2020 10:25:45 +0200 Message-Id: <1593419148-26821-2-git-send-email-stephane.viau@oss.nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1593419148-26821-1-git-send-email-stephane.viau@oss.nxp.com> References: <1593419148-26821-1-git-send-email-stephane.viau@oss.nxp.com> X-ClientProxiedBy: AM0PR10CA0030.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::40) 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 AM0PR10CA0030.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3131.21 via Frontend Transport; Mon, 29 Jun 2020 08:25:53 +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: 9e623abd-7cca-4552-4cc6-08d81c060a0e X-MS-TrafficTypeDiagnostic: AM0PR04MB6163: 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-Forefront-PRVS: 044968D9E1 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O1dS2RfjSJ8hdesvRG4Rgncu1kae+GJWGN9xab6Z7voTR7N9js6307BC3CkIfXmB+epoTcNKvR4C4wuWG1WfnvrhF19QAXzXjQ+A2y8XGQPXHGa5BlHg3DDRAxKOuU4y+gCrwSrArS+T8UK9+bsxgp74VhtnQQFJK2yXx7CodJELU54mZI7ne3NAJmVMxohaDYMtJVCAs3uY1hpFkKi4pih9jAxT8xa8pAsiHXUmP+xU7LyJlQSC4eyP2qZhic7eo2G4IIZ7+SbCX1jCtvEVpb8AgApj84XcFsUXK/dlwzzS09EKlf+O+vua8AdCzze6UX5X8fnFm5UrvGKX2Y4BjrLMvXcdAdN/NExH92S9botiZpw7/InUmd4DhPoJD/WVuP1Drx4z+jrbbsDBC9txAQ== 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)(39860400002)(346002)(376002)(366004)(136003)(396003)(52116002)(8936002)(6666004)(6512007)(6506007)(66476007)(66946007)(8676002)(4326008)(316002)(16526019)(54906003)(83380400001)(186003)(66556008)(69590400007)(86362001)(478600001)(2616005)(2906002)(44832011)(6916009)(5660300002)(6486002)(21314003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: HV0j/CY3n6fF4eS8EAn9uwGMLVov+wAghKDwMxqSFWHtXt/2xwSiaGAXr60ZUqbcUgGcdcjg3scvVFq+Mx/eDrYb9RBTCWsO9qw9RPOGlm0NSaznRXxOQRMWd27Kp2lqSa9kKT3a1Yfrc0+qXKixRClVjsg2ww61TQZHWo7/VTiJHnl6a/FvaMSo+httyLgOKaWnByohfA1xMRdY2/mdG62+8dt9rqXH3BphXF+ZYdczZfBW1i3JDsRKSHZ0VqVkNcRLrYkMsPP6PQhtmjYnaBnkrT8UXLKBOUIrOIvPqtg/9MchIk8vpFK/jK1s/qmNL8gWmAvRwyKS17cqLMSZbg8R0AfXqN/4vc4LU95+pYtrCjHHgUBwTs6wZkpjF/g2ZsD7kHQZx7pGFeqD93l03Mbed6nU+DzgqJhjx2nI6LEod+ikwmQswZuKw2uzuHLvp8zVMHc7TX6ZJr0ABVlevudOdROOhe5nf9eytIlVIX4cDXGn2OEYLW3wN7OI3vl1u1JKQHMGY1wbSzOKrzF+Mb++z/sz7hH1KfxqRhvwx9Y= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e623abd-7cca-4552-4cc6-08d81c060a0e X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4786.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2020 08:25:54.0114 (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: CIPyoeRtq/G867JxYpUfQObfFrOMsqYhJeldkkVcJk99q4nQQQ4zS6UlwCKou8RwNYLslNHAe9JmA4QYZGJ+2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6163 Subject: [Buildroot] [PATCH v2 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 --- 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..d6310e6 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 + depends on BR2_PACKAGE_FIRMWARE_IMX + 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 + +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 \