Address Conflicts:

c/src/lib/libbsp/powerpc/psim/startup/linkcmds
This commit is contained in:
Jennifer Averett
2012-03-29 12:07:30 -05:00
2 changed files with 7 additions and 2 deletions

View File

@@ -48,8 +48,10 @@ libbsp_a_SOURCES += ../../shared/console-polled.c
libbsp_a_SOURCES += console/console-io.c console/consupp.S
# irq
include_bsp_HEADERS = irq/irq.h ../shared/openpic/openpic.h
libbsp_a_SOURCES += irq/irq_init.c ../shared/irq/openpic_i8259_irq.c ../shared/openpic/openpic.c
include_bsp_HEADERS = irq/irq.h ../shared/openpic/openpic.h \
../../shared/include/irq-generic.h
libbsp_a_SOURCES += irq/irq_init.c ../shared/irq/openpic_i8259_irq.c ../shared/openpic/openpic.c \
../../shared/src/irq-server.c
EXTRA_DIST = vectors/README
# vectors

View File

@@ -59,6 +59,9 @@
#include <bsp/irq_supp.h>
#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET
#define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET
#ifdef __cplusplus
extern "C" {
#endif