From patchwork Thu Jul 16 16:14:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 1330380 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=boundarydevices.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=wWUBTyop; 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 4B6zpp4Qfgz9sTS for ; Fri, 17 Jul 2020 02:14:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 747A98AB20; Thu, 16 Jul 2020 16:14:21 +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 QHnYOrmF3V8G; Thu, 16 Jul 2020 16:14:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 44A6F8AAD2; Thu, 16 Jul 2020 16:14:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E0CC41BF311 for ; Thu, 16 Jul 2020 16:14:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DDA0186E7A for ; Thu, 16 Jul 2020 16:14:18 +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 xczR4EmfPckA for ; Thu, 16 Jul 2020 16:14:18 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E89DC86E71 for ; Thu, 16 Jul 2020 16:14:17 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id a6so5652801wmm.0 for ; Thu, 16 Jul 2020 09:14:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wn7ihdfD/w41f+/jnxesAbnkZmT+5U7VbPY/NfdWTsI=; b=wWUBTyopl35/SG8WqWVBCWYE8UkvUHQR7LgC4XzGziGHDyeJ+q+I90j9zRjOlVt9fK N4B8+QOA1WKINJi63D5NjxDM0hmi50r+94mmAilqvc3GDJbvMVa5cBpsSzwzEHmf0Q9B DFu/ZV5xD6SvPB+P8PtbsFXZLrg67uJfWH5Zd1Jrt2kdyBspcTNnhC9aWr3GdX5t6ynY jU/qHLDtVlpvh4FsPVEWgIrT6CyAwr79ERCnmeeDV+QVQzcvvvJx1ReOzvfsSQBgm/YQ v3n1+CcuZVkEnkhhjsZj2TY+rwXDUnKlLoH3NdBvWAaOl/TijbB+cAXtxFs/beVFy6Cu J1eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wn7ihdfD/w41f+/jnxesAbnkZmT+5U7VbPY/NfdWTsI=; b=rtY9rsLq+TEleMwlJ+TGtquuR92ROOrHokvoMYIWMLSlaxEYHU8Ov3Zvv2RluIKT6h D/t0+ff9JBXf6YVMJ05aBPVEoBctcu9JJp23SmItxtIv76r1JWqZk8ASSlopBqI0bKTp evxlqdypiaJ2bfVXziZFT1wJ/dbIVRXE8pSnSYW3zeY0/NckYIuBlaAxgsHaKMCRd8t6 ZiRM00BFxjQxlDlj45fUfaDpqwCsHFkn6+65mPrtne73mdEWFhgxjMga/z+dchpmuScl i0Sh2ffj0CNrnxCDYqb7u1WCLW3WMXxFoGb5WGxyBFfwgAzVXFvj8nkTn1JO8c0uRWxu anxQ== X-Gm-Message-State: AOAM533oU2zCH2AqOup1rVCYP8d4LywV2U/guxDnWpv5RzDOmW3EKPGi V5290GVMMXDpH4KyXloesPsQljB0rbBi7A== X-Google-Smtp-Source: ABdhPJxG5t8iP3M3Amc4x+1Y83DTnrOO2vCvOk1AS5JGA/6gVZS/KllQQ5Qh3gNvAgFKVPizjV8BBQ== X-Received: by 2002:a1c:7717:: with SMTP id t23mr4915290wmi.75.1594916055767; Thu, 16 Jul 2020 09:14:15 -0700 (PDT) Received: from p1g2.home (2a01cb000f89b400891e4d295629adac.ipv6.abo.wanadoo.fr. [2a01:cb00:f89:b400:891e:4d29:5629:adac]) by smtp.gmail.com with ESMTPSA id m9sm8641370wml.45.2020.07.16.09.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2020 09:14:15 -0700 (PDT) From: Gary Bisson To: buildroot@buildroot.org Date: Thu, 16 Jul 2020 18:14:13 +0200 Message-Id: <20200716161413.719361-1-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] package/freescale-imx/firmware-imx: refine vpu and sdma copies 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 , thomas.petazzoni@bootlin.com, stephane.viau@oss.nxp.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" In latest patch the SDMA installation was limited to platforms whose name was mentioned in the binary but this approach wasn't flexible to manage cases like imx8m using imx7 sdma binary, so this patch does: - change VPU/SDMA FW options to string to allow specifying the name (suggested by Thomas) - remove imx27 sdma case as non-existent - add imx8m family support (using imx7d binary) - get rid of FIRMWARE_IMX_PLATFORM_LOWER macro Fixes: fad2df39b9 ("package/freescale-imx/firmware-imx: clarify installation of firmware files") Signed-off-by: Gary Bisson --- package/freescale-imx/firmware-imx/Config.in | 34 ++++++++++--------- .../firmware-imx/firmware-imx.mk | 17 +++------- 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index aae552177f..5becf8b6a9 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -12,23 +12,25 @@ config BR2_PACKAGE_FIRMWARE_IMX if BR2_PACKAGE_FIRMWARE_IMX -config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_SDMA_FW - bool - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 +config BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME + string + default "imx25" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK + default "imx51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 + default "imx53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 + default "imx6q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM + default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN -config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_VPU_FW - bool - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X +config BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME + string + default "imx27" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS + default "imx51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 + default "imx53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 + default "imx6" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q + default "imx8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + default "imx8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_HDMI_FW bool diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index cd299aad5e..434a4ce1df 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -14,8 +14,6 @@ FIRMWARE_IMX_REDISTRIBUTE = NO 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 @@ -106,10 +104,10 @@ endif # SDMA firmware # -ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_SDMA_FW),y) +ifneq ($(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME),) 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 \ + cp -r $(@D)/firmware/sdma/sdma-$(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME)*.bin \ $(TARGET_DIR)/lib/firmware/imx/sdma/ endef endif @@ -118,17 +116,10 @@ endif # VPU firmware # -ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_VPU_FW),y) -# special case for i.MX8X, which uses the same firmware as i.MX8 -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) -FIRMWARE_IMX_VPU_PLATFORM = imx8 -else -FIRMWARE_IMX_VPU_PLATFORM = $(FIRMWARE_IMX_PLATFORM_LOWER) -endif - +ifneq ($(BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME),) define FIRMWARE_IMX_INSTALL_TARGET_VPU_FW mkdir -p $(TARGET_DIR)/lib/firmware/imx/vpu - cp $(@D)/firmware/vpu/vpu_fw_$(FIRMWARE_IMX_VPU_PLATFORM)*.bin \ + cp $(@D)/firmware/vpu/vpu_fw_$(BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME)*.bin \ $(TARGET_DIR)/lib/firmware/imx/vpu/ endef endif