On Tue, Jun 15, 2021 at 7:15 PM Dimitri John Ledkov <[email protected]> wrote: > > Hi, this patch is still not pulled into master. It still applies > cleanly onto master. > > Can this patch please be pulled in? It fixes a crash of uboot. > Without this patch upstream, people who build their own uboot cannot > boot stock Ubuntu images. > > What can I do, for this patch to be applied? > > On Sat, May 8, 2021 at 7:23 AM Ramon Fried <[email protected]> wrote: > > > > On Wed, Apr 21, 2021 at 5:32 PM Dimitri John Ledkov <[email protected]> wrote: > > > > > > If the environment does not have "soc" or "board" set, and fdtdir > > > option is specified in extlinux.conf, the bootloader will crash whilst > > > dereferencing a null pointer. Add a guard against null soc or > > > board. Fixes a crash of qemu-riscv64_smode configuration, which does > > > not have CONFIG_SYS_SOC defined. > > > > > > Signed-off-by: Dimitri John Ledkov <[email protected]> > > > --- > > > cmd/pxe_utils.c | 8 ++++++++ > > > 1 file changed, 8 insertions(+) > > > > > > diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c > > > index 71c5af4c25..9a30629e26 100644 > > > --- a/cmd/pxe_utils.c > > > +++ b/cmd/pxe_utils.c > > > @@ -587,6 +587,14 @@ static int label_boot(struct cmd_tbl *cmdtp, struct > > > pxe_label *label) > > > f2 = "-"; > > > f3 = env_get("board"); > > > f4 = ".dtb"; > > > + if (!f1) { > > > + f1 = ""; > > > + f2 = ""; > > > + } > > > + if (!f3) { > > > + f2 = ""; > > > + f3 = ""; > > > + } > > > } > > > > > > len = strlen(label->fdtdir); > > > -- > > > 2.27.0 > > > > > Reviewed-by: Ramon Fried <[email protected]> > > > > -- > Regards, > > Dimitri.
applied to u-boot-net/master, thanks! Best regards, Ramon Fried
