From 123f579105b322ea846dbc78f00aff6dfab28552 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sun, 14 Jan 2024 20:35:05 +0100
Subject: [PATCH] fixes include paths

---
 .cproject                | 42 ++++++++++++++++++++++++++++++++++++++++
 .project                 | 27 ++++++++++++++++++++++++++
 env/TGC5L/platform.h     |  2 +-
 env/ehrenberg/init.c     |  1 -
 env/ehrenberg/platform.h | 12 +++++-------
 env/entry.S              |  2 +-
 env/hifive1/init.c       |  2 +-
 env/iss/platform.h       |  2 +-
 env/tgc-vp/platform.h    |  2 +-
 9 files changed, 79 insertions(+), 13 deletions(-)
 create mode 100644 .cproject
 create mode 100644 .project

diff --git a/.cproject b/.cproject
new file mode 100644
index 0000000..d66b3fa
--- /dev/null
+++ b/.cproject
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.1610975709">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.1610975709" moduleId="org.eclipse.cdt.core.settings" name="Default">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration buildProperties="" id="cdt.managedbuild.toolchain.gnu.base.1610975709" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1610975709.1546824349" name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.base.759422847" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.1243356996" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
+							<builder id="cdt.managedbuild.target.gnu.builder.base.1892113927" managedBuildOn="false" name="Gnu Make Builder.Default" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1296149061" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.407512210" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1062663578" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.774157935" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.1756027799" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.base.236534392" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="bm-bsp.null.406870477" name="bm-bsp"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+</cproject>
\ No newline at end of file
diff --git a/.project b/.project
new file mode 100644
index 0000000..7ac613c
--- /dev/null
+++ b/.project
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>bm-bsp</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>
diff --git a/env/TGC5L/platform.h b/env/TGC5L/platform.h
index e5115cc..7dbb739 100644
--- a/env/TGC5L/platform.h
+++ b/env/TGC5L/platform.h
@@ -7,7 +7,7 @@
 #define MCAUSE_INT         0x80000000
 #define MCAUSE_CAUSE       0x7FFFFFFF
 
-#include "rtl/const.h"
+#include "bits.h"
 /****************************************************************************
  * Platform definitions
  *****************************************************************************/
diff --git a/env/ehrenberg/init.c b/env/ehrenberg/init.c
index e1fc54e..2ae1f7a 100644
--- a/env/ehrenberg/init.c
+++ b/env/ehrenberg/init.c
@@ -4,7 +4,6 @@
 
 #include "platform.h"
 #include "encoding.h"
-#include <ehrenberg/devices.h>
 
 #if __riscv_xlen == 32
 #define MCAUSE_INT         0x80000000UL
diff --git a/env/ehrenberg/platform.h b/env/ehrenberg/platform.h
index 632f54d..cec65bd 100644
--- a/env/ehrenberg/platform.h
+++ b/env/ehrenberg/platform.h
@@ -7,15 +7,13 @@
 #define MCAUSE_INT         0x80000000
 #define MCAUSE_CAUSE       0x7FFFFFFF
 
-#include "ehrenberg/const.h"
-
 #define APB_BUS
 
-#include "devices/gpio.h"
-#include "devices/interrupt.h"
-#include "devices/timer.h"
-#include "devices/uart.h"
-#include "devices/qspi.h"
+#include "ehrenberg/devices/gpio.h"
+#include "ehrenberg/devices/interrupt.h"
+#include "ehrenberg/devices/timer.h"
+#include "ehrenberg/devices/uart.h"
+#include "ehrenberg/devices/qspi.h"
 
 #define PERIPH(TYPE, ADDR) ((volatile TYPE*) (ADDR))
 
diff --git a/env/entry.S b/env/entry.S
index 982c664..fef8b9e 100644
--- a/env/entry.S
+++ b/env/entry.S
@@ -4,7 +4,7 @@
 #define ENTRY_S
 
 #include "encoding.h"
-#include "rtl/bits.h"
+#include "bits.h"
 
   .section      .text.entry	
   .align 2
diff --git a/env/hifive1/init.c b/env/hifive1/init.c
index 1e6c7aa..621a6e2 100644
--- a/env/hifive1/init.c
+++ b/env/hifive1/init.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "../hifive1/platform.h"
+#include "platform.h"
 #include "encoding.h"
 
 extern int main(int argc, char** argv);
diff --git a/env/iss/platform.h b/env/iss/platform.h
index 59e6fd5..6c70be3 100644
--- a/env/iss/platform.h
+++ b/env/iss/platform.h
@@ -7,7 +7,7 @@
 #define MCAUSE_INT         0x80000000
 #define MCAUSE_CAUSE       0x7FFFFFFF
 
-#include "rtl/const.h"
+#include "bits.h"
 /****************************************************************************
  * Platform definitions
  *****************************************************************************/
diff --git a/env/tgc-vp/platform.h b/env/tgc-vp/platform.h
index e92d254..9c6caa7 100644
--- a/env/tgc-vp/platform.h
+++ b/env/tgc-vp/platform.h
@@ -7,7 +7,7 @@
 #define MCAUSE_INT         0x80000000
 #define MCAUSE_CAUSE       0x7FFFFFFF
 
-#include "tgc-vp/const.h"
+#include "bits.h"
 #include "tgc-vp/devices/aon.h"
 #include "tgc-vp/devices/clint.h"
 #include "tgc-vp/devices/gpio.h"