diff options
| author | Tom Rini <[email protected]> | 2022-04-23 08:06:28 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-04-23 08:06:28 -0400 |
| commit | 9bb99fa95826d1a608737ca821977b4136a1a278 (patch) | |
| tree | 264c39d01f071f308b3b7f8bc88b20cb09681653 /include | |
| 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 'include')
| -rw-r--r-- | include/config_distro_bootcmd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 2f90929178e..c55023889ca 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -126,7 +126,7 @@ #ifdef CONFIG_CMD_BOOTEFI_BOOTMGR #define BOOTENV_EFI_BOOTMGR \ "boot_efi_bootmgr=" \ - "if fdt addr ${fdt_addr_r}; then " \ + "if fdt addr -q ${fdt_addr_r}; then " \ "bootefi bootmgr ${fdt_addr_r};" \ "else " \ "bootefi bootmgr;" \ @@ -141,7 +141,7 @@ "boot_efi_binary=" \ "load ${devtype} ${devnum}:${distro_bootpart} " \ "${kernel_addr_r} efi/boot/"BOOTEFI_NAME"; " \ - "if fdt addr ${fdt_addr_r}; then " \ + "if fdt addr -q ${fdt_addr_r}; then " \ "bootefi ${kernel_addr_r} ${fdt_addr_r};" \ "else " \ "bootefi ${kernel_addr_r} ${fdtcontroladdr};" \ @@ -360,7 +360,7 @@ "setenv bootp_arch " BOOTENV_EFI_PXE_ARCH ";" \ "if dhcp ${kernel_addr_r}; then " \ "tftpboot ${fdt_addr_r} dtb/${efi_fdtfile};" \ - "if fdt addr ${fdt_addr_r}; then " \ + "if fdt addr -q ${fdt_addr_r}; then " \ "bootefi ${kernel_addr_r} ${fdt_addr_r}; " \ "else " \ "bootefi ${kernel_addr_r} ${fdtcontroladdr};" \ |