From patchwork Wed Jun 24 15:23:48 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: 1316321 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=WQw/NDCE; 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 49sS4B4nngz9s1x for ; Thu, 25 Jun 2020 01:39:04 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 560C887897; Wed, 24 Jun 2020 15:39:00 +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 uvpNGsBPckVX; Wed, 24 Jun 2020 15:38:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8228F877E8; Wed, 24 Jun 2020 15:38:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id BFBF61BF369 for ; Wed, 24 Jun 2020 15:38:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BBECB882F8 for ; Wed, 24 Jun 2020 15:38:57 +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 HHJwvrbMelhn for ; Wed, 24 Jun 2020 15:38:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2072.outbound.protection.outlook.com [40.107.20.72]) by hemlock.osuosl.org (Postfix) with ESMTPS id 300C0882F2 for ; Wed, 24 Jun 2020 15:38:56 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Iac/WjIHXBkGOLDE+W/duzwGWu/xdOHZGKJiWbyGAnSLIjmcGhIKAhGs9+Qu3HSsJFekDLzrOgzXIUv37gWm2NrLVgSLfApSXxS8GvpAYIWTsZTSxH1H/XZNXyd/gsqcHOMrAbzWiV9GDzWcZWYLzSfiitgoXmfKSGweI2gDWBj/yqCGgFzIWuWp+nQ9xyevFQKyvjA58AcNJf06Oz6IJ9n0VR6HK3yHjjL3TZSNwNQ2Mfik+qrYwcbXgazDrOh6/Cx6ZRj2MbNNjvelAhDN8LblTT+55enqzIO39c3sx58Vdv0xUm0aRkY3+C41V6E7e6qNpxyg9BhoCazzqY0yWA== 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=1tBwqoS4q4obV94dzVjzFC++xS+YAGEJIHiAInVBGrg=; b=FYWy95P7HMjIL48lEAfWbBcdBew7DYfWz3UUeSY+iPJAPacVTJJuj1GLi+vtFDDFCYulj52mp0DF6pHs5iZr0u0p3MQi4PzUoMOdVIVYcl5Eh+YtFGFB6Y9mS3wJrS2Le2R/Zt2uXt07lPSEBtcCdTJ2gpaMnnyiQQp8ZUhP2i+HMXbN9a6dIvCGnaCGHwwGNVghvnsGjd03HnVrzs/PLps+FXhfcrzsJWzPwqgCrhWv2MAWTdRZX2rcHWO71B7zSHa7gdH85++qRGD2rjEbQNU1woj4Wp57jD9Hf/fudDJXA6Hq1mNpXQIOrq67LXbQZB2A/w1mms1eBa9qFe54Mw== 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=1tBwqoS4q4obV94dzVjzFC++xS+YAGEJIHiAInVBGrg=; b=WQw/NDCEDmzAOedfJkDJNzfTTRlTfZEjSKE38N/J8JkfCKSo6YyeiIUxvJp+YXrEKotBAHo7HmuYkhd8rd/7gkRXTYJ5EF5BMw9yXV1wnkl3F+TfYz/0a0XUtDiE8QWqM1YcS+ak9yu03jaovav5QgxQpow1VAi3DYXz3QCvchc= 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 AM0PR04MB7188.eurprd04.prod.outlook.com (2603:10a6:208:192::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.21; Wed, 24 Jun 2020 15:23:59 +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.021; Wed, 24 Jun 2020 15:23:59 +0000 From: Stephane Viau To: buildroot@buildroot.org Date: Wed, 24 Jun 2020 17:23:48 +0200 Message-Id: <1593012228-18959-3-git-send-email-stephane.viau@oss.nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1593012228-18959-1-git-send-email-stephane.viau@oss.nxp.com> References: <1593012228-18959-1-git-send-email-stephane.viau@oss.nxp.com> X-ClientProxiedBy: AM0PR10CA0041.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::21) 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 AM0PR10CA0041.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3131.21 via Frontend Transport; Wed, 24 Jun 2020 15:23:58 +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: fada23fd-8922-41c5-eef6-08d818529e43 X-MS-TrafficTypeDiagnostic: AM0PR04MB7188: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-Forefront-PRVS: 0444EB1997 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1CTWB19e25kh3p/QWJfK437GN5LKzL3OMGehChIATLAs8hpAtFy9MszUNwzsIYDYiE9dyxRSracbmeq1WS+jlBRo3qZdL2hjlolS7wCfMTlHfJ5tUF40c6i9nCbaU7QizVe9CnKHYHND/RQ9GO5yed1YVxio7E9dHBCVcWiwDiz+EYX/P7bEF1oxDbU0RqeGzeOdxu4xkGgwoPBYyVALRb/Ai0jwKmMoloyWA8yQRyn8Fy46pn5Tb3JGtnkt6N2Z3Xr3pYnsCxlf34ryKrBf3F7KvF1SC3OtMy+bn1ygbyeSzddU+1LHT5aQYNrTgXxyPdQgpc0Ot6bAvgVXpM85BkhtU63SwkuhmEukPNgg8mIJwtDkhNHy149a6rCTkd9yjhk0fD7RvDe6BPCNZGjFe2MLDyix33k59Z/HCf5AyAPDtexGBWCYjc/rmb9oQO89 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)(396003)(136003)(366004)(376002)(346002)(39860400002)(186003)(86362001)(16526019)(6486002)(8936002)(5660300002)(54906003)(44832011)(69590400007)(6916009)(6666004)(4326008)(66476007)(66556008)(52116002)(83380400001)(66946007)(316002)(478600001)(2616005)(2906002)(8676002)(6512007)(6506007)(21314003)(15866825006); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Zl6e8CJM+9kTspnncEnZV/uO6FoYdhgSpIjrzSfB95zjB0RacV4N3a1vFUYRP/X2rdA3xmsmKydVRmgE2ylLzL4NqnfS0O5BRP7E9WdSwLlV9+4GdD2j7vK2hj/mQ1kc/UNIsadmc63Lqry2IxpAcJjddQbK9Y/dYIo3IGs4R44iFphNPlKy6FxLd2PalTxZ9z8nhcqK1xmln0u0OJiU15QhPK/bIQlhw89dzCmDYRTu4Mo+wyFqOr4dhHa7n+mVz1BYvyWvlP6gG988MyWH5mMWwfcChvpRJRwNB4ybCtCg/FpuKJCzNP2RGHdQTnY7W+5aUndmdev1yoh2DM7WXFzqDI0f1gOKFIQaHntjzKOSch1azBMe8uOhEx600XkFsSmVaneSQturDA4Rs3EHynmrUf6OlKRlnTh9iuznEnMGvU7eFP5zTB0kayiO1eNWz5jjVVl70uSTBfVm4mtnt6voiF2KpURAsipN7P1q2gk848ElsC/5JYzcvn23e9L32IlwBiQjIPJaSaw5J0XM8i6eAEXXw5ckDS57HbafCmRCz5Vh2nyQCL5KLTbsRQRj X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fada23fd-8922-41c5-eef6-08d818529e43 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4786.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2020 15:23:59.7220 (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: QWvvuM8JSEaoflq3zGiIYYu6aFNFTOlPwwn8awSkJ1/aExk45T9HWSj0rhZUx3DKFQX68N/acCDITF5swanM5A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB7188 Subject: [Buildroot] [PATCH 2/2] 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 , Refik Tuzakli , Stephane Viau , "Yann E . MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The newly introduced BR2_PACKAGE_FREESCALE_IMX_NEED_xxx_FW 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 Reviewed-by: Fabio Estevam --- package/freescale-imx/firmware-imx/firmware-imx.mk | 70 +++++++++++++++++----- 1 file changed, 54 insertions(+), 16 deletions(-) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 6beacc0..62f97e6 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -12,12 +12,13 @@ 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 +# firmware-imx install images section: +###################################### + ifeq ($(BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW),y) FIRMWARE_IMX_INSTALL_IMAGES = YES @@ -71,36 +72,73 @@ define FIRMWARE_IMX_PREPARE_DDR_FW $(BINARIES_DIR)/ddr4_201810_fw.bin ln -sf $(BINARIES_DIR)/ddr4_201810_fw.bin $(BINARIES_DIR)/ddr_fw.bin endef -endif +endif # DDRFW_LPDDR4 || DDRFW_DDR4 +endif # NEED_DDR_FW + +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_NEED_HDMI_FW),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 +endif # NEED_HDMI_FW define FIRMWARE_IMX_INSTALL_IMAGES_CMDS $(FIRMWARE_IMX_PREPARE_DDR_FW) $(FIRMWARE_IMX_PREPARE_HDMI_FW) endef -else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) -define FIRMWARE_IMX_INSTALL_TARGET_CMDS + +# firmware-imx install target section: +###################################### + +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_NEED_EPDC_FW),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 +endif # NEED_EPDC_FW + +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_NEED_SDMA_FW),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 # NEED_SDMA_FW + +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_NEED_VPU_FW),y) +FIRMWARE_IMX_INSTALL_TARGET = YES + +ifeq ($(BR2_PACKAGE_FIRMWARE_VPUFW_GENERIC),y) + +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_VPUFW_IMX8),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 + +endif +endif # NEED_VPU_FW + 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))