Message ID | 20220228141657.1388834-4-sjg@chromium.org |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=Rc5T9tZV; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K6jDw0DRMz9sFn for <incoming@patchwork.ozlabs.org>; Tue, 1 Mar 2022 01:19:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 72F0E83BCC; Mon, 28 Feb 2022 15:19:24 +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="Rc5T9tZV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BF54C83C32; Mon, 28 Feb 2022 15:18:15 +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-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) (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 4797083C80 for <u-boot@lists.denx.de>; Mon, 28 Feb 2022 15:17:59 +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-oi1-x22a.google.com with SMTP id y7so13312773oih.5 for <u-boot@lists.denx.de>; Mon, 28 Feb 2022 06:17:59 -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=H/GgdB/qsiAr/gN7nFU6c7OLXDDtmploBqFO6h+i/z0=; b=Rc5T9tZVKDU3CcDbprTZxA41QhZoV+8PnTa7/gNl6s9LUn+zWO1ACRGJ0rJjQCZaZP vNAhnlbJ0ZsZf4U/UNCUb/DgWf1oM2hzt3fnBdRZ7OA9ORrFb7NJQYvHP9mLxyJ+6KX6 e2aALhqdjdGXISXnbYgPHqkVbzOd5tqVIY4Dk= 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=H/GgdB/qsiAr/gN7nFU6c7OLXDDtmploBqFO6h+i/z0=; b=cVTrN+joRNHpniktCHLdsw/FX0oojuJz4ZPkFpxTOyHA3yWcEB3CKvHWW6klUQqZkL 2YEJMCTf0oJ8+5gR1jlqAGdt7gqe8F2ENFdMIiSBAGuFvfjbMul2pzctIdapWMkyrXW4 l3m3xSZqiFVkPQ31j24uuzYSwK9XsxoHPwFi/1BZr3kucGY/x4F/DaZPgdbOOfGKuHpD TJmyuqqmZbqAkL8kS3dI/oZU0pQdC0giqFuoXo8nus7+/XwkVddSF3wcvJkHuYtY6z4t id603bketcSlUlPJXtH4fNmvaGQTEaFPbHI8wd4ZFX/CNUIoHD8uqxC3snnJJi66cZfo zumw== X-Gm-Message-State: AOAM532Gr6lsC5uqUSUh4o/C2S6RcKIfZqbfS+kKYwlMsDV9rMv1rgwx n3A6YuHPVVyMoTW+cpTrfbj5rHxIKUenAQ== X-Google-Smtp-Source: ABdhPJyks/QmjTbSA35lpryxUk6JaYbz6CyAJQ5vTn9gEBaqCqiARHRBdnWkifKphHjdE0znSlWB7Q== X-Received: by 2002:a05:6808:1304:b0:2d5:4170:e084 with SMTP id y4-20020a056808130400b002d54170e084mr8753992oiv.19.1646057877447; Mon, 28 Feb 2022 06:17:57 -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 y28-20020a4aea3c000000b0031c0cddfbf9sm4905966ood.20.2022.02.28.06.17.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 06:17:57 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Jerry Van Baren <vanbaren@cideas.com> Subject: [PATCH v7 10/15] fdt: Correct condition for SEPARATE_BSS Date: Mon, 28 Feb 2022 07:16:52 -0700 Message-Id: <20220228141657.1388834-4-sjg@chromium.org> X-Mailer: git-send-email 2.35.1.574.g5d30c73bfb-goog In-Reply-To: <20220228141657.1388834-1-sjg@chromium.org> References: <20220228141657.1388834-1-sjg@chromium.org> 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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean |
Series |
vpl: Introduce a verifying program loader
|
expand
|
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;
This may have different settings for SPL and TPL. Correct the condition. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v7: - Add new patch to correct condition for SEPARATE_BSS lib/fdtdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)