diff options
| author | Tom Rini <[email protected]> | 2023-12-20 16:00:22 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-12-20 16:00:22 -0500 |
| commit | 36d3db6c2c060ee85176156dc9a607e8cd5465f4 (patch) | |
| tree | 51f6187c51418043e5dc56f6f9a2dac09e2e848d /boot | |
| parent | a0d0e132b39e48cf471db87600ed87b4e65bc187 (diff) | |
| parent | 97135d9f4220e54b38f69a3f2416b2fd9d8f378c (diff) | |
Merge branch '2023-12-20-assorted-general-updates' into next
- Assorted fixes around the tree
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/bootm.c | 6 | ||||
| -rw-r--r-- | boot/pxe_utils.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/boot/bootm.c b/boot/bootm.c index 301cfded05c..4cf66cca0d1 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -1103,7 +1103,11 @@ int do_bootm_states(struct cmd_tbl *cmdtp, int flag, int argc, if (!ret && (states & BOOTM_STATE_OS_BD_T)) ret = boot_fn(BOOTM_STATE_OS_BD_T, argc, argv, images); if (!ret && (states & BOOTM_STATE_OS_PREP)) { - ret = bootm_process_cmdline_env(images->os.os == IH_OS_LINUX); + int flags = 0; + /* For Linux OS do all substitutions at console processing */ + if (images->os.os == IH_OS_LINUX) + flags = BOOTM_CL_ALL; + ret = bootm_process_cmdline_env(flags); if (ret) { printf("Cmdline setup failed (err=%d)\n", ret); ret = CMD_RET_FAILURE; diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index a92bb896c63..83bc1677856 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -700,6 +700,11 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) label->name); goto cleanup; } + + if (label->fdtdir) { + printf("Skipping fdtdir %s for failure retrieving dts\n", + label->fdtdir); + } } if (label->kaslrseed) |