From 84e59b7c04e47c3ec7aa95f53509fd812eee725e Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 15 Nov 2018 20:47:22 +0100 Subject: bsps/powerpc: Use interrupt stack for init stack Move start.o to separate file. Update #3459. --- c/src/lib/libbsp/powerpc/haleakala/Makefile.am | 9 ++++----- c/src/lib/libbsp/powerpc/ss555/Makefile.am | 7 ++++--- c/src/lib/libbsp/powerpc/virtex/configure.ac | 6 ------ c/src/lib/libbsp/powerpc/virtex4/Makefile.am | 7 ++++++- c/src/lib/libbsp/powerpc/virtex5/Makefile.am | 7 ++++++- 5 files changed, 20 insertions(+), 16 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am index 89594c83cf..e58a42a530 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am +++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am @@ -5,11 +5,13 @@ include $(top_srcdir)/../../bsp.am dist_project_lib_DATA = ../../../../../../bsps/powerpc/haleakala/start/bsp_specs - +start.$(OBJEXT): ../../../../../../bsps/powerpc/haleakala/start/start.S + $(CPPASCOMPILE) -o $@ -c $< +project_lib_DATA = start.$(OBJEXT) rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -o $@ -c $< -project_lib_DATA = rtems_crti.$(OBJEXT) +project_lib_DATA += rtems_crti.$(OBJEXT) project_lib_DATA += linkcmds @@ -26,9 +28,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/start/mmu_405.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/start/mmu_405asm.S -# dlentry -librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/start/dlentry.S - # console librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am index 51ea72166f..c6276e15e9 100644 --- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am @@ -5,11 +5,13 @@ include $(top_srcdir)/../../bsp.am dist_project_lib_DATA = ../../../../../../bsps/powerpc/ss555/start/bsp_specs - +start.$(OBJEXT): ../../../../../../bsps/powerpc/ss555/start/start.S + $(CPPASCOMPILE) -o $@ -c $< +project_lib_DATA = start.$(OBJEXT) rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -o $@ -c $< -project_lib_DATA = rtems_crti.$(OBJEXT) +project_lib_DATA += rtems_crti.$(OBJEXT) project_lib_DATA += linkcmds @@ -26,7 +28,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/bspstart.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/iss555.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c -librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/start.S librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c # tm27supp diff --git a/c/src/lib/libbsp/powerpc/virtex/configure.ac b/c/src/lib/libbsp/powerpc/virtex/configure.ac index b70adf1af5..19ecf513a3 100644 --- a/c/src/lib/libbsp/powerpc/virtex/configure.ac +++ b/c/src/lib/libbsp/powerpc/virtex/configure.ac @@ -10,12 +10,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) RTEMS_BSP_CONFIGURE - - - -RTEMS_BSPOPTS_SET([BSP_START_STACK_SIZE],[*],[4096]) -RTEMS_BSPOPTS_HELP([BSP_START_STACK_SIZE],[size of low-level start stack]) - RTEMS_BSPOPTS_SET([RTEMS_XPARAMETERS_H],[*],[\]) RTEMS_BSPOPTS_HELP([RTEMS_XPARAMETERS_H], [This defines the location of the hardware specific "xparameters.h" file. diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am index 62ca072f94..56845f95de 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am @@ -9,9 +9,14 @@ dist_project_lib_DATA = ../../../../../../bsps/powerpc/virtex4/start/bsp_specs # include # start + +start.$(OBJEXT): ../../../../../../bsps/powerpc/virtex4/start/start.S + $(CPPASCOMPILE) -o $@ -c $< +project_lib_DATA = start.$(OBJEXT) + rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -o $@ -c $< -project_lib_DATA = rtems_crti.$(OBJEXT) +project_lib_DATA += rtems_crti.$(OBJEXT) project_lib_DATA += linkcmds diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am index 2dd664d0a3..fae04ed02d 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am @@ -8,9 +8,14 @@ dist_project_lib_DATA = ../../../../../../bsps/powerpc/virtex5/start/bsp_specs # include # start + +start.$(OBJEXT): ../../../../../../bsps/powerpc/virtex5/start/start.S + $(CPPASCOMPILE) -o $@ -c $< +project_lib_DATA = start.$(OBJEXT) + rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -o $@ -c $< -project_lib_DATA = rtems_crti.$(OBJEXT) +project_lib_DATA += rtems_crti.$(OBJEXT) project_lib_DATA += linkcmds -- cgit v1.2.3