public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
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 06/18] fdt: Correct condition for SEPARATE_BSS
Date: Mon, 28 Feb 2022 12:08:23 -0700	[thread overview]
Message-ID: <20220228190835.1480772-7-sjg@chromium.org> (raw)
In-Reply-To: <20220228190835.1480772-1-sjg@chromium.org>

This may have different settings for SPL and TPL. Correct the condition.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 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;
-- 
2.35.1.574.g5d30c73bfb-goog


  parent reply	other threads:[~2022-02-28 19:10 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-28 19:08 [PATCH 00/18] Various bugfixes related to verified boot Simon Glass
2022-02-28 19:08 ` [PATCH 01/18] buildman: Update default config to build for sandbox Simon Glass
2022-04-07 13:50   ` Tom Rini
2022-02-28 19:08 ` [PATCH 02/18] buildman: Fix up cfgutil Simon Glass
2022-02-28 19:08 ` [PATCH 03/18] binman: Correct Chromium OS entry types Simon Glass
2022-02-28 19:08 ` [PATCH 04/18] errno: Avoid including strings in SPL Simon Glass
2022-02-28 19:08 ` [PATCH 05/18] abuf: Correct a corner case with abuf_realloc() Simon Glass
2022-02-28 19:08 ` Simon Glass [this message]
2022-02-28 19:08 ` [PATCH 07/18] fdt: sandbox: Avoid looking for an appended device tree Simon Glass
2022-02-28 19:08 ` [PATCH 08/18] lzma: Tidy up the function prototype Simon Glass
2022-02-28 19:08 ` [PATCH 09/18] cbfs: Add some more definititions Simon Glass
2022-02-28 19:08 ` [PATCH 10/18] cros_ec: Complete the comment for cros_ec_read_batt_charge() Simon Glass
2022-02-28 19:08 ` [PATCH 11/18] spi: Avoid checking console in SPL Simon Glass
2022-02-28 19:08 ` [PATCH 12/18] disk: Correct the conditions for SPL Simon Glass
2022-02-28 19:08 ` [PATCH 13/18] Add a default for TPL_TEXT_BASE Simon Glass
2022-02-28 19:08 ` [PATCH 14/18] Make ASYMMETRIC_KEY_TYPE depend on FIT_SIGNATURE Simon Glass
2022-03-01  4:22   ` AKASHI Takahiro
2022-03-12  2:25     ` Simon Glass
2022-03-14  1:59       ` AKASHI Takahiro
2022-02-28 19:08 ` [PATCH 15/18] stdint: Add a definition of UINT8_MAX Simon Glass
2022-02-28 19:08 ` [PATCH 16/18] dm: core: Add a required struct declaration Simon Glass
2022-02-28 19:08 ` [PATCH 17/18] dm: core: Tidy up comments in uclass headers Simon Glass
2022-02-28 19:08 ` [PATCH 18/18] dm: blk: Expand iteration and add tests Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220228190835.1480772-7-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    --cc=vanbaren@cideas.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox