diff options
| author | Tom Rini <trini@konsulko.com> | 2022-12-19 17:29:55 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-12-21 21:09:01 +0300 |
| commit | 14f43797d0a696248c09d298e2f2809dded345ba (patch) | |
| tree | 23fc5bc462689f07f389cc0b8e7f7bedd35253ff /boot | |
| parent | 9c955393f7a27ded250fef7688e0065b44a3343f (diff) | |
| parent | 2243922edca9f56a9d5519b9d6e36f5d7a18434d (diff) | |
| download | u-boot-14f43797d0a696248c09d298e2f2809dded345ba.tar.xz | |
Merge tag 'v2023.01-rc4' into next
Prepare v2023.01-rc4
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/pxe_utils.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 2724313817..ec5af4215e 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -618,10 +618,7 @@ 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: If there is an fdtcontroladdr specified, pass it along to - * bootm, and adjust argc appropriately. - * - * Scenario 4: fdt blob is not available. + * Scenario 3: fdt blob is not available. */ bootm_argv[3] = env_get("fdt_addr_r"); @@ -729,9 +726,6 @@ 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] = "-"; |