[PATCH 05/18] treewide: bootm: Drop command-line args to boot_os_fn

Simon Glass sjg at chromium.org
Tue Dec 5 01:52:02 CET 2023


Hi Angelo,

On Tue, 5 Dec 2023 at 08:01, Angelo Dureghello <angelo at kernel-space.org> wrote:
>
> Hi Simon,
>
> looks like i cannot apply this patch:
>
>      ~/dev-k/u-boot-coldfire  on   master *2  git am
> Complete-decoupling-of-bootm-logic-from-commands.patch
> Applying: bootm: netbds: Drop passing of arguments
> Applying: bootm: plan: Drop passing of arguments
> Applying: bootm: qnxelf: Drop passing of arguments
> Applying: nios2: Drop separate parsing of bootm args
> Applying: treewide: bootm: Drop command-line args to boot_os_fn
> error: patch failed: boot/bootm_os.c:441
> error: boot/bootm_os.c: patch does not apply
> Patch failed at 0005 treewide: bootm: Drop command-line args to boot_os_fn
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
>
> And getting similar issues for the "pxe: Allow extlinux booting without
> CMDLINE enabled"
>
> Am i doing something wrong ?

Could you please check the cover letter? There are several series here
and I put the -dm tree links in as well.

I was keeping these to send in sequence, but it would likely take
several releases that way, so I elected to send everything at once and
get feedback.

Regards,
SmIon


More information about the U-Boot mailing list