diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-23 08:06:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-23 08:06:28 -0400 |
| commit | 9bb99fa95826d1a608737ca821977b4136a1a278 (patch) | |
| tree | 264c39d01f071f308b3b7f8bc88b20cb09681653 /lib | |
| parent | faeb5641131ba0bfafa5ed61dd03b98b1f2a5edb (diff) | |
| parent | a609353e82fd757b7635d18ed6a0828fff657d59 (diff) | |
Merge branch '2022-04-22-assorted-updates'
- Add "-q" to fdt addr and use it in distro_bootcmd to make the user
experience less scary reading in normal try/fail cases.
- Let the adc update an environment variable like many other commands do
- Fix TPL SEPARATE_BSS check when locating DTB
- Allow ":" in PXE file names again
- Two Apple M1 fixes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fdtdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 0c0ec034ec8..e2208cb7d7a 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1230,7 +1230,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 (CONFIG_IS_ENABLED(SEPARATE_BSS)) + if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS)) fdt_blob = (ulong *)&_image_binary_end; else fdt_blob = (ulong *)&__bss_end; |