[rtems commit] bsps: Simplify source file path in Makefile.am
Sebastian Huber
sebh at rtems.org
Thu Apr 12 05:18:29 UTC 2018
Module: rtems
Branch: master
Commit: 4359c43351de70d75a1e98187bc3952af0f9baae
Changeset: http://git.rtems.org/rtems/commit/?id=4359c43351de70d75a1e98187bc3952af0f9baae
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Tue Apr 10 16:32:59 2018 +0200
bsps: Simplify source file path in Makefile.am
This patch is a part of the BSP source reorganization.
Update #3285.
---
c/src/lib/libbsp/i386/pc386/Makefile.am | 30 ++---
c/src/lib/libbsp/lm32/lm32_evr/Makefile.am | 12 +-
c/src/lib/libbsp/lm32/milkymist/Makefile.am | 42 +++---
c/src/lib/libbsp/m68k/mvme147/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/mvme147s/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/mvme162/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/mvme167/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/beatnik/Makefile.am | 32 ++---
c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/gen83xx/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/haleakala/Makefile.am | 6 +-
.../libbsp/powerpc/motorola_powerpc/Makefile.am | 52 +++----
c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/mvme3100/Makefile.am | 26 ++--
c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 22 +--
c/src/lib/libbsp/powerpc/psim/Makefile.am | 4 +-
c/src/lib/libbsp/powerpc/qemuppc/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/qoriq/Makefile.am | 4 +-
c/src/lib/libbsp/powerpc/ss555/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/t32mppc/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/virtex/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/virtex4/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/virtex5/Makefile.am | 4 +-
c/src/lib/libbsp/sh/gensh1/Makefile.am | 2 +-
c/src/lib/libbsp/sh/gensh2/Makefile.am | 2 +-
c/src/lib/libbsp/sparc/erc32/Makefile.am | 18 +--
c/src/lib/libbsp/sparc/leon2/Makefile.am | 136 +++++++++----------
c/src/lib/libbsp/sparc/leon3/Makefile.am | 150 ++++++++++-----------
c/src/lib/libbsp/v850/gdbv850sim/Makefile.am | 2 +-
31 files changed, 286 insertions(+), 286 deletions(-)
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 39897fd..963d619 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -77,9 +77,9 @@ endif
# console (non-graphics support)
librtemsbsp_a_SOURCES += console/serial_mouse_config.c
-librtemsbsp_a_SOURCES += ../../i386/shared/comm/uart.c
-librtemsbsp_a_SOURCES += ../../i386/shared/comm/tty_drv.c
-librtemsbsp_a_SOURCES += ../../i386/shared/realmode_int/realmode_int.c
+librtemsbsp_a_SOURCES += ../shared/comm/uart.c
+librtemsbsp_a_SOURCES += ../shared/comm/tty_drv.c
+librtemsbsp_a_SOURCES += ../shared/realmode_int/realmode_int.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += console/console_select.c
librtemsbsp_a_SOURCES += console/console_control.c
@@ -91,16 +91,16 @@ librtemsbsp_a_SOURCES += console/uart_bus_pci.c
librtemsbsp_a_SOURCES += console/gdb_select.c
# gdb
-librtemsbsp_a_SOURCES += ../../i386/shared/comm/i386-stub.c
-librtemsbsp_a_SOURCES += ../../i386/shared/comm/i386-stub-glue.c
-librtemsbsp_a_SOURCES += ../../i386/shared/comm/gdb_glue.c
+librtemsbsp_a_SOURCES += ../shared/comm/i386-stub.c
+librtemsbsp_a_SOURCES += ../shared/comm/i386-stub-glue.c
+librtemsbsp_a_SOURCES += ../shared/comm/gdb_glue.c
# gnat
librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
# pci
-librtemsbsp_a_SOURCES += ../../i386/shared/pci/pcibios.c
-librtemsbsp_a_SOURCES += ../../i386/shared/pci/pci_io.c
+librtemsbsp_a_SOURCES += ../shared/pci/pcibios.c
+librtemsbsp_a_SOURCES += ../shared/pci/pci_io.c
librtemsbsp_a_SOURCES += ../../shared/pci/pci_bus_count.c
librtemsbsp_a_SOURCES += ../../shared/pci/pci_find_device.c
@@ -113,15 +113,15 @@ librtemsbsp_a_SOURCES += startup/bspstart.c
librtemsbsp_a_SOURCES += startup/bspcmdline.c
librtemsbsp_a_SOURCES += ../../shared/bspclean.c
librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += ../../i386/shared/irq/idt.c
-librtemsbsp_a_SOURCES += ../../i386/shared/irq/irq.c
-librtemsbsp_a_SOURCES += ../../i386/shared/irq/irq_init.c
-librtemsbsp_a_SOURCES += ../../i386/shared/irq/elcr.c
+librtemsbsp_a_SOURCES += ../shared/irq/idt.c
+librtemsbsp_a_SOURCES += ../shared/irq/irq.c
+librtemsbsp_a_SOURCES += ../shared/irq/irq_init.c
+librtemsbsp_a_SOURCES += ../shared/irq/elcr.c
librtemsbsp_a_SOURCES += ../../shared/bootcard.c
librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += ../../shared/sbrk.c
librtemsbsp_a_SOURCES += startup/ldsegs.S
-librtemsbsp_a_SOURCES += ../../i386/shared/irq/irq_asm.S
+librtemsbsp_a_SOURCES += ../shared/irq/irq_asm.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
# timer
@@ -135,8 +135,8 @@ librtemsbsp_a_SOURCES += ide/idecfg.c
endif
if HAS_SMP
-librtemsbsp_a_SOURCES += ../../i386/shared/smp/getcpuid.c
-librtemsbsp_a_SOURCES += ../../i386/shared/smp/smp-imps.c
+librtemsbsp_a_SOURCES += ../shared/smp/getcpuid.c
+librtemsbsp_a_SOURCES += ../shared/smp/smp-imps.c
project_lib_DATA += appstart.$(OBJEXT)
appcpustart.$(OBJEXT): start/start16.S
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
index 0fc0b5c..aceab72 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
+++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
@@ -9,7 +9,7 @@ dist_project_lib_DATA = startup/bsp_specs
noinst_PROGRAMS =
-start.$(OBJEXT): ../../lm32/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
@@ -30,18 +30,18 @@ librtemsbsp_a_SOURCES += ../../shared/setvec.c
librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
librtemsbsp_a_SOURCES += ../shared/startup/bspreset.c
# clock
-librtemsbsp_a_SOURCES += ../../lm32/shared/clock/ckinit.c
+librtemsbsp_a_SOURCES += ../shared/clock/ckinit.c
# console
-librtemsbsp_a_SOURCES += ../../lm32/shared/console/console.c
-librtemsbsp_a_SOURCES += ../../lm32/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../shared/console/console.c
+librtemsbsp_a_SOURCES += ../shared/console/uart.c
# timer
-librtemsbsp_a_SOURCES += ../../lm32/shared/timer/timer.c
+librtemsbsp_a_SOURCES += ../shared/timer/timer.c
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
if HAS_NETWORKING
-librtemsbsp_a_SOURCES += ../../lm32/shared/tsmac/tsmac.c
+librtemsbsp_a_SOURCES += ../shared/tsmac/tsmac.c
endif
diff --git a/c/src/lib/libbsp/lm32/milkymist/Makefile.am b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
index 9f2b318..1eab7e9 100644
--- a/c/src/lib/libbsp/lm32/milkymist/Makefile.am
+++ b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
@@ -9,7 +9,7 @@ dist_project_lib_DATA = startup/bsp_specs
noinst_PROGRAMS =
-start.$(OBJEXT): ../../lm32/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
@@ -30,65 +30,65 @@ librtemsbsp_a_SOURCES += ../../shared/sbrk.c
librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
# irq
-librtemsbsp_a_SOURCES += ../../lm32/shared/irq/irq.c
+librtemsbsp_a_SOURCES += ../shared/irq/irq.c
# clock
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_clock/ckinit.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_clock/ckinit.c
# console
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_console/console.c
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_console/uart.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_console/console.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_console/uart.c
# timer
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_timer/timer.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_timer/timer.c
# framebuffer
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_framebuffer/framebuffer.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_framebuffer/framebuffer.c
# GPIO
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_gpio/gpio.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_gpio/gpio.c
# buttons
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_buttons/buttons.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_buttons/buttons.c
# ac97
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_ac97/ac97.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_ac97/ac97.c
# usbinput
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_usbinput/usbinput.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_usbinput/usbinput.c
# PFPU
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_pfpu/pfpu.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_pfpu/pfpu.c
# TMU
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_tmu/tmu.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_tmu/tmu.c
# memory card
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_memcard/memcard.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_memcard/memcard.c
# flash
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_flash/flash.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_flash/flash.c
# DMX
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_dmx/dmx.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_dmx/dmx.c
# MIDI
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_midi/midi.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_midi/midi.c
# IR
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_ir/ir.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_ir/ir.c
# video input
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_video/video.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_video/video.c
# versions
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_versions/versions.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_versions/versions.c
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
if HAS_NETWORKING
-librtemsbsp_a_SOURCES += ../../lm32/shared/milkymist_networking/network.c
+librtemsbsp_a_SOURCES += ../shared/milkymist_networking/network.c
endif
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
index 0371dac..2dcb622 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
@@ -10,7 +10,7 @@ noinst_PROGRAMS =
## Zilog component header files
-start.$(OBJEXT): ../../m68k/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
index 562f5b0..d9c9013 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
@@ -10,7 +10,7 @@ noinst_PROGRAMS =
## Zilog component header files
-start.$(OBJEXT): ../../m68k/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index 7861b48..fea4e1f 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -9,7 +9,7 @@ noinst_PROGRAMS =
## Zilog component header files
-start.$(OBJEXT): ../../m68k/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index 83a00b6..00fd200 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -8,7 +8,7 @@ dist_project_lib_DATA = startup/bsp_specs
noinst_PROGRAMS =
-start.$(OBJEXT): ../../m68k/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index fac308b..2714d81 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -13,18 +13,18 @@ project_lib_DATA =
#include
#start
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -DASM -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
-preload.$(OBJEXT): ../../powerpc/shared/start/preload.S
+preload.$(OBJEXT): ../shared/start/preload.S
$(CPPASCOMPILE) -DASM -o $@ -c $<
-vectors_entry.$(OBJEXT): ../../powerpc/shared/start/vectors_entry.S
+vectors_entry.$(OBJEXT): ../shared/start/vectors_entry.S
$(CPPASCOMPILE) -DASM -o $@ -c $<
-start.$(OBJEXT): ../../powerpc/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
$(CPPASCOMPILE) -DASM -o $@ -c $<
motld_start.$(OBJEXT): preload.$(OBJEXT) vectors_entry.$(OBJEXT) start.$(OBJEXT)
@@ -45,24 +45,24 @@ librtemsbsp_a_SOURCES += startup/bspstart.c
librtemsbsp_a_SOURCES += ../shared/motorola/vpd.c
librtemsbsp_a_SOURCES += startup/bspreset.c
librtemsbsp_a_SOURCES += startup/i2c_init.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/probeMemEnd.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bsppredriverhook.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_setup.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_activate.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../shared/startup/probeMemEnd.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../shared/startup/pgtbl_setup.c
+librtemsbsp_a_SOURCES += ../shared/startup/pgtbl_activate.c
+librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
librtemsbsp_a_SOURCES += ../../shared/bootcard.c
librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += startup/bspclean.c
librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
#pclock
-librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
#console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../shared/console/uart.c
+librtemsbsp_a_SOURCES += ../shared/console/console.c
#irq
librtemsbsp_a_SOURCES += irq/irq_init.c
@@ -79,11 +79,11 @@ librtemsbsp_a_SOURCES += ../shared/flash/intelFlash.c
librtemsbsp_a_SOURCES += flash/flashcfg.c
#pci
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
+librtemsbsp_a_SOURCES += ../shared/pci/pci.c
librtemsbsp_a_SOURCES += pci/gt_pci_init.c
librtemsbsp_a_SOURCES += pci/pci_io_remap.c
librtemsbsp_a_SOURCES += pci/motload_fixup.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
+librtemsbsp_a_SOURCES += ../shared/pci/pcifinddevice.c
#network
if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 4a6d15d..39e33fb 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -13,7 +13,7 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index a3ece5d..cd6e3e1 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -13,7 +13,7 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index b4af09a..e597f93 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -7,7 +7,7 @@ dist_project_lib_DATA = startup/bsp_specs
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT)
@@ -33,8 +33,8 @@ librtemsbsp_a_SOURCES += mmu/mmu_405asm.S
librtemsbsp_a_SOURCES += dlentry/dlentry.S
# console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../shared/console/uart.c
+librtemsbsp_a_SOURCES += ../shared/console/console.c
# irq
librtemsbsp_a_SOURCES += irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index fee29c2..8bf45cc 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -15,15 +15,15 @@ dist_project_lib_DATA = startup/bsp_specs
noinst_PROGRAMS =
-start.$(OBJEXT): ../../powerpc/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
-vectors_entry.$(OBJEXT): ../../powerpc/shared/start/vectors_entry.S
+vectors_entry.$(OBJEXT): ../shared/start/vectors_entry.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += vectors_entry.$(OBJEXT)
@@ -34,15 +34,15 @@ project_lib_LIBRARIES = librtemsbsp.a
librtemsbsp_a_SOURCES =
# startup
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspstart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/showbats.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bsppredriverhook.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_setup.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_activate.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/ppc_idle.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspstart.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../shared/showbats.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../shared/startup/pgtbl_setup.c
+librtemsbsp_a_SOURCES += ../shared/startup/pgtbl_activate.c
+librtemsbsp_a_SOURCES += ../shared/startup/ppc_idle.c
+librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
librtemsbsp_a_SOURCES += ../../shared/bootcard.c
librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += ../../shared/bspclean.c
@@ -52,34 +52,34 @@ librtemsbsp_a_SOURCES += startup/bspreset.c
# tod
librtemsbsp_a_SOURCES += ../../shared/tod.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/tod/todcfg.c
+librtemsbsp_a_SOURCES += ../shared/tod/todcfg.c
# pclock
-librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
# console
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/motorola_powerpc/dev/polled_io.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../shared/console/uart.c
+librtemsbsp_a_SOURCES += ../shared/console/console.c
# irq
-librtemsbsp_a_SOURCES += ../../powerpc/shared/irq/irq_init.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/irq/i8259.c
+librtemsbsp_a_SOURCES += ../shared/irq/irq_init.c
+librtemsbsp_a_SOURCES += ../shared/irq/openpic_i8259_irq.c
+librtemsbsp_a_SOURCES += ../shared/irq/i8259.c
# motorola
-librtemsbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.c
+librtemsbsp_a_SOURCES += ../shared/motorola/motorola.c
# openpic
-librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.c
+librtemsbsp_a_SOURCES += ../shared/openpic/openpic.c
# pci
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/detect_raven_bridge.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/generic_clear_hberrs.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
+librtemsbsp_a_SOURCES += ../shared/pci/pci.c
+librtemsbsp_a_SOURCES += ../shared/pci/detect_raven_bridge.c
+librtemsbsp_a_SOURCES += ../shared/pci/generic_clear_hberrs.c
+librtemsbsp_a_SOURCES += ../shared/pci/pcifinddevice.c
# residual
-librtemsbsp_a_SOURCES += ../../powerpc/shared/residual/residual.c
+librtemsbsp_a_SOURCES += ../shared/residual/residual.c
if QEMU
if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index 82b7b5d..ee027ff 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -13,7 +13,7 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index f3e80f2..6e311ea 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -14,7 +14,7 @@ project_lib_DATA = start.$(OBJEXT)
project_lib_DATA += linkcmds
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index b7ff8ea..ece312c 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -26,7 +26,7 @@ motld_start.$(OBJEXT): preload.$(OBJEXT) vectors_entry.$(OBJEXT) \
project_lib_DATA += motld_start.$(OBJEXT)
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
@@ -39,10 +39,10 @@ librtemsbsp_a_SOURCES =
# startup
librtemsbsp_a_SOURCES += startup/bspstart.c
librtemsbsp_a_SOURCES += startup/misc.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bsppredriverhook.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
librtemsbsp_a_SOURCES += ../../shared/bootcard.c
librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += ../../shared/bspclean.c
@@ -52,24 +52,24 @@ librtemsbsp_a_SOURCES += ../../shared/bspreset.c
librtemsbsp_a_SOURCES += ../../shared/tod.c
librtemsbsp_a_SOURCES += tod/todcfg.c
# pclock
-librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
# console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../shared/console/uart.c
+librtemsbsp_a_SOURCES += ../shared/console/console.c
# irq
librtemsbsp_a_SOURCES += irq/irq_init.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c
+librtemsbsp_a_SOURCES += ../shared/irq/openpic_i8259_irq.c
# openpic
-librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.c
+librtemsbsp_a_SOURCES += ../shared/openpic/openpic.c
# pci
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
+librtemsbsp_a_SOURCES += ../shared/pci/pci.c
librtemsbsp_a_SOURCES += pci/detect_host_bridge.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/generic_clear_hberrs.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
+librtemsbsp_a_SOURCES += ../shared/pci/generic_clear_hberrs.c
+librtemsbsp_a_SOURCES += ../shared/pci/pcifinddevice.c
# flash
librtemsbsp_a_SOURCES += ../shared/flash/flash.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 4529e52..e14c371 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -15,25 +15,25 @@ librtemsbsp_a_SOURCES =
# startup
librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_setup.c
+librtemsbsp_a_SOURCES += ../shared/startup/pgtbl_setup.c
librtemsbsp_a_SOURCES += startup/pgtbl_activate.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bsppredriverhook.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
librtemsbsp_a_SOURCES += ../../shared/bootcard.c
librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += startup/bspclean.c
librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/probeMemEnd.c
+librtemsbsp_a_SOURCES += ../shared/startup/probeMemEnd.c
# pclock
-librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
# console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../shared/console/uart.c
+librtemsbsp_a_SOURCES += ../shared/console/console.c
# pci
librtemsbsp_a_SOURCES += pci/pci.c
@@ -51,7 +51,7 @@ librtemsbsp_a_SOURCES += tod/todcfg.c
# vectors
librtemsbsp_a_SOURCES += vectors/exceptionhandler.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/start/vectors_entry.S
+librtemsbsp_a_SOURCES += ../shared/start/vectors_entry.S
# GT64260
librtemsbsp_a_SOURCES += GT64260/GT64260TWSI.c
@@ -63,7 +63,7 @@ librtemsbsp_a_SOURCES += network/if_1GHz/if_wm.c
librtemsbsp_a_SOURCES += network/if_1GHz/pci_map.c
endif
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index edb7db8..a737b88 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -11,7 +11,7 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += startup/bspstart.c
librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
librtemsbsp_a_SOURCES += ../../shared/bootcard.c
librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
librtemsbsp_a_SOURCES += ../../shared/bspreset.c
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index c6962c1..cee0a48 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -12,7 +12,7 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index 1e02511..7bdee25 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -14,11 +14,11 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
-rtems_crtn.$(OBJEXT): ../../powerpc/shared/start/rtems_crtn.S
+rtems_crtn.$(OBJEXT): ../shared/start/rtems_crtn.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crtn.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index 45b31c9..941294f 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -7,7 +7,7 @@ dist_project_lib_DATA = startup/bsp_specs
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index 73bac5a..53418dd 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -14,7 +14,7 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 8794a35..1e13978 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -13,7 +13,7 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index 40a952a..d9db015 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -16,7 +16,7 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index ba1e33c..52cac75 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -9,7 +9,7 @@ dist_project_lib_DATA = startup/bsp_specs
# include
# start
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 3661c0f..622a74d 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -8,7 +8,7 @@ dist_project_lib_DATA = startup/bsp_specs
# include
# start
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT)
@@ -32,7 +32,7 @@ librtemsbsp_a_SOURCES += ../../shared/bspreset.c
librtemsbsp_a_SOURCES += start/start.S
# clock & timer
-librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
# console
librtemsbsp_a_SOURCES += startup/dummy_console.c
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index 34f1c4d..e36e969 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am
@@ -42,7 +42,7 @@ librtemsbsp_a_SOURCES += timer/timer.c
# scitab
librtemsbsp_a_SOURCES += scitab.c
# console
-librtemsbsp_a_SOURCES += ../../sh/shared/console.c
+librtemsbsp_a_SOURCES += ../shared/console.c
librtemsbsp_a_SOURCES += console/sci.c
# debugio
librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am
index 2255aac..f341988 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am
@@ -44,7 +44,7 @@ librtemsbsp_a_SOURCES += timer/timer.c
# scitab
librtemsbsp_a_SOURCES += scitab.c
# console
-librtemsbsp_a_SOURCES += ../../sh/shared/console.c
+librtemsbsp_a_SOURCES += ../shared/console.c
librtemsbsp_a_SOURCES += console/config.c
librtemsbsp_a_SOURCES += console/sci.c
librtemsbsp_a_SOURCES += console/sci_termios.c
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index e25977a..f05a7d8 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -9,7 +9,7 @@ dist_project_lib_DATA = startup/bsp_specs
noinst_PROGRAMS =
-start.$(OBJEXT): ../../sparc/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
@@ -22,7 +22,7 @@ librtemsbsp_a_SOURCES =
# startup
librtemsbsp_a_SOURCES += ../../shared/bspclean.c
librtemsbsp_a_SOURCES += startup/bsppredriver.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
librtemsbsp_a_SOURCES += ../../shared/bspreset.c
librtemsbsp_a_SOURCES += ../../shared/bspstart.c
librtemsbsp_a_SOURCES += ../../shared/bootcard.c
@@ -34,14 +34,14 @@ librtemsbsp_a_SOURCES += startup/erc32mec.c
librtemsbsp_a_SOURCES += startup/boardinit.S
librtemsbsp_a_SOURCES += startup/bspidle.c
librtemsbsp_a_SOURCES += startup/bspdelay.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/startup/bsp_fatal_exit.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/startup/bsp_fatal_halt.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsp_fatal_exit.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsp_fatal_halt.c
# ISR Handler
-librtemsbsp_a_SOURCES += ../../sparc/shared/cpu.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
+librtemsbsp_a_SOURCES += ../shared/cpu.c
+librtemsbsp_a_SOURCES += ../shared/irq_asm.S
# gnatsupp
librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/gnatcommon.c
+librtemsbsp_a_SOURCES += ../shared/gnatcommon.c
# console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
@@ -55,8 +55,8 @@ librtemsbsp_a_SOURCES += clock/ckinit.c
librtemsbsp_a_SOURCES += timer/timer.c
# IRQ
-librtemsbsp_a_SOURCES += ../../sparc/shared/irq/irq-shared.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/irq/bsp_isr_handler.c
+librtemsbsp_a_SOURCES += ../shared/irq/irq-shared.c
+librtemsbsp_a_SOURCES += ../shared/irq/bsp_isr_handler.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
if HAS_SMP
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index c16c918..97a0b0d 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -9,7 +9,7 @@ dist_project_lib_DATA = startup/bsp_specs
noinst_PROGRAMS =
-start.$(OBJEXT): ../../sparc/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += ../../shared/bspclean.c
librtemsbsp_a_SOURCES += startup/bsppredriver.c
librtemsbsp_a_SOURCES += ../../shared/bspreset.c
librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
librtemsbsp_a_SOURCES += ../../shared/bootcard.c
librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += ../../shared/sbrk.c
@@ -34,127 +34,127 @@ librtemsbsp_a_SOURCES += startup/setvec.c
librtemsbsp_a_SOURCES += startup/spurious.c
librtemsbsp_a_SOURCES += startup/bspidle.c
librtemsbsp_a_SOURCES += startup/bspdelay.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/startup/bsp_fatal_exit.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/startup/bsp_fatal_halt.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsp_fatal_exit.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsp_fatal_halt.c
# ISR Handler
-librtemsbsp_a_SOURCES += ../../sparc/shared/cpu.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
+librtemsbsp_a_SOURCES += ../shared/cpu.c
+librtemsbsp_a_SOURCES += ../shared/irq_asm.S
# gnatsupp
librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/gnatcommon.c
+librtemsbsp_a_SOURCES += ../shared/gnatcommon.c
# console
librtemsbsp_a_SOURCES += console/console.c
librtemsbsp_a_SOURCES += console/debugputs.c
# clock
librtemsbsp_a_SOURCES += clock/ckinit.c
# IRQ
-librtemsbsp_a_SOURCES += ../../sparc/shared/irq/genirq.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/irq/irq-shared.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/irq/bsp_isr_handler.c
+librtemsbsp_a_SOURCES += ../shared/irq/genirq.c
+librtemsbsp_a_SOURCES += ../shared/irq/irq-shared.c
+librtemsbsp_a_SOURCES += ../shared/irq/bsp_isr_handler.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
# AMBA bus
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_count.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_depth.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_find_by_idx.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_freq.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_parent.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_old.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_names.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_alloc.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_count.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_depth.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_find_by_idx.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_freq.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_parent.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_old.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_names.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_show.c
+librtemsbsp_a_SOURCES += ../shared/amba/ahbstat.c
# Clock Driver and Timer Library
-librtemsbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c
+librtemsbsp_a_SOURCES += ../shared/timer/gptimer.c
+librtemsbsp_a_SOURCES += ../shared/timer/tlib.c
# PCI
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/grpci2dma.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/pcif.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_le.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_be.c
+librtemsbsp_a_SOURCES += ../shared/pci/grpci2.c
+librtemsbsp_a_SOURCES += ../shared/pci/grpci2dma.c
+librtemsbsp_a_SOURCES += ../shared/pci/grpci.c
+librtemsbsp_a_SOURCES += ../shared/pci/pcif.c
+librtemsbsp_a_SOURCES += ../shared/pci/pci_memreg_sparc_le.c
+librtemsbsp_a_SOURCES += ../shared/pci/pci_memreg_sparc_be.c
librtemsbsp_a_SOURCES += pci/at697_pci.c
# PCI target devices
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_701.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_adcdac.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_io.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_spw_router.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_tmtc.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_leon4_n2x.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_cpci_gr740.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_701.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_rasta_adcdac.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_rasta_io.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_rasta_spw_router.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_rasta_tmtc.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_leon4_n2x.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_cpci_gr740.c
# B1553BRM
-librtemsbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c
+librtemsbsp_a_SOURCES += ../shared/1553/b1553brm.c
+librtemsbsp_a_SOURCES += ../shared/1553/b1553rt.c
# GR1553B
-librtemsbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c
+librtemsbsp_a_SOURCES += ../shared/1553/gr1553b.c
+librtemsbsp_a_SOURCES += ../shared/1553/gr1553bc.c
+librtemsbsp_a_SOURCES += ../shared/1553/gr1553bm.c
+librtemsbsp_a_SOURCES += ../shared/1553/gr1553rt.c
# CAN
-librtemsbsp_a_SOURCES += ../../sparc/shared/can/occan.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/can/grcan.c
+librtemsbsp_a_SOURCES += ../shared/can/occan.c
+librtemsbsp_a_SOURCES += ../shared/can/grcan.c
# SpaceWire
if !HAS_SMP
-librtemsbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c
+librtemsbsp_a_SOURCES += ../shared/spw/grspw.c
endif
-librtemsbsp_a_SOURCES += ../../sparc/shared/spw/grspw_pkt.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c
+librtemsbsp_a_SOURCES += ../shared/spw/grspw_pkt.c
+librtemsbsp_a_SOURCES += ../shared/spw/grspw_router.c
# UART (RAW)
# I2CMST
-librtemsbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c
+librtemsbsp_a_SOURCES += ../shared/i2c/i2cmst.c
# SPI
-librtemsbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c
+librtemsbsp_a_SOURCES += ../shared/spi/spictrl.c
# TIME
-librtemsbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/time/grctm.c
+librtemsbsp_a_SOURCES += ../shared/time/spwcuc.c
+librtemsbsp_a_SOURCES += ../shared/time/grctm.c
# GPIO
-librtemsbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c
+librtemsbsp_a_SOURCES += ../shared/gpio/grgpio.c
+librtemsbsp_a_SOURCES += ../shared/gpio/gpiolib.c
# PWM
-librtemsbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c
+librtemsbsp_a_SOURCES += ../shared/pwm/grpwm.c
# ADC and DAC
-librtemsbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c
+librtemsbsp_a_SOURCES += ../shared/analog/gradcdac.c
# Memory controllers
-librtemsbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c
+librtemsbsp_a_SOURCES += ../shared/mem/mctrl.c
# l2cache
-librtemsbsp_a_SOURCES += ../../sparc/shared/l2c/l2c.c
+librtemsbsp_a_SOURCES += ../shared/l2c/l2c.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/start/cache.c
# griommu
-librtemsbsp_a_SOURCES += ../../sparc/shared/iommu/griommu.c
+librtemsbsp_a_SOURCES += ../shared/iommu/griommu.c
# timer
librtemsbsp_a_SOURCES += timer/timer.c
# TM/TC
-librtemsbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c
+librtemsbsp_a_SOURCES += ../shared/tmtc/grtc.c
+librtemsbsp_a_SOURCES += ../shared/tmtc/grtm.c
# MEMSCRUB
-librtemsbsp_a_SOURCES += ../../sparc/shared/scrub/memscrub.c
+librtemsbsp_a_SOURCES += ../shared/scrub/memscrub.c
# L4STAT
-librtemsbsp_a_SOURCES += ../../sparc/shared/stat/l4stat.c
+librtemsbsp_a_SOURCES += ../shared/stat/l4stat.c
# Driver Manager
-librtemsbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus_leon2.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/drvmgr/leon2_amba_bus.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/drvmgr/get_resarray_count.c
+librtemsbsp_a_SOURCES += ../shared/drvmgr/ambapp_bus.c
+librtemsbsp_a_SOURCES += ../shared/drvmgr/ambapp_bus_leon2.c
+librtemsbsp_a_SOURCES += ../shared/drvmgr/leon2_amba_bus.c
+librtemsbsp_a_SOURCES += ../shared/drvmgr/get_resarray_count.c
if HAS_SMP
librtemsbsp_a_SOURCES += ../../shared/bspsmp.c
@@ -164,8 +164,8 @@ endif
if HAS_NETWORKING
librtemsbsp_a_SOURCES += leon_smc91111/leon_smc91111.c
librtemsbsp_a_SOURCES += leon_open_eth/leon_open_eth.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/net/greth.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
+librtemsbsp_a_SOURCES += ../shared/net/greth.c
+librtemsbsp_a_SOURCES += ../shared/net/network_interface_add.c
endif
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index 0a1dc11..86a6564 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -9,7 +9,7 @@ dist_project_lib_DATA = startup/bsp_specs
noinst_PROGRAMS =
-start.$(OBJEXT): ../../sparc/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
@@ -30,7 +30,7 @@ librtemsbsp_a_SOURCES += ../../shared/bootcard.c
librtemsbsp_a_SOURCES += startup/bspstart.c
librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += startup/bsppredriver.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
librtemsbsp_a_SOURCES += ../../shared/sbrk.c
librtemsbsp_a_SOURCES += startup/setvec.c
librtemsbsp_a_SOURCES += startup/spurious.c
@@ -38,142 +38,142 @@ librtemsbsp_a_SOURCES += startup/bspidle.S
librtemsbsp_a_SOURCES += startup/bspdelay.c
librtemsbsp_a_SOURCES += ../../shared/bspreset.c
librtemsbsp_a_SOURCES += startup/cpucounter.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/startup/bsp_fatal_exit.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsp_fatal_exit.c
librtemsbsp_a_SOURCES += startup/bsp_fatal_halt.c
# ISR Handler
-librtemsbsp_a_SOURCES += ../../sparc/shared/cpu.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
+librtemsbsp_a_SOURCES += ../shared/cpu.c
+librtemsbsp_a_SOURCES += ../shared/irq_asm.S
# gnatsupp
librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/gnatcommon.c
+librtemsbsp_a_SOURCES += ../shared/gnatcommon.c
# AMBA bus
librtemsbsp_a_SOURCES += amba/amba.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_count.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_depth.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_find_by_idx.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_freq.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_parent.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_old.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_names.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_alloc.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_count.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_depth.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_find_by_idx.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_freq.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_parent.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_old.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_names.c
+librtemsbsp_a_SOURCES += ../shared/amba/ambapp_show.c
+librtemsbsp_a_SOURCES += ../shared/amba/ahbstat.c
# Clock Driver and Timer Library
-librtemsbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/timer/tlib_ckinit.c
+librtemsbsp_a_SOURCES += ../shared/timer/gptimer.c
+librtemsbsp_a_SOURCES += ../shared/timer/tlib.c
+librtemsbsp_a_SOURCES += ../shared/timer/tlib_ckinit.c
# non-Driver Manager Clock Implementation
librtemsbsp_a_SOURCES += clock/ckinit.c
# console
librtemsbsp_a_SOURCES += ../../shared/console-termios.c
librtemsbsp_a_SOURCES += console/console.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/uart/cons.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_cons.c
+librtemsbsp_a_SOURCES += ../shared/uart/cons.c
+librtemsbsp_a_SOURCES += ../shared/uart/apbuart_cons.c
# debugio
librtemsbsp_a_SOURCES += console/printk_support.c
# IRQ
librtemsbsp_a_SOURCES += startup/eirq.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/irq/genirq.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/irq/irq-shared.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/irq/bsp_isr_handler.c
+librtemsbsp_a_SOURCES += ../shared/irq/genirq.c
+librtemsbsp_a_SOURCES += ../shared/irq/irq-shared.c
+librtemsbsp_a_SOURCES += ../shared/irq/bsp_isr_handler.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
# PCI
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/grpci2dma.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/pcif.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_le.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_be.c
+librtemsbsp_a_SOURCES += ../shared/pci/grpci.c
+librtemsbsp_a_SOURCES += ../shared/pci/grpci2.c
+librtemsbsp_a_SOURCES += ../shared/pci/grpci2dma.c
+librtemsbsp_a_SOURCES += ../shared/pci/pcif.c
+librtemsbsp_a_SOURCES += ../shared/pci/pci_memreg_sparc_le.c
+librtemsbsp_a_SOURCES += ../shared/pci/pci_memreg_sparc_be.c
# PCI target devices
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_701.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_adcdac.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_io.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_spw_router.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_tmtc.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_tmtc_1553.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_leon4_n2x.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/pci/gr_cpci_gr740.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_701.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_rasta_adcdac.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_rasta_io.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_rasta_spw_router.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_rasta_tmtc.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_tmtc_1553.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_leon4_n2x.c
+librtemsbsp_a_SOURCES += ../shared/pci/gr_cpci_gr740.c
# B1553BRM
-librtemsbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c
+librtemsbsp_a_SOURCES += ../shared/1553/b1553brm.c
+librtemsbsp_a_SOURCES += ../shared/1553/b1553rt.c
# GR1553B
-librtemsbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c
+librtemsbsp_a_SOURCES += ../shared/1553/gr1553b.c
+librtemsbsp_a_SOURCES += ../shared/1553/gr1553bc.c
+librtemsbsp_a_SOURCES += ../shared/1553/gr1553bm.c
+librtemsbsp_a_SOURCES += ../shared/1553/gr1553rt.c
# CAN
-librtemsbsp_a_SOURCES += ../../sparc/shared/can/occan.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/can/grcan.c
+librtemsbsp_a_SOURCES += ../shared/can/occan.c
+librtemsbsp_a_SOURCES += ../shared/can/grcan.c
# SpaceWire
if !HAS_SMP
-librtemsbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c
+librtemsbsp_a_SOURCES += ../shared/spw/grspw.c
endif
-librtemsbsp_a_SOURCES += ../../sparc/shared/spw/grspw_pkt.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c
+librtemsbsp_a_SOURCES += ../shared/spw/grspw_pkt.c
+librtemsbsp_a_SOURCES += ../shared/spw/grspw_router.c
# UART
-librtemsbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_termios.c
+librtemsbsp_a_SOURCES += ../shared/uart/apbuart_termios.c
# I2CMST
-librtemsbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c
+librtemsbsp_a_SOURCES += ../shared/i2c/i2cmst.c
# SPI
-librtemsbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c
+librtemsbsp_a_SOURCES += ../shared/spi/spictrl.c
# TIME
-librtemsbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/time/grctm.c
+librtemsbsp_a_SOURCES += ../shared/time/spwcuc.c
+librtemsbsp_a_SOURCES += ../shared/time/grctm.c
# GPIO
-librtemsbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c
+librtemsbsp_a_SOURCES += ../shared/gpio/grgpio.c
+librtemsbsp_a_SOURCES += ../shared/gpio/gpiolib.c
# PWM
-librtemsbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c
+librtemsbsp_a_SOURCES += ../shared/pwm/grpwm.c
# ADC and DAC
-librtemsbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c
+librtemsbsp_a_SOURCES += ../shared/analog/gradcdac.c
# Memory controllers
-librtemsbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c
+librtemsbsp_a_SOURCES += ../shared/mem/mctrl.c
# l2cache
-librtemsbsp_a_SOURCES += ../../sparc/shared/l2c/l2c.c
+librtemsbsp_a_SOURCES += ../shared/l2c/l2c.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/cache.c
# griommu
-librtemsbsp_a_SOURCES += ../../sparc/shared/iommu/griommu.c
+librtemsbsp_a_SOURCES += ../shared/iommu/griommu.c
# timer
librtemsbsp_a_SOURCES += timer/timer.c
librtemsbsp_a_SOURCES += timer/watchdog.c
# GR712
-librtemsbsp_a_SOURCES += ../../sparc/shared/ascs/grascs.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/can/satcan.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/can/canmux.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/slink/grslink.c
+librtemsbsp_a_SOURCES += ../shared/ascs/grascs.c
+librtemsbsp_a_SOURCES += ../shared/can/satcan.c
+librtemsbsp_a_SOURCES += ../shared/can/canmux.c
+librtemsbsp_a_SOURCES += ../shared/slink/grslink.c
# TM/TC
-librtemsbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c
+librtemsbsp_a_SOURCES += ../shared/tmtc/grtc.c
+librtemsbsp_a_SOURCES += ../shared/tmtc/grtm.c
# MEMSCRUB
-librtemsbsp_a_SOURCES += ../../sparc/shared/scrub/memscrub.c
+librtemsbsp_a_SOURCES += ../shared/scrub/memscrub.c
# L4STAT
-librtemsbsp_a_SOURCES += ../../sparc/shared/stat/l4stat.c
+librtemsbsp_a_SOURCES += ../shared/stat/l4stat.c
# Driver Manager
-librtemsbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus_grlib.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/drvmgr/get_resarray_count.c
+librtemsbsp_a_SOURCES += ../shared/drvmgr/ambapp_bus.c
+librtemsbsp_a_SOURCES += ../shared/drvmgr/ambapp_bus_grlib.c
+librtemsbsp_a_SOURCES += ../shared/drvmgr/get_resarray_count.c
if HAS_SMP
librtemsbsp_a_SOURCES += startup/bspsmp.c
@@ -182,8 +182,8 @@ endif
if HAS_NETWORKING
librtemsbsp_a_SOURCES += leon_smc91111/leon_smc91111.c
librtemsbsp_a_SOURCES += leon_open_eth/leon_open_eth.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/net/greth.c
-librtemsbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
+librtemsbsp_a_SOURCES += ../shared/net/greth.c
+librtemsbsp_a_SOURCES += ../shared/net/network_interface_add.c
if !HAS_SMP
librtemsbsp_a_SOURCES += leon_greth/leon_greth.c
endif
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
index dcad9e1..0ad0e08 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
+++ b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += ../../shared/sbrk.c
librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += ../../v850/shared/crt1.c
+librtemsbsp_a_SOURCES += ../shared/crt1.c
librtemsbsp_a_SOURCES += startup/trap.S
librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
More information about the vc
mailing list