Patchwork ifdef & config problems

login
register
about
Submitter Myles Watson
Date 2009-10-17 14:23:28
Message ID <2831fecf0910170723p3f8ea175ubbcafe642aa80218@mail.gmail.com>
Download mbox | patch
Permalink /patch/433/
State Accepted
Headers show

Comments

Myles Watson - 2009-10-17 14:23:28
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 <mylesgw@gmail.com>

Thanks,
Myles
Uwe Hermann - 2009-10-17 14:52:40
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 <mylesgw@gmail.com>

Sounds good. If it survives abuild and kbuildall this is

Acked-by: Uwe Hermann <uwe@hermann-uwe.de>


> 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 - 2009-10-19 16:21:45
On Sat, Oct 17, 2009 at 8:52 AM, Uwe Hermann <uwe@hermann-uwe.de> wrote:

>
> > Signed-off-by: Myles Watson <mylesgw@gmail.com>
>
> Sounds good. If it survives abuild and kbuildall this is
>
> Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
>
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

Patch

Index: cbv2/src/config/Options.lb
===================================================================
--- cbv2.orig/src/config/Options.lb
+++ cbv2/src/config/Options.lb
@@ -712,8 +712,8 @@  define CONFIG_PCIBIOS_IRQ
 	comment "PCIBIOS IRQ support"
 end
 define CONFIG_IOAPIC
-	default none
-	export used
+	default 0
+	export always
 	comment "IOAPIC support"
 end
 
@@ -1103,14 +1103,14 @@  define CONFIG_K8_MEM_BANK_B_ONLY
 end
 
 define CONFIG_VIDEO_MB
-        default none
-        export used
+        default 0
+        export always
         comment "Integrated graphics with UMA has dynamic setup"
 end
 
 define CONFIG_GFXUMA
-        default none
-        export used
+        default 0
+        export always
         comment "GFX UMA"
 end
 
Index: cbv2/src/cpu/x86/mtrr/mtrr.c
===================================================================
--- cbv2.orig/src/cpu/x86/mtrr/mtrr.c
+++ cbv2/src/cpu/x86/mtrr/mtrr.c
@@ -37,7 +37,7 @@ 
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/cache.h>
 
-#ifdef CONFIG_GFXUMA
+#if CONFIG_GFXUMA
 extern uint64_t uma_memory_base, uma_memory_size;
 #endif
 
Index: cbv2/src/northbridge/amd/amdk8/northbridge.c
===================================================================
--- cbv2.orig/src/northbridge/amd/amdk8/northbridge.c
+++ cbv2/src/northbridge/amd/amdk8/northbridge.c
@@ -357,7 +357,7 @@  static void amdk8_link_read_bases(device
 		resource->gran  = log2(HT_MEM_HOST_ALIGN);
 		resource->limit = 0xffffffffffULL;
 		resource->flags = IORESOURCE_MEM | IORESOURCE_PREFETCH;
-#ifdef CONFIG_PCI_64BIT_PREF_MEM
+#if CONFIG_PCI_64BIT_PREF_MEM
 		resource->flags |= IORESOURCE_BRIDGE;
 #endif
 	}
Index: cbv2/src/northbridge/intel/i82810/northbridge.c
===================================================================
--- cbv2.orig/src/northbridge/intel/i82810/northbridge.c
+++ cbv2/src/northbridge/intel/i82810/northbridge.c
@@ -147,7 +147,7 @@  static void pci_domain_set_resources(dev
 		/* Convert tomk from MB to KB. */
 		tomk = tomk << 10;
 
-#ifdef CONFIG_VIDEO_MB
+#if CONFIG_VIDEO_MB
 		/* Check for VGA reserved memory. */
 		if (CONFIG_VIDEO_MB == 512) {
 			tomk -= 512;
Index: cbv2/src/northbridge/intel/i82810/raminit.c
===================================================================
--- cbv2.orig/src/northbridge/intel/i82810/raminit.c
+++ cbv2/src/northbridge/intel/i82810/raminit.c
@@ -371,7 +371,7 @@  static void sdram_set_registers(void)
 	/* Set size for onboard-VGA framebuffer. */
 	reg8 = pci_read_config8(PCI_DEV(0, 0, 0), SMRAM);
 	reg8 &= 0x3f;			     /* Disable graphics (for now). */
-#ifdef CONFIG_VIDEO_MB
+#if CONFIG_VIDEO_MB
 	if (CONFIG_VIDEO_MB == 512)
 		reg8 |= (1 << 7);	     /* Enable graphics (512KB RAM). */
 	else if (CONFIG_VIDEO_MB == 1)
Index: cbv2/src/northbridge/via/cx700/cx700_lpc.c
===================================================================
--- cbv2.orig/src/northbridge/via/cx700/cx700_lpc.c
+++ cbv2/src/northbridge/via/cx700/cx700_lpc.c
@@ -37,7 +37,7 @@ 
 #define HPET_ADDR	0xfe800000UL
 #define IOAPIC_ADDR	0xfec00000ULL
 
-#ifdef CONFIG_IOAPIC
+#if CONFIG_IOAPIC
 struct ioapicreg {
 	unsigned int reg;
 	unsigned int value_low, value_high;
@@ -368,7 +368,7 @@  static void cx700_lpc_init(struct device
 {
 	cx700_set_lpc_registers(dev);
 
-#ifdef CONFIG_IOAPIC
+#if CONFIG_IOAPIC
 	setup_ioapic();
 #endif