From baa3c91ecb8a3b48ef387b938fcdb6e60b5bdc8a Mon Sep 17 00:00:00 2001
From: Hesham ALMatary <heshamelmatary@gmail.com>
Date: Fri, 22 Aug 2014 15:22:37 -0500
Subject: or1ksim BSP: Include cache manager stubs, and re-generate
 preinstall.am files.

---
 c/src/lib/libbsp/or1k/or1ksim/Makefile.am   |  9 +++-
 c/src/lib/libbsp/or1k/or1ksim/preinstall.am | 71 +++++++++++++++--------------
 c/src/lib/libbsp/or1k/preinstall.am         |  2 +-
 3 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/c/src/lib/libbsp/or1k/or1ksim/Makefile.am b/c/src/lib/libbsp/or1k/or1ksim/Makefile.am
index d5eb10c28e..f1315c404a 100644
--- a/c/src/lib/libbsp/or1k/or1ksim/Makefile.am
+++ b/c/src/lib/libbsp/or1k/or1ksim/Makefile.am
@@ -9,7 +9,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 
 include_bspdir = $(includedir)/bsp
-#include_libcpudir = $(includedir)/libcpu
+include_libcpudir = $(includedir)/libcpu
 
 dist_project_lib_DATA = bsp_specs
 
@@ -21,7 +21,6 @@ include_bsp_HEADERS =
 include_HEADERS = include/bsp.h
 
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
 include_bsp_HEADERS += ../shared/include/linker-symbols.h
 include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h
 include_bsp_HEADERS += ../../shared/include/utility.h
@@ -99,6 +98,12 @@ libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
 libbsp_a_SOURCES += ../../shared/src/irq-generic.c
 libbsp_a_SOURCES += ../../shared/src/irq-info.c
 libbsp_a_SOURCES += irq/irq.c
+
+# Cache
+libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c
+libbsp_a_SOURCES += ../../shared/include/cache_.h
+libbsp_a_CPPFLAGS = -I$(srcdir)/../../shared/include
+
 ###############################################################################
 #                  Special Rules                                              #
 ###############################################################################
diff --git a/c/src/lib/libbsp/or1k/or1ksim/preinstall.am b/c/src/lib/libbsp/or1k/or1ksim/preinstall.am
index e75733cc3b..cbdf3dfb52 100644
--- a/c/src/lib/libbsp/or1k/or1ksim/preinstall.am
+++ b/c/src/lib/libbsp/or1k/or1ksim/preinstall.am
@@ -2,113 +2,118 @@
 
 if AMPOLISH3
 $(srcdir)/preinstall.am: Makefile.am
-       $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
+	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
 endif
 
 PREINSTALL_DIRS =
 DISTCLEANFILES += $(PREINSTALL_DIRS)
 
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES = $(TMPINSTALL_FILES)
-
 all-am: $(PREINSTALL_FILES)
 
 PREINSTALL_FILES =
-CLEANFILES += $(PREINSTALL_FILES)
+CLEANFILES = $(PREINSTALL_FILES)
+
+all-local: $(TMPINSTALL_FILES)
+
+TMPINSTALL_FILES =
+CLEANFILES += $(TMPINSTALL_FILES)
 
 $(PROJECT_LIB)/$(dirstamp):
-       @$(MKDIR_P) $(PROJECT_LIB)
-       @: > $(PROJECT_LIB)/$(dirstamp)
+	@$(MKDIR_P) $(PROJECT_LIB)
+	@: > $(PROJECT_LIB)/$(dirstamp)
 PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
 
 $(PROJECT_INCLUDE)/$(dirstamp):
-       @$(MKDIR_P) $(PROJECT_INCLUDE)
-       @: > $(PROJECT_INCLUDE)/$(dirstamp)
+	@$(MKDIR_P) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
 
 $(PROJECT_INCLUDE)/bsp/$(dirstamp):
-       @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-       @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
+	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
+	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
+	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+
 $(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
 PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
 
 $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
 
 $(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
 
 $(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
 
 $(PROJECT_INCLUDE)/bsp/mm.h: ../../../libbsp/shared/include/mm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mm.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mm.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mm.h
 
 $(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
 
 $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
 
 $(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
 
 $(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
 
 $(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.h
 
 $(PROJECT_INCLUDE)/bsp/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tod.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tod.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tod.h
 
 $(PROJECT_INCLUDE)/bsp/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tm27.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tm27.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tm27.h
 
 $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
 
 $(PROJECT_INCLUDE)/bsp/uart.h: include/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
 
 $(PROJECT_INCLUDE)/bsp/or1ksim.h: include/or1ksim.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/or1ksim.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/or1ksim.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/or1ksim.h
 
 $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
 $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
 
 $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
 
 $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
 TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
 
 $(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-       $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
 TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
diff --git a/c/src/lib/libbsp/or1k/preinstall.am b/c/src/lib/libbsp/or1k/preinstall.am
index fe8d090bb2..1143c2ed28 100644
--- a/c/src/lib/libbsp/or1k/preinstall.am
+++ b/c/src/lib/libbsp/or1k/preinstall.am
@@ -2,5 +2,5 @@
 
 if AMPOLISH3
 $(srcdir)/preinstall.am: Makefile.am
-       $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
+	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
 endif
-- 
cgit v1.2.3