1 files changed, 92 insertions, 20 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc5xx/Makefile.am
index 582a354de6..2e035eac11 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/Makefile.am
@@ -10,14 +10,49 @@ noinst_DATA =
 include $(top_srcdir)/../../../automake/compile.am
 
 if mpc5xx
+include_mpc5xxdir = $(includedir)/mpc5xx
 include_libcpudir = $(includedir)/libcpu
 
-# exceptions
+include_HEADERS = include/mpc5xx.h
+
+## clock
+EXTRA_PROGRAMS += clock.rel
+CLEANFILES += clock.rel
+clock_rel_SOURCES = clock/clock.c
+clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += clock_g.rel
+CLEANFILES += clock_g.rel
+clock_g_rel_SOURCES = $(clock_rel_SOURCES)
+clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += clock$(LIB_VARIANT).rel
+
+## console-generic
+include_mpc5xx_HEADERS = include/console.h
+
+EXTRA_PROGRAMS += console-generic.rel
+CLEANFILES += console-generic.rel
+console_generic_rel_SOURCES = console-generic/console-generic.c
+console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += console-generic_g.rel
+CLEANFILES += console-generic_g.rel
+console_generic_g_rel_SOURCES = $(console_generic_rel_SOURCES)
+console_generic_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+console_generic_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += console-generic$(LIB_VARIANT).rel
+
+## exceptions
 include_libcpu_HEADERS = exceptions/raw_exception.h
 
 EXTRA_PROGRAMS += exceptions.rel
 CLEANFILES += exceptions.rel
-exceptions_rel_SOURCES = exceptions/raw_exception.c exceptions/asm_utils.S
+exceptions_rel_SOURCES = exceptions/raw_exception.c
 exceptions_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 exceptions_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
@@ -29,24 +64,24 @@ exceptions_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 noinst_DATA += exceptions$(LIB_VARIANT).rel
 
-# ictrl
-include_HEADERS = ictrl/ictrl.h
+## irq
+include_libcpu_HEADERS += irq/irq.h
 
-EXTRA_PROGRAMS += ictrl.rel
-CLEANFILES += ictrl.rel
-ictrl_rel_SOURCES = ictrl/ictrl.c ictrl/ictrl.h
-ictrl_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
-ictrl_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+EXTRA_PROGRAMS += irq.rel
+CLEANFILES += irq.rel
+irq_rel_SOURCES = irq/irq.c irq/irq_init.c irq/irq_asm.S
+irq_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += ictrl_g.rel
-CLEANFILES += ictrl_g.rel
-ictrl_g_rel_SOURCES = $(ictrl_rel_SOURCES)
-ictrl_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-ictrl_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+EXTRA_PROGRAMS += irq_g.rel
+CLEANFILES += irq_g.rel
+irq_g_rel_SOURCES = $(irq_rel_SOURCES)
+irq_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+irq_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-noinst_DATA += ictrl$(LIB_VARIANT).rel
+noinst_DATA += irq$(LIB_VARIANT).rel
 
-# timer
+## timer
 EXTRA_PROGRAMS += timer.rel
 CLEANFILES += timer.rel
 timer_rel_SOURCES = timer/timer.c
@@ -60,8 +95,28 @@ timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 noinst_DATA += timer$(LIB_VARIANT).rel
+
+## vectors
+include_libcpu_HEADERS += vectors/vectors.h
+
+EXTRA_PROGRAMS += vectors.rel
+CLEANFILES += vectors.rel
+vectors_rel_SOURCES = vectors/vectors_init.c vectors/vectors.S
+vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += vectors_g.rel
+CLEANFILES += vectors_g.rel
+vectors_g_rel_SOURCES = $(vectors_rel_SOURCES)
+vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += vectors$(LIB_VARIANT).rel
 endif
 
+## --
+all-local: $(PREINSTALL_FILES)
+
 PREINSTALL_DIRS =
 PREINSTALL_FILES =
 
@@ -71,21 +126,38 @@ $(PROJECT_INCLUDE)/$(dirstamp):
 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
 
 if mpc5xx
+$(PROJECT_INCLUDE)/mpc5xx/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/mpc5xx
+	@: > $(PROJECT_INCLUDE)/mpc5xx/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc5xx/$(dirstamp)
+
 $(PROJECT_INCLUDE)/libcpu/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
 	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
 
+$(PROJECT_INCLUDE)/mpc5xx.h: include/mpc5xx.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc5xx.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc5xx.h
+
+$(PROJECT_INCLUDE)/mpc5xx/console.h: include/console.h $(PROJECT_INCLUDE)/mpc5xx/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc5xx/console.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc5xx/console.h
+
 $(PROJECT_INCLUDE)/libcpu/raw_exception.h: exceptions/raw_exception.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/raw_exception.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/raw_exception.h
 
-$(PROJECT_INCLUDE)/ictrl.h: ictrl/ictrl.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ictrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ictrl.h
+$(PROJECT_INCLUDE)/libcpu/irq.h: irq/irq.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/irq.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/irq.h
+
+$(PROJECT_INCLUDE)/libcpu/vectors.h: vectors/vectors.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/vectors.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/vectors.h
 endif
 
 CLEANFILES += $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am