From patchwork Mon Feb 28 19:08:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1599168 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Xg1Ua9KX; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4K7Dtj5Fbbz9s0r for ; Tue, 1 Mar 2022 22:05:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 899DA83C63; Mon, 28 Feb 2022 20:09:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="Xg1Ua9KX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EF82D83C59; Mon, 28 Feb 2022 20:09:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oo1-xc2d.google.com (mail-oo1-xc2d.google.com [IPv6:2607:f8b0:4864:20::c2d]) (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 9AF8D83B83 for ; Mon, 28 Feb 2022 20:09:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oo1-xc2d.google.com with SMTP id w3-20020a4ac183000000b0031d806bbd7eso4221727oop.13 for ; Mon, 28 Feb 2022 11:09:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fa/9JXiDkZ2lQoBSMKy2lfJn1I3m5R3UmieSYiN4TOY=; b=Xg1Ua9KXCzRjCQhbyEkspTuZGUIO/AZLJONBa+RCm9yCseoX0vCJYd5M9hvZ35bE3D zA38E6T7G39DdEJgVtKsLxFM3jNDn7A+fOUQrpWxKbfH7wDHXjyavZvyIkFty08FA1tt /oOB+DkRN4GMCdbeZyQw3Jq4KFJpzJJalpaCM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Fa/9JXiDkZ2lQoBSMKy2lfJn1I3m5R3UmieSYiN4TOY=; b=FDZ59gW2WJ21apUFLPphqaBRPJRcfHsPTP7UUGfRYU1GV6KjXqWf+NTYGnFE1zRrjn ZzrcUdXsdhbfLkXpS6v4VFx2YCLYI8qNuWdXVwodxJ5IbxXhzn1sE5glPqFNg8fKUXI2 KPZJSaK8QcVOFapZu41qPj3xvLnkG/lJmPzN5/v85SxAEw15yefJ6paUmSHiWIi9EQ1B t6TX2P9srvIEKnrZt5EingDX9pn8mJT1F13mgeHFrxU6UjkS3oDqhigzDP9wqxwJzmd5 bDja9ohmcNeItWsvHL6CNtbsOrIShtiYLbrpW4MjyatYL4A6YTboYmIiaz0E7LimCDdt O44A== X-Gm-Message-State: AOAM532PYhG2yjlOghkapsdjwfEwg1TtVG6MuhXTKo8Dupx4uuVZsab9 hRw4lbtfWJUMcL64nMI0Q1IOth0s1PNKEw== X-Google-Smtp-Source: ABdhPJzKzHcZzsxyJiq4RahV1FxEDVmvirBqryw7P7cxKVEAu03OERXlqXJqtZLIR4+9m2DCZEcu4Q== X-Received: by 2002:a05:6870:14d0:b0:d7:b88:dad0 with SMTP id l16-20020a05687014d000b000d70b88dad0mr5691927oab.116.1646075346854; Mon, 28 Feb 2022 11:09:06 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id f188-20020a4a58c5000000b0031ccb8272f1sm5290577oob.33.2022.02.28.11.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 11:09:06 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jerry Van Baren Subject: [PATCH 06/18] fdt: Correct condition for SEPARATE_BSS Date: Mon, 28 Feb 2022 12:08:23 -0700 Message-Id: <20220228190835.1480772-7-sjg@chromium.org> X-Mailer: git-send-email 2.35.1.574.g5d30c73bfb-goog In-Reply-To: <20220228190835.1480772-1-sjg@chromium.org> References: <20220228190835.1480772-1-sjg@chromium.org> MIME-Version: 1.0 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.5 at phobos.denx.de X-Virus-Status: Clean This may have different settings for SPL and TPL. Correct the condition. Signed-off-by: Simon Glass --- lib/fdtdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 87aa677a4a..086f0c732a 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1227,7 +1227,7 @@ static void *fdt_find_separate(void) #ifdef CONFIG_SPL_BUILD /* FDT is at end of BSS unless it is in a different memory region */ - if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS)) + if (CONFIG_IS_ENABLED(SEPARATE_BSS)) fdt_blob = (ulong *)&_image_binary_end; else fdt_blob = (ulong *)&__bss_end;