From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6682CC27C76 for ; Sat, 28 Jan 2023 16:04:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9E23B855C5; Sat, 28 Jan 2023 17:04:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="nEIEAlyf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 85A1184954; Sat, 28 Jan 2023 17:04:11 +0100 (CET) Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 139FA8572F for ; Sat, 28 Jan 2023 17:04:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=dario.binacchi@amarulasolutions.com Received: by mail-ej1-x632.google.com with SMTP id qw12so5192050ejc.2 for ; Sat, 28 Jan 2023 08:04:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Q8yV7ssZ0tN0ZEIMos+X0AxznFnm+NpsBcwthxUv/mQ=; b=nEIEAlyfHe07YgrIMeLMhNDA/BiaqvBGsDW5+3DCZe1Xa9LZUZNIi6JhqKAr2lbdcl mx8VR3HLXlViuAFghhIAowSdXQDqGD7WSRy2XN9RAm62kITZ0LZndOAOV7aEBIyOsdvy U2rGorEznO/a1GbcKYZD62oojATbIo7gL27xU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Q8yV7ssZ0tN0ZEIMos+X0AxznFnm+NpsBcwthxUv/mQ=; b=nABEpHEV4Rc36TzTUnaUsAI8Auszzhm/Yqf5aSXOf1lDHPQ1yrjVGth/uGvpWMOfFc e5eKP0zwOnm69riKGGW/cVt5Ae6Ob6AtySazpM74MIBYOWkk8K7KdL1lojfdiNHouFHK mVvAWPsQoebxbl1iguMgJZ/s5pVaj0NvDszTssmDD72XIGCGzmM1pkdXUOq6aOlKX3ZQ EprW5AEnjUtHw0WFD3UTft5PdKMPHHk2jXHEVCDgg2pJAciRyzckgD06kYQFJKO7BUGA fsjcgwvQzVW0JvnhnQ3Qsu7/Epsg1/H7LjbCbHhUETcMOCG+QWKs1yC4c0oTqrUFeOby aYJw== X-Gm-Message-State: AO0yUKUGirhHHORi1UWS/+qBtCgS89Pfs5oE5r47Gkba4yNChgpAVE9q X9hR3mo8bl2fiwyEfXSlolb+uwoHgk0yMsWo X-Google-Smtp-Source: AK7set8E9jeNBRtJIuDV1BRLPwQDbQhJaqSh64zYzbZB9Us+32uoRUuIpOoE5E+qhz2V3wf1eWmNLA== X-Received: by 2002:a17:907:9491:b0:878:5524:e932 with SMTP id dm17-20020a170907949100b008785524e932mr15300857ejc.5.1674921848474; Sat, 28 Jan 2023 08:04:08 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-25-102-201.retail.telecomitalia.it. [79.25.102.201]) by smtp.gmail.com with ESMTPSA id s4-20020a1709062ec400b0087da4172178sm2018401eji.44.2023.01.28.08.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jan 2023 08:04:08 -0800 (PST) From: Dario Binacchi To: u-boot@lists.denx.de Cc: Dario Binacchi , Michael Trimarchi , Adam Ford , Fabio Estevam , "NXP i.MX U-Boot Team" , Stefano Babic , Tom Rini , linux-amarula@amarulasolutions.com Subject: [RESEND PATCH v2] arm: dts: imx8mn-u-boot: fix DDR3 only support Date: Sat, 28 Jan 2023 17:04:04 +0100 Message-Id: <20230128160405.62324-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean In case the CONFIG_IMX8M_LPDDR4 and CONFIG_IMX8M_DDR4 options are both disabled (i. e. BSH boards), binmain fails because DDR4 bin files are missing. Fixes: 93c4c0e4dd1e75 ("arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi") Signed-off-by: Dario Binacchi Reviewed-by: Michael Trimarchi --- Changes in v2: - Fix typos in the commit message (DD3 --> DDR3, DD4 --> DDR4) arch/arm/dts/imx8mn-u-boot.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi index 95f45ad2522d..ec53390afb30 100644 --- a/arch/arm/dts/imx8mn-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-u-boot.dtsi @@ -105,10 +105,11 @@ align-end = <4>; }; +#if defined(CONFIG_IMX8M_LPDDR4) || defined(CONFIG_IMX8M_DDR4) ddr-2d-imem-fw { #ifdef CONFIG_IMX8M_LPDDR4 filename = "lpddr4_pmu_train_2d_imem.bin"; -#elif CONFIG_IMX8M_DDR4 +#else filename = "ddr4_imem_2d.bin"; #endif type = "blob-ext"; @@ -118,12 +119,13 @@ ddr-2d-dmem-fw { #ifdef CONFIG_IMX8M_LPDDR4 filename = "lpddr4_pmu_train_2d_dmem.bin"; -#elif CONFIG_IMX8M_DDR4 +#else filename = "ddr4_dmem_2d.bin"; #endif type = "blob-ext"; align-end = <4>; }; +#endif }; spl { -- 2.32.0