Compare commits

...

4 Commits
vbg ... labc

Author SHA1 Message Date
Simon Glass
ec48437f64 gitlab: Add an rpi5 to the sjg lab
I have one of these 2GB boards with Ubuntu 24.10 loaded. Add an entry
for it so that it can be used for testing.

Series-to: u-boot
Series-cc: trini
Signed-off-by: Simon Glass <sjg@chromium.org>
2025-01-26 16:46:43 -07:00
Simon Glass
87f6974737 Merge branch 'fix-pxe' into 'master'
pxe_utils: Correct setting of no_prompt

See merge request u-boot/u-boot!28
2025-01-25 18:55:01 +00:00
Simon Glass
44d3e7f46a pxe_utils: Correct setting of no_prompt
This should only be forced on, never off. Fix this so that the menu is
shown when expected.

Signed-off-by: Simon Glass <sjg@chromium.org>
2025-01-25 11:19:30 -07:00
Simon Glass
35bf5c2625 Merge branch 'ci' into 'master'
vbe: Series part F

See merge request u-boot/u-boot!27
2025-01-25 04:34:52 +00:00
2 changed files with 7 additions and 1 deletions

View File

@@ -731,3 +731,8 @@ rock5b:
variables:
ROLE: rock5b
<<: *lab_dfn
rpi5:
variables:
ROLE: rpi5
<<: *lab_dfn

View File

@@ -1729,7 +1729,8 @@ struct pxe_menu *pxe_prepare(struct pxe_context *ctx, ulong pxefile_addr_r,
return NULL;
}
cfg->prompt = prompt;
if (prompt)
cfg->prompt = prompt;
return cfg;
}