[PATCH 04/24] menu: Rename KEY_... to BKEY_...

Simon Glass sjg at chromium.org
Wed Oct 19 15:18:00 CEST 2022


Hi Heinrich,

On Mon, 17 Oct 2022 at 15:55, Heinrich Schuchardt <xypron.glpk at gmx.de> wrote:
>
> On 10/17/22 22:29, Simon Glass wrote:
> > This enum values conflict with linux/input.h so rename them.
> >
> > Signed-off-by: Simon Glass <sjg at chromium.org>
> > ---
> >
> >   cmd/bootmenu.c  | 10 +++++-----
> >   cmd/eficonfig.c | 26 +++++++++++++-------------
> >   common/menu.c   | 34 +++++++++++++++++-----------------
> >   include/menu.h  | 32 ++++++++++++++++----------------
> >   4 files changed, 51 insertions(+), 51 deletions(-)
> >
> > diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
> > index 3340be16325..c80004c54dc 100644
> > --- a/cmd/bootmenu.c
> > +++ b/cmd/bootmenu.c
> > @@ -86,7 +86,7 @@ static char *bootmenu_choice_entry(void *data)
> >   {
>
> The argument should be of type struct bootmenu_data* and not void.
>
> This function and the enum should be move to common/menu.c and not exported.

That would be a separate patch.

>
> common/menu.c does not import linux/input.h so there will be no conflict
> but that sould not stop you from renaming the constants.

Yes, it's not the conflict, just the confusion.

Regards,
Simon


More information about the U-Boot mailing list