From patchwork Fri Jul 10 12:00: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: 1326719 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=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=QXAvReX/; 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 4B3BTZ2BMKz9sRN for ; Fri, 10 Jul 2020 22:01:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 059CD2E40A; Fri, 10 Jul 2020 12:01:17 +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 aZfuW6yWXpKi; Fri, 10 Jul 2020 12:01:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8C3442C9C8; Fri, 10 Jul 2020 12:01:10 +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 A8C1E1BF35C for ; Fri, 10 Jul 2020 12:01:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A3C988880F for ; Fri, 10 Jul 2020 12:01:06 +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 YtyAUe67zI3m for ; Fri, 10 Jul 2020 12:01:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80080.outbound.protection.outlook.com [40.107.8.80]) by whitealder.osuosl.org (Postfix) with ESMTPS id 81DAF87C03 for ; Fri, 10 Jul 2020 12:01:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gyS8Y8Vi6qVdi6SxC3tWu0KmNbyEpASbiVvdbldbm2NHtAlCGdaK7hOnoLpLSpC50y/tyKuC2NVnorBi1UcVIv8osm5e5Mgp/75T+5FQv7U+ugNq7cjicJC/M+XakhsYw1EFvR4ox3z6epZNXdsyB2WPbeoDDo/Q0h/AQCjftXy8gSZ7LoQdgdG/KNKeMucdAfdfujgthwEilg3h29Pb6cOfankXKBaWcN6rqCReFQx91LdRXqfcxuVoVBtDyLRnNrSB4LJv+OToqB8k38jw4OGoS8WS1rNaMph+6Ktor3k8IX5mF23dqmrS/PHnhJh/BJUyfuc7hpoQ/nhQX9u28g== 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=EQWBM2M6pSV6Vws5Rx1EhV7HN9M/hCzmrXD1iy2mV+c=; b=FV1lshwQugXLAcmTfyFBoLal199OYa5I3attFiU/mjXD3uZA+z1ToywMLqEwXyDJJFTEpGrBuSVHyWtWY6Ao37cjb5OKcfXTv0rni2I0hUWqC/8/JiKw0ngPgx5DqvBivNdhyGW0SmEP16UWJTGHol/OwRkkdJlpR6g9bgq5WJiCIUTgUDcmrV6RDj/lsqsC/QyERV9CouJK857JrzOdCAlIt5bm9kuPU+rXSgv2wd/cSJzoXfsWAvvnf+rrVDxS5tIIsr0795ndbRwTbwMyp2h2bbIB9H9Ixwau6FHFE/9F7qLVtbptYcUc3S9rnhEpJt5jXy/aaBSibK/F6XnZuA== 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=EQWBM2M6pSV6Vws5Rx1EhV7HN9M/hCzmrXD1iy2mV+c=; b=QXAvReX/3OX8AtQqC1EC8q6iklRK/3/AQV9kW9pXmYgG88snEjdqaFkJpHIGhLWi4+HzZvZEyhXYIrmT6tRnbjtxTIliRL6UMfn9CtBn8EHK8sxAHRo9y8MmzAzObICV+tY837RI76jiuBVH3NnsrtsLyBf4J6tdXcF7usq+MDM= 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:03 +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:03 +0000 From: Stephane Viau To: buildroot@buildroot.org Date: Fri, 10 Jul 2020 14:00:45 +0200 Message-Id: <1594382445-4464-5-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:01:02 +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: 3f913fcb-8951-4e2e-2239-08d824c8eb26 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:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h3GageilP2mHKEYLZOnZl/UVzSmHPSP9woplul6+MrVnvM7ftPo6XAxpD+deaSue5GLvwp9sm+RwjQqFC1TtvvIzb67xywwsojHAMfRzdTNIQrtLatP3jWqhU1+NTKBaKKTBrOh4RgCVwZScf9WWKjOSQd7ociLKRe+3ptmPq/j+xWWNi+nPOToCfHdV5kHceXTPaoR76s/szRk3Rn11J+goxHLA5+Qd6Zd9X/Aj1RiC9TJm8XtsmzYSwF6Zp+z/1SS2yZ5v75mwQ6O4pBphqFp+OIKDiHJV1QIITHNtSZwb+hw5yY04lMnwa0WBSoiKWIo+4zHKmxs8RDj4tlEva2kychfYc4TkX99YKYXAeKf23D0NG0OJMifGygyaW2nelJv6AxNp/ZW0umjRLoHH6jNEA5awsxzSMHIodGLGLADTYeOd79tGF5wdB/F55TWb 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)(15866825006); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: cW3YYiIO7F5xRYJDp4FIOhl4t2R7oljZ995YmEwqs9mr8BIO0PkpInQr7K+DG0n6/xFVlLzwebT/Mu10ZlmM18THDg1mRUCRuWiYv9EhqNF7ka4YciZHHU2URvC9kzfQcGoLDQAXaxAg+uMnadDrH2yKobRNj9lHCzpZHcRNvs7zDUH9x8QEqTioWkStOcTIUWFPLVy/NELFQl+ywUt64OENJfx07sQB9V24uaHHmakYWaajXs56yKVysfKRi92ndZi/cYqKvPmMZ88tv0jb+thy3tAc519LypWYWbWzjLhJjer13GWoS9l+m8igPmvr7uu+0v1NTV/P2B1saeHQTxfN/oXRRc9Dqbhp1SKA6euhQAEyvW9IP2CwE6ZWOqrPhTuRIYZn4hbm8+uvPNYzDvkk/sYShsMEi16uvCnt4N0Job6M5c4Na+0jYS05q/pMACfOykNIXN4quTGPz5yqp7ekycAflicSzoHUoAa2nCPNSj1Ip89Oh0GxACrGKPE09gakWvGUeMVag0ZSRB0hyyg215x9KUWWgBOX9O+C1LI= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f913fcb-8951-4e2e-2239-08d824c8eb26 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:03.2298 (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: NWek7fvVFxRYT2C1prmlYG1el/LyXAF7i2uo874xPsFc7GkWFeUkqWHIAeVdAi4MhiaMUeroWNs1m6lGzcioKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5217 Subject: [Buildroot] [PATCH v3 4/4] package/freescale-imx/firmware-imx: Clean up the image/target semantic 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 newly introduced BR2_PACKAGE_FIRMWARE_IMX_xxx symbols shall be used in lieue of the SoC type when installing images or binaries on target. These new symbols let us define FIRMWARE_IMX_INSTALL_IMAGES_CMDS and FIRMWARE_IMX_INSTALL_TARGET_CMDS based on platform needs rather than SoC type. Suggested-by: Yann E. MORIN Signed-off-by: Stephane Viau --- v3: - Only copy the VPU (and SDMA) blob associated to the platform selected (Gary) - Set FIRMWARE_IMX_INSTALL_IMAGES_CMDS to YES at the beginning (Gary) - Remove FIRMWARE_IMX_INSTALL_TARGET useless default value (make check-package) v2: - Name VPU FW after IP name (Fabio) - Rename symbols using the "_NEED_" in their name (Thomas) - Remove unnecessary comments & move INSTALL_IMAGES down (Thomas) Signed-off-by: Stephane Viau --- package/freescale-imx/firmware-imx/firmware-imx.mk | 61 ++++++++++++++++------ 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index c4ac5f7..ef2923e 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -12,14 +12,15 @@ FIRMWARE_IMX_LICENSE = NXP Semiconductor Software License Agreement FIRMWARE_IMX_LICENSE_FILES = EULA COPYING FIRMWARE_IMX_REDISTRIBUTE = NO -FIRMWARE_IMX_BLOBS = sdma vpu +FIRMWARE_IMX_INSTALL_IMAGES = YES + +FIRMWARE_IMX_PLATFORM_LOWER = $(shell echo $(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) | tr A-Z a-z | head -c 5) define FIRMWARE_IMX_EXTRACT_CMDS $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW),y) -FIRMWARE_IMX_INSTALL_IMAGES = YES ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys @@ -72,35 +73,63 @@ define FIRMWARE_IMX_PREPARE_DDR_FW ln -sf $(BINARIES_DIR)/ddr4_201810_fw.bin $(BINARIES_DIR)/ddr_fw.bin endef endif +endif # IMX_NEEDS_DDR_FW + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_HDMI),y) -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M),y) define FIRMWARE_IMX_PREPARE_HDMI_FW cp $(@D)/firmware/hdmi/cadence/signed_hdmi_imx8m.bin \ $(BINARIES_DIR)/signed_hdmi_imx8m.bin endef endif -define FIRMWARE_IMX_INSTALL_IMAGES_CMDS - $(FIRMWARE_IMX_PREPARE_DDR_FW) - $(FIRMWARE_IMX_PREPARE_HDMI_FW) +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_EPDC),y) + +define FIRMWARE_IMX_INSTALL_TARGET_EPDC_FW + mkdir -p $(TARGET_DIR)/lib/firmware/imx + cp -r $(@D)/firmware/epdc $(TARGET_DIR)/lib/firmware/imx + mv $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted \ + $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw endef -else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) -define FIRMWARE_IMX_INSTALL_TARGET_CMDS +endif + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_SDMA),y) + +define FIRMWARE_IMX_INSTALL_TARGET_SDMA_FW + mkdir -p $(TARGET_DIR)/lib/firmware/imx/sdma + cp -r $(@D)/firmware/sdma/sdma-$(FIRMWARE_IMX_PLATFORM_LOWER)*.bin \ + $(TARGET_DIR)/lib/firmware/imx/sdma/ +endef +endif + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_VPU),y) + +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) +define FIRMWARE_IMX_INSTALL_TARGET_VPU_FW $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_dec.bin \ $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_dec.bin $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_enc.bin \ $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_enc.bin endef + else -define FIRMWARE_IMX_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware/imx - for blobdir in $(FIRMWARE_IMX_BLOBS); do \ - cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware/imx; \ - done - cp -r $(@D)/firmware/epdc $(TARGET_DIR)/lib/firmware/imx - mv $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted \ - $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw +define FIRMWARE_IMX_INSTALL_TARGET_VPU_FW + mkdir -p $(TARGET_DIR)/lib/firmware/imx/vpu + cp $(@D)/firmware/vpu/vpu_fw_$(FIRMWARE_IMX_PLATFORM_LOWER)*.bin \ + $(TARGET_DIR)/lib/firmware/imx/vpu/ endef endif +endif + +define FIRMWARE_IMX_INSTALL_IMAGES_CMDS + $(FIRMWARE_IMX_PREPARE_DDR_FW) + $(FIRMWARE_IMX_PREPARE_HDMI_FW) +endef + +define FIRMWARE_IMX_INSTALL_TARGET_CMDS + $(FIRMWARE_IMX_INSTALL_TARGET_EPDC_FW) + $(FIRMWARE_IMX_INSTALL_TARGET_SDMA_FW) + $(FIRMWARE_IMX_INSTALL_TARGET_VPU_FW) +endef $(eval $(generic-package))