From patchwork Fri Apr 30 16:41:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Hardin X-Patchwork-Id: 1472400 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=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=V/vUZZJ/; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FWynz1662z9sXN for ; Sat, 1 May 2021 02:42:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0F45541A79; Fri, 30 Apr 2021 16:42:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id h0_-Tknrh7bt; Fri, 30 Apr 2021 16:42:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 2245541A7C; Fri, 30 Apr 2021 16:42:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id EA6AA1BF27A for ; Fri, 30 Apr 2021 16:42:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D987384B4E for ; Fri, 30 Apr 2021 16:42:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q8HlZb0FYygA for ; Fri, 30 Apr 2021 16:42:05 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) by smtp1.osuosl.org (Postfix) with ESMTPS id AEAB084B18 for ; Fri, 30 Apr 2021 16:42:05 +0000 (UTC) Received: by mail-qk1-x72b.google.com with SMTP id v23so19273831qkj.13 for ; Fri, 30 Apr 2021 09:42:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CieEhj9GA/+B3gjL0jDRPWAfuK2l3/2ks6eoVTn6GPU=; b=V/vUZZJ/56r2qMMQtgJRQ/Z9L8pSo6lMu+lqjnZ9sr6UFRqAdtwyJP51FgUHI3+PJQ R/EpM2EEMUIhhG/gmGYB5Q9pUCMhiQxrrYXZt8RA6OPkNTT13gL8QfXPjuZxXXbygcOB 58hXn+FW3Yk7p3PlzGE6MlXfcwbPvYAJ0D6P8bTQdC1GrS6VwwXW/9UUIyLRwZLQm6Sl 4XbfytnNsy+66IdZXGd0u78WlJjlsRk0wzxSS3fc+/tP+yC0Ttm8LJXvup56+gPuf3Er dKiYVCSjfrY1xYayQTRTLnShofqa0eLYaGQhWKhdpeTL6q4o/sgixAuqjK6dmX8s0o9B F3WA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=CieEhj9GA/+B3gjL0jDRPWAfuK2l3/2ks6eoVTn6GPU=; b=kPjXXD01QuAcniykTu4CuD+zjVbpZ3sgkK9KOYJQy+9z94GPZsMMMhexfhGO/YBSI9 n5tjfSIJmMGddv1Glm/zBjWbjwFx9skdmmflGZbsPZBjtSlF8x7nwDJo+zTl/75sgb7Q 7EaQbTZW0V3MbByRRNv68jDTXkY/AamtFWO9y0WVFMIXZU5BIoa+VfWs5sooUBc/W4R9 39vUe6qUI4OIU9XUveufAVPt/U0M3+r02yQdR9csfAkOZs5YlZ+MruGHU2+abZV/oUYn lQD/b/uk1Eq1DYvDYJAqGhIN5E8qQobo+Cbp4AfShAZj10W/Y70b0CeNOIprfRr/HYxC ZuXg== X-Gm-Message-State: AOAM531poRgkmn12TIZC5o0tKlO5zX3S8Acrg/Uzcw/OnpJGhyVJt18g i5miXzZwy0Nu2hv42S2txQb3iWc8/8q6MpbR X-Google-Smtp-Source: ABdhPJxdvXMDNk6AzZDNzLuQ/0niRtqygOsYGi6pxdv1EiLsAVfWfuXwLGWAS4QSboeAg7E4jI7GPg== X-Received: by 2002:a05:620a:89d:: with SMTP id b29mr6647667qka.231.1619800923948; Fri, 30 Apr 2021 09:42:03 -0700 (PDT) Received: from purgatory.attlocal.net (108-193-1-150.lightspeed.sntcca.sbcglobal.net. [108.193.1.150]) by smtp.gmail.com with ESMTPSA id a27sm1375688qtd.77.2021.04.30.09.42.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 09:42:03 -0700 (PDT) From: Charles Hardin X-Google-Original-From: Charles Hardin To: buildroot@buildroot.org Date: Fri, 30 Apr 2021 09:41:47 -0700 Message-Id: <20210430164147.99742-1-charles.hardin@chargepoint.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20210428034036.15461-1-charles.hardin@chargepoint.com> References: <20210428034036.15461-1-charles.hardin@chargepoint.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] package/imx-seco: use the c0 revision for the imx8qxp ahab image 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 , Charles Hardin , Gilles Talis , Refik Tuzakli , Julien Olivain , stephane.viau@oss.nxp.com, Maeva Manuel Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Charles Hardin Update the selection of the ahab container image to use based upon a choice in the Config.in - there are multiple ASIC revisions that use AHAB and the firmware images need to match. This extends the support beyond a default image for just the imx8 amd imx8x based upon the current contents of the imx-seco firmware extraction. Files from 3.7.4: mx8dxla0-ahab-container.img mx8dxla1-ahab-container.img mx8qmb0-ahab-container.img mx8qxb0-ahab-container.img mx8qxc0-ahab-container.img Signed-off-by: Charles Hardin --- Changes v1 -> v2: - convert the image selection to a choice in Config.in (suggested by Stephane) --- package/freescale-imx/imx-seco/Config.in | 38 ++++++++++++++++++++++ package/freescale-imx/imx-seco/imx-seco.mk | 14 ++++---- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/package/freescale-imx/imx-seco/Config.in b/package/freescale-imx/imx-seco/Config.in index 1877664a0c..e5d835f8b1 100644 --- a/package/freescale-imx/imx-seco/Config.in +++ b/package/freescale-imx/imx-seco/Config.in @@ -7,3 +7,41 @@ config BR2_PACKAGE_IMX_SECO This library is provided by Freescale as-is and doesn't have an upstream. + +if BR2_PACKAGE_IMX_SECO +choice + prompt "i.MX Seco Firmware Release" + help + Select the appropriate ahab container image to install + to match the asics revision. + +config BR2_PACKAGE_IMX_SECO_MX8DXLA0 + bool "imx-seco-mx8dxla0" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + +config BR2_PACKAGE_IMX_SECO_MX8DXLA1 + bool "imx-seco-mx8dxla1" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + +config BR2_PACKAGE_IMX_SECO_MX8QMB0 + bool "imx-seco-mx8qmb0" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + +config BR2_PACKAGE_IMX_SECO_MX8QXB0 + bool "imx-seco-mx8qxb0" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + +config BR2_PACKAGE_IMX_SECO_MX8QXC0 + bool "imx-seco-mx8qxc0" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X +endchoice + +config BR2_PACKAGE_IMX_SECO_AHAB_CONTAINER_IMAGE + string + default "mx8dxla0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8DXLA0 + default "mx8dxla1-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8DXLA1 + default "mx8qmb0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8QMB0 + default "mx8qxb0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8QXB0 + default "mx8qxc0-ahab-container.img" if BR2_PACKAGE_IMX_SECO_MX8QXC0 + +endif diff --git a/package/freescale-imx/imx-seco/imx-seco.mk b/package/freescale-imx/imx-seco/imx-seco.mk index 245c3e3311..b1a38b5943 100644 --- a/package/freescale-imx/imx-seco/imx-seco.mk +++ b/package/freescale-imx/imx-seco/imx-seco.mk @@ -18,18 +18,16 @@ endef IMX_SECO_INSTALL_IMAGES = YES +IMX_SECO_AHAB_CONTAINER_IMAGE = $(call qstrip,$(BR2_PACKAGE_IMX_SECO_AHAB_CONTAINER_IMAGE)) +ifeq ($(IMX_SECO_AHAB_CONTAINER_IMAGE),) +$(error No iMX Seco AHAB Container Image file specified) +endif + # SECO firmware is needed when generating imx8-boot-sd.bin which # is done in post-image script. -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) -define IMX_SECO_INSTALL_IMAGES_CMDS - cp $(@D)/firmware/seco/mx8qxb0-ahab-container.img \ - $(BINARIES_DIR)/ahab-container.img -endef -else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y) define IMX_SECO_INSTALL_IMAGES_CMDS - cp $(@D)/firmware/seco/mx8qmb0-ahab-container.img \ + cp $(@D)/firmware/seco/$(IMX_SECO_AHAB_CONTAINER_IMAGE) \ $(BINARIES_DIR)/ahab-container.img endef -endif $(eval $(generic-package))