diff options
| author | Tom Rini <[email protected]> | 2026-02-10 15:55:48 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-02-10 15:55:48 -0600 |
| commit | cff4387c813216080aa16b978f57ab4823e15f4d (patch) | |
| tree | f3213cf64d25510b327a96839b6e32777c4b1891 | |
| parent | 6f7fe31bf6d934f0240da74f06a5b42689a2ac7f (diff) | |
| parent | 03d2d5fc003f355515e202c14aee8cc543b730e4 (diff) | |
Merge patch series "env: Provide another work-around for unquoting fdtfile"
This series from Vagrant Cascadian <[email protected]> provides a
way for plain text environments to avoid having extraneous quotes in how
they use CONFIG_DEFAULT_FDT_FILE.
Link: https://lore.kernel.org/r/[email protected]
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | board/sifive/unmatched/unmatched.env | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -2138,6 +2138,7 @@ quiet_cmd_gen_envp = ENVP $@ -D__ASSEMBLY__ \ -D__UBOOT_CONFIG__ \ -DDEFAULT_DEVICE_TREE=$(subst ",,$(CONFIG_DEFAULT_DEVICE_TREE)) \ + -DDEFAULT_FDT_FILE=$(subst ",,$(CONFIG_DEFAULT_FDT_FILE)) \ -I . -I include -I $(srctree)/include \ -include linux/kconfig.h -include include/config.h \ -I$(srctree)/arch/$(ARCH)/include \ diff --git a/board/sifive/unmatched/unmatched.env b/board/sifive/unmatched/unmatched.env index 34425dc9efa..f309229481b 100644 --- a/board/sifive/unmatched/unmatched.env +++ b/board/sifive/unmatched/unmatched.env @@ -16,4 +16,4 @@ partitions= name=loader1,start=17K,size=1M,type=${type_guid_gpt_loader1}; name=loader2,size=4MB,type=${type_guid_gpt_loader2}; name=system,size=-,bootable,type=${type_guid_gpt_system}; -fdtfile=CONFIG_DEFAULT_FDT_FILE +fdtfile=DEFAULT_FDT_FILE |