[coreboot] [PATCH] libpayload: Fix build when both USB and PS/2 keyboard support is disabled

[Mart Raudsepp]

On Sun, 2009-02-22 at 10:07 +0100, Ulf Jordan wrote:
> Hello Mart!

Hello,

> On Sun, 22 Feb 2009, Mart Raudsepp wrote:
> 
> > libpayload: Fix build when both USB and PS/2 keyboard support is disabled
> >
> > libpayload uses -Werror for some reason right now, and the
> > variable 'c' in curses_getchar is only used if CONFIG_USB_HID
> > or CONFIG_PC_KEYBOARD is defined, giving an unused variable
> > warning that gets promoted to an error.
> > So wrap the variable declaration around appropriate #ifdef's
> 
> The variable c is also used in the serial console input code just below 
> the PS/2 one, so to trigger the error all of CONFIG_USB_HID, 
> CONFIG_PC_KEYBOARD, and CONFIG_SERIAL_CONSOLE needs to be undefined.

oops

> I guess we won't get much input to libpayload then.

I think we can improve on top of this and leave keyboard.c out
completely in the future if no keyboards are enabled.
I'd be quite happy to have input support, but that depends on currently
pretty much non-existing OHCI support.
Later I will probably add serial console support back to my images, but
that depends on getting the serial port GPIO mux with VGA DDC turned
back to DDC mode post-bootloader on a GeodeLX that I need to figure out
how to do cleanly.

> The patch in current 
> form will instead throw an error if CONFIG_SERIAL_CONSOLE is defined while 
> CONFIG_USB_HID and CONFIG_PC_KEYBOARD are not, i.e. for those who build 
> only for serial console.
> 
> I propose to include "|| defined(CONFIG_SERIAL_CONSOLE)" in the #if.

Right, wasn't looking closely enough, shouldn't make it fail another
way :)

> With that change included the patch is
> 
> Acked-by: Ulf Jordan <jordan at chalmers.se>

Thanks, r3957

-- 
Mart Raudsepp
Gentoo Developer - GNOME, wxWidgets
Mail: leio at gentoo.org
Weblog: http://planet.gentoo.org/developers/leio
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://www.coreboot.org/pipermail/coreboot/attachments/20090223/9c058948/attachment.sig>