From patchwork Mon Jun 29 08:25:47 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: 1318786 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=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=Zt4TlTqg; 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 49wM0D0xM8z9sQt for ; Mon, 29 Jun 2020 19:00:44 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1272189332; Mon, 29 Jun 2020 09:00:42 +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 tIdmSEQX3-BS; Mon, 29 Jun 2020 09:00:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4D0D889372; Mon, 29 Jun 2020 09:00:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 546E21BF2F6 for ; Mon, 29 Jun 2020 09:00:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4E499221F8 for ; Mon, 29 Jun 2020 09:00:40 +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 ef9hfKtWkHtF for ; Mon, 29 Jun 2020 09:00:38 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60055.outbound.protection.outlook.com [40.107.6.55]) by silver.osuosl.org (Postfix) with ESMTPS id 7EFEB20794 for ; Mon, 29 Jun 2020 09:00:38 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jlIFXKXK8jlu/IhCqDFH5lsy89XppSo17q+c0qn9aUgAoNstRxA0tP7Zdk4ClbcZ6qCTzJt8AX85V76a4ydI9mgaQ2vGIdKDv39vAxOZGZRwiY3eGSBOhsyBUl1+Qm+brij4Gv6GO4qZAe+35iTeBLQVmtbPmjeXNAt+IoFFQS4IRg7kUyUaQlrdl58prQuRC9bVDpLMIKBbx/5ZIVSiP4wCttPisAWJn6TZqDIuWKP59HRSFhC73MZSBdudovlPOAI29HzvmjRFDqustsKooJvjBQBXy0eJBhJUpytjWd42MVGK/Cnl1xxFZ9dG/se1WJnLdeQmyhKMwCbtlF8Imw== 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=fggXQJrLAkKRMQXAEqghdgdLiL07ECI7FEKz+BJDU8c=; b=jcJufCGpf2G4bVA/GwIyShtKu4jBdnkoGKHFycqqJMfZq+VVxAZjjw+O1+vClQm2+ftA5h/RN+ybEu/N0IbbsntmKmD5SY31pq3gIQJHOlztofE209qiLnZCYsgllExm6AnsUlbk4VDfbYbVv+SxN7v/mG+pSAdQSlVBiiO0utvuzJiMBVd2UadY4xE+yQ7xegbd+YRS+/qE9SK6JREO8vGAvaHziIRKUvxsls2EqC0yu6B/py81vEzf/KcKF782t+USpSDJDFmu/pQEOdYgtERJlpBorgdFE68XOlCeJS9Sg0OLP+Bgak/oSVgpw3S3mXE4yEBmK/oblP+kzWf68Q== 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=fggXQJrLAkKRMQXAEqghdgdLiL07ECI7FEKz+BJDU8c=; b=Zt4TlTqgorFLWCdUszClTuP4+gPOLIiRUr7/pcRNMiQi4cgTtpScdqwtMff38vt8tZrcKdTHcD1liM1AddqkS8wgQT5s16JNX97NTJRTNzrc/xULMtZtWNCzmjVrZ0vclLxZsUEmc4eeRpYd+cdn6WDfdmHJu5E2erojLpjv7xA= 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:56 +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:56 +0000 From: Stephane Viau To: buildroot@buildroot.org Date: Mon, 29 Jun 2020 10:25:47 +0200 Message-Id: <1593419148-26821-4-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:55 +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: 188fee7d-c214-41e8-0b84-08d81c060b4b 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:5797; X-Forefront-PRVS: 044968D9E1 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QEPvwXdIEtGGU5B2NmyGxFJ/YEwAe59calgotdCUcndxpelalQLoqye1UVtcODb51RqEnRx2jlx3rWYKjGqnRJ7aCsgFT6RZ2G+nI9RTEiPWbm9Y2o5r3L+/coHmCpz3CHk9sqQoes65TwrAgXuivvGFpryrXCJ4pWM+jbddgqJtiH5gYXawMCBFs96mgc4Q82EpeD3sfFJKtYww/hW+xIpxU1tMb0vQOzpokvhKyMZDo5IVcwWNDVljkcPxNT129Iri/aQjWiH2k1eeLSzKi/Wri7GBJ3EUDNXNbakDx/TtVrPoz2U/cQPau6A4fpddzYWi7bR8bY9LkcFjc5j6UTM4rCCOUR6l4+tpUrnlmbD8vmBpjM+PIXzj5iPr5vVeEMVMMpVmHhC3JWQfbFDmtcMsiBVK29OD+rCV/hKDOtWSwF3R01uzqbiSvRdOtm2f 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)(15866825006); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Xa/vzntnOxKyFO26HdYNbVHjezE4a8gmnEtGSPiw3kxKi01SowzFf7WEqa1KynscLJrXHuj4YqfpySn/UAV1wgRfO4gf+IvCGsGePGxx7kksXNXffmCbT/fxgMxPegu1VFVti9RWMzRXKX/JU3goy17lMV2IRjTmkctvzozY2f0NzO8cPxs2TWHGbNEtMOHKqhmk1tYQmfHG+usH4T27zcan9ls2z+v0aN33+J/H9NcAPTwwXlZm4rXeNLAGftLewicDSr8VkY8bFaoEXH6F3fxRVL1w074EP79b+jNQnImK0rQtiKTHscw/Wd56M8wMLfwJPikhhzCK8ZOlPgqUQeU8kZIRhLpFx4kAt1oQepM3FSLAzye1pfP84HhUM4uhAAAVeG3HWVob23yHgw7NsgSjoqKDkDkm+hvrfqiv1dGQEB6nN1V8koeDVhQAajILLeGH42fTtz0t6dW+mxC5vj/NP2zphTBAKBY9pu4qSKUkoZetC8WR3fEBxRy3S4ubFnCXUPQXiIm0oW7+KiomyS7Z6HiyFlvTLcAXSWo3ekE= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 188fee7d-c214-41e8-0b84-08d81c060b4b 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:56.0412 (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: aLt0LRMPFJ8ZAVe8cFSpDD7gswk2QcQRQAgQza4JHIY18+PKF9osky/ACYjsBzWgJmaPYjc/v5i2FHr2tpygZg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6163 Subject: [Buildroot] [PATCH v2 3/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 --- 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 | 63 ++++++++++++++++------ 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 55ca6fc..d227eb2 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -12,8 +12,6 @@ FIRMWARE_IMX_LICENSE = NXP Semiconductor Software License Agreement FIRMWARE_IMX_LICENSE_FILES = EULA COPYING FIRMWARE_IMX_REDISTRIBUTE = NO -FIRMWARE_IMX_BLOBS = sdma vpu - define FIRMWARE_IMX_EXTRACT_CMDS $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef @@ -72,35 +70,66 @@ 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) +FIRMWARE_IMX_INSTALL_IMAGES = YES -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) +FIRMWARE_IMX_INSTALL_TARGET = YES + +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) +FIRMWARE_IMX_INSTALL_TARGET = YES + +define FIRMWARE_IMX_INSTALL_TARGET_SDMA_FW + mkdir -p $(TARGET_DIR)/lib/firmware/imx + cp -r $(@D)/firmware/vpu $(TARGET_DIR)/lib/firmware +endef +endif + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_VPU_CODA),y) +FIRMWARE_IMX_INSTALL_TARGET = YES + +define FIRMWARE_IMX_INSTALL_TARGET_VPU_FW + mkdir -p $(TARGET_DIR)/lib/firmware/imx + cp -r $(@D)/firmware/vpu $(TARGET_DIR)/lib/firmware +endef +endif + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_VPU_MALONE),y) +FIRMWARE_IMX_INSTALL_TARGET = YES + +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 +endif + +define FIRMWARE_IMX_INSTALL_IMAGES_CMDS + $(FIRMWARE_IMX_PREPARE_DDR_FW) + $(FIRMWARE_IMX_PREPARE_HDMI_FW) +endef + 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; \ - 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 + $(FIRMWARE_IMX_INSTALL_TARGET_EPDC_FW) + $(FIRMWARE_IMX_INSTALL_TARGET_SDMA_FW) + $(FIRMWARE_IMX_INSTALL_TARGET_VPU_FW) endef -endif $(eval $(generic-package))