From 8a7ed82647347482ae58323981bf3178f8d44f2f Mon Sep 17 00:00:00 2001 From: Jennifer Averett Date: Mon, 1 Aug 2011 13:41:37 +0000 Subject: 2011-08-01 Jennifer Averett PR 1802 * Makefile.am, configure.ac, preinstall.am, clock/ckinit.c, start/start16.S, startup/bspstart.c, startup/ldsegs.S: Add SMP support for i386. --- c/src/lib/libbsp/i386/pc386/Makefile.am | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'c/src/lib/libbsp/i386/pc386/Makefile.am') diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index faddf6301a..1cc760e821 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -31,6 +31,11 @@ include_bsp_HEADERS = ../../i386/shared/irq/irq.h \ ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h +if HAS_SMP +include_bsp_HEADERS += ../../i386/shared/irq/apic.h +include_bsp_HEADERS += ../../i386/shared/smp/smp-imps.h +endif + include_HEADERS += include/crt.h nodist_include_HEADERS += ../../shared/include/coverhd.h @@ -109,8 +114,19 @@ libbsp_a_SOURCES += timer/timer.c timer/timerisr.S libbsp_a_SOURCES += ide/idecfg.c ide/ide.c if HAS_SMP -libbsp_a_SOURCES += ../../shared/smp/getcpuid.c ../../shared/smp/smp_stub.c \ - ../../shared/smp/bspsmp_wait_for.c +libbsp_a_SOURCES += ../../i386/shared/smp/getcpuid.c +libbsp_a_SOURCES += ../../i386/shared/smp/smp-imps.c + +project_lib_DATA += appstart.$(OBJEXT) +appcpustart.$(OBJEXT): start/start16.S + $(CPPASCOMPILE) $(AM_CPPFLAGS) -DSMP_SECONDARY_CORE -o $@ -c $< + +appstart.$(OBJEXT): appcpustart.$(OBJEXT) + $(LD) -N -T $(top_srcdir)/startup/linkcmds \ + -Ttext 0x70000 -e app_processor_start -nostdlib \ + -o appstart_tmp.exe $< + $(OBJCOPY) -O binary appstart_tmp.exe appstart.bin + $(OBJCOPY) -I binary -O elf32-i386 -B i386 appstart.bin $@ endif if HAS_NETWORKING @@ -144,6 +160,11 @@ endif libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel \ ../../../libcpu/@RTEMS_CPU@/page.rel \ ../../../libcpu/@RTEMS_CPU@/score.rel + +if HAS_SMP +libbsp_a_LIBADD += appstart.$(OBJEXT) +endif + # We only build the Network library if HAS_NETWORKING was defined # dec21140 is supported via libchip if HAS_NETWORKING -- cgit v1.2.3