diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-23 07:43:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-23 07:43:50 -0500 |
| commit | 5a24e12f13e7af70fbb7687da09f377ecbe17b84 (patch) | |
| tree | 6aeb94ed47e252474b0917a13505e1c533434629 /boot/pxe_utils.c | |
| parent | f9bab982ae9e459b4e64c8a4ca8569aac32bb3bf (diff) | |
| parent | f11513d9978719820998ac05ed5a5da32465f926 (diff) | |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-net into next
- Various DSA additions
- bootp: fix for VCI string
- tsec: support for promiscuous mode
- add Aspeed MDIO driver
Diffstat (limited to 'boot/pxe_utils.c')
| -rw-r--r-- | boot/pxe_utils.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index a7a84f26c1..a32acca8ee 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -550,7 +550,10 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) * Scenario 2: If there is an fdt_addr specified, pass it along to * bootm, and adjust argc appropriately. * - * Scenario 3: fdt blob is not available. + * Scenario 3: If there is an fdtcontroladdr specified, pass it along to + * bootm, and adjust argc appropriately. + * + * Scenario 4: fdt blob is not available. */ bootm_argv[3] = env_get("fdt_addr_r"); @@ -652,6 +655,9 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) if (!bootm_argv[3]) bootm_argv[3] = env_get("fdt_addr"); + if (!bootm_argv[3]) + bootm_argv[3] = env_get("fdtcontroladdr"); + if (bootm_argv[3]) { if (!bootm_argv[2]) bootm_argv[2] = "-"; |