[commit] r6271 - trunk/src/arch/x86/include/arch

[repository service]

Author: stepan
Date: Wed Jan 19 07:31:24 2011
New Revision: 6271
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6271

Log:
The cn700.c code references mainboard_interrupt_handlers() which isn't
defined if VGA_ROM_RUN is off.  Define a dummy implementation of that
function for this case.

Signed-off-by: Kevin O'Connor 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/arch/x86/include/arch/interrupt.h

Modified: trunk/src/arch/x86/include/arch/interrupt.h
==============================================================================
--- trunk/src/arch/x86/include/arch/interrupt.h	Tue Jan 18 15:38:59 2011	(r6270)
+++ trunk/src/arch/x86/include/arch/interrupt.h	Wed Jan 19 07:31:24 2011	(r6271)
@@ -22,4 +22,8 @@
 #include "registers.h"

/* setup interrupt handlers for mainboard */
+#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE
 extern void mainboard_interrupt_handlers(int intXX, void *intXX_func);
+#else
+static inline void mainboard_interrupt_handlers(int intXX, void *intXX_func) { }
+#endif

[Peter Stuge]

repository service wrote:
> Log:
> The cn700.c code references mainboard_interrupt_handlers() which isn't
> defined if VGA_ROM_RUN is off.  Define a dummy implementation of that
> function for this case.
>
> Signed-off-by: Kevin O'Connor 
> Acked-by: Stefan Reinauer
>
> Modified:
>    trunk/src/arch/x86/include/arch/interrupt.h
> Modified: trunk/src/arch/x86/include/arch/interrupt.h
>
> --- trunk/src/arch/x86/include/arch/interrupt.h	Tue Jan 18 15:38:59 2011	(r6270)
> +++ trunk/src/arch/x86/include/arch/interrupt.h	Wed Jan 19 07:31:24 2011	(r6271)
> @@ -22,4 +22,8 @@
>  #include "registers.h"
>
> /* setup interrupt handlers for mainboard */
> +#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE
>  extern void mainboard_interrupt_handlers(int intXX, void *intXX_func);
> +#else
> +static inline void mainboard_interrupt_handlers(int intXX, void *intXX_func) { }
> +#endif

Didn't I NAK this sufficiently clearly?

It belongs in the northbridge files.

//Peter

[Stefan Reinauer]

* Peter Stuge  [110119 07:37]:
> repository service wrote:
> > Log:
> > The cn700.c code references mainboard_interrupt_handlers() which isn't
> > defined if VGA_ROM_RUN is off.  Define a dummy implementation of that
> > function for this case.
> >
> > Signed-off-by: Kevin O'Connor 
> > Acked-by: Stefan Reinauer
> >
> > Modified:
> >    trunk/src/arch/x86/include/arch/interrupt.h
> > Modified: trunk/src/arch/x86/include/arch/interrupt.h
> >
> > --- trunk/src/arch/x86/include/arch/interrupt.h	Tue Jan 18 15:38:59 2011	(r6270)
> > +++ trunk/src/arch/x86/include/arch/interrupt.h	Wed Jan 19 07:31:24 2011	(r6271)
> > @@ -22,4 +22,8 @@
> >  #include "registers.h"
> >
> > /* setup interrupt handlers for mainboard */
> > +#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE
> >  extern void mainboard_interrupt_handlers(int intXX, void *intXX_func);
> > +#else
> > +static inline void mainboard_interrupt_handlers(int intXX, void *intXX_func) { }
> > +#endif
>
> Didn't I NAK this sufficiently clearly?

Actually, no. I got the impression that the discussion fell asleep
without any better solution.

1. there was no alternative patch on the list
2. it fixes a compile problem
> It belongs in the northbridge files.

Cool, go ahead. I will gladly ack to replace this solution with yours.

Stefan