[PATCH] ifdef & config problems

[Myles Watson]

Try to make CONFIG_ options more standard.

config_console.diff: #ifdef->#if
fan_ctl.diff: make CONFIG_HAVE_FANCTL specific to the SuperIO that supports
it
vt8237r.diff: #ifdef->#if

Config options used with #ifdef makes it so your board can break silently
when someone makes a simple change in Kconfig.

Signed-off-by: Myles Watson

Thanks,
Myles

[Uwe Hermann]

On Sat, Oct 17, 2009 at 08:23:28AM -0600, Myles Watson wrote:
> Try to make CONFIG_ options more standard.
>
> config_console.diff: #ifdef->#if
> fan_ctl.diff: make CONFIG_HAVE_FANCTL specific to the SuperIO that supports
> it
> vt8237r.diff: #ifdef->#if
>
> Config options used with #ifdef makes it so your board can break silently
> when someone makes a simple change in Kconfig.
>
> Signed-off-by: Myles Watson

Sounds good. If it survives abuild and kbuildall this is

Acked-by: Uwe Hermann
> Index: cbv2/src/arch/i386/boot/coreboot_table.c
>
> --- cbv2.orig/src/arch/i386/boot/coreboot_table.c
> +++ cbv2/src/arch/i386/boot/coreboot_table.c
> @@ -99,7 +99,7 @@ static struct lb_memory *lb_memory(struc
>
> static struct lb_serial *lb_serial(struct lb_header *header)
>  {
> -#if defined(CONFIG_TTYS0_BASE)
> +#if CONFIG_CONSOLE_SERIAL8250

Does this affect newconfig? Is CONFIG_CONSOLE_SERIAL8250 properly
defined and set in newconfig, or only in kconfig?
> Index: cbv2/src/config/Options.lb
>
> --- cbv2.orig/src/config/Options.lb
> +++ cbv2/src/config/Options.lb
> @@ -845,7 +845,7 @@ end
>  # Misc device options
>  ###############################################
>
> -define CONFIG_HAVE_FANCTL
> +define CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL

Yep, good idea.
> Index: cbv2/src/southbridge/via/vt8237r/vt8237r_lpc.c
>
> --- cbv2.orig/src/southbridge/via/vt8237r/vt8237r_lpc.c
> +++ cbv2/src/southbridge/via/vt8237r/vt8237r_lpc.c
> @@ -499,7 +499,7 @@ static void vt8237_common_init(struct de
>    /* Delay transaction control */
>    pci_write_config8(dev, 0x43, 0xb);
>
> -#ifdef CONFIG_EPIA_VT8237R_INIT
> +#if !CONFIG_EPIA_VT8237R_INIT

This looks incorrect, the "!" should not be there.

Uwe.

[Myles Watson]

On Sat, Oct 17, 2009 at 8:52 AM, Uwe Hermann  wrote:
> > Signed-off-by: Myles Watson
>
> Sounds good. If it survives abuild and kbuildall this is
>
> Acked-by: Uwe Hermann

Rev  4809.
> > Index: cbv2/src/arch/i386/boot/coreboot_table.c
> >
> > --- cbv2.orig/src/arch/i386/boot/coreboot_table.c
> > +++ cbv2/src/arch/i386/boot/coreboot_table.c
> > @@ -99,7 +99,7 @@ static struct lb_memory *lb_memory(struc
> >
> > static struct lb_serial *lb_serial(struct lb_header *header)
> >  {
> > -#if defined(CONFIG_TTYS0_BASE)
> > +#if CONFIG_CONSOLE_SERIAL8250
>
> Does this affect newconfig? Is CONFIG_CONSOLE_SERIAL8250 properly
> defined and set in newconfig, or only in kconfig?

CONFIG_CONSOLE_SERIAL8250 defaults to 0 and is always exported.
> > Index: cbv2/src/southbridge/via/vt8237r/vt8237r_lpc.c
> >
> > --- cbv2.orig/src/southbridge/via/vt8237r/vt8237r_lpc.c
> > +++ cbv2/src/southbridge/via/vt8237r/vt8237r_lpc.c
> > @@ -499,7 +499,7 @@ static void vt8237_common_init(struct de
> >       /* Delay transaction control */
> >       pci_write_config8(dev, 0x43, 0xb);
> >
> > -#ifdef CONFIG_EPIA_VT8237R_INIT
> > +#if !CONFIG_EPIA_VT8237R_INIT
>
> This looks incorrect, the "!" should not be there.

Good catch!

Thanks,
Myles