Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compilation fix #422

Merged
merged 70 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
fd12f2d
sw Makefile and general readme minor modifications
JoseCalero Aug 11, 2022
135c9d3
Merge branch 'main' into main
JoseCalero Aug 12, 2022
4945c02
updating with upstream main
JoseCalero Aug 17, 2022
059e67c
fix uart pins and spi flash memory size
JoseCalero Aug 25, 2022
058a58b
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Aug 26, 2022
2551109
Added macro for uart baudrate by default based on the target
JoseCalero Aug 26, 2022
57e2303
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Aug 29, 2022
d1cc7d2
linker modification for the flash (.data section being in wrong place)
JoseCalero Aug 29, 2022
e7446ba
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Sep 13, 2022
c5599f3
Merge branch 'esl-epfl:main' into main
JoseCalero Oct 18, 2022
aa1e5a4
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Oct 25, 2022
bd75bfa
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Oct 28, 2022
e504411
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Oct 31, 2022
29dca2d
Added cmake + cpp with the same upstream folder structure
JoseCalero Oct 31, 2022
0947793
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Nov 9, 2022
2351ef9
Update + minor changes cmake
JoseCalero Dec 16, 2022
b336f9d
Major commit includding Makefile doc automatisation, CMake, and FreeR…
JoseCalero Jan 5, 2023
e339eaa
Merge remote-tracking branch 'upstream/main'
JoseCalero Jan 5, 2023
9a25bf8
Minor permission changes
JoseCalero Jan 5, 2023
f9a9629
Update README.md
JoseCalero Jan 23, 2023
58e43e4
Minor CMake, linker, freeRTOS, and Makefile modifications
JoseCalero Jan 24, 2023
1238aa4
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Jan 24, 2023
2845068
FPGA testing + commands automatizations
JoseCalero Jan 25, 2023
e2a462a
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Feb 13, 2023
052007b
Updating readme and app for freertos
JoseCalero Feb 14, 2023
db39d42
CMake auto backend
JoseCalero Feb 27, 2023
8cb859b
fix CMake include list
JoseCalero Feb 27, 2023
5d47c35
minor update
JoseCalero Feb 27, 2023
48065d9
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Feb 27, 2023
1eae6f8
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Mar 31, 2023
a1d91d3
Using the needed HEAP for the current freeRTOS example
JoseCalero Mar 31, 2023
7a5362b
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Apr 4, 2023
b32277a
Fixing apps and CMakeLists
JoseCalero Apr 4, 2023
d8d6e2a
Re-adjust ram. Re-size also stack and heap for on-chip linker
JoseCalero Apr 5, 2023
ad419db
Add comment hjson
JoseCalero Apr 5, 2023
1b6b468
Modify Readme
JoseCalero Apr 5, 2023
d177a8e
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Apr 5, 2023
47dcad1
Merge remote-tracking branch 'upstream/main' into main
JoseCalero Apr 5, 2023
7635837
Updating CMake backend
JoseCalero May 9, 2023
3de5278
Merge branch 'esl-epfl:main' into main
JoseCalero May 9, 2023
6b33bbd
Change crt logic based on supported preprocessor variables
JoseCalero May 15, 2023
3ad1040
Merge remote-tracking branch 'upstream/main' into main
JoseCalero May 15, 2023
e332d09
Added vector file for freertos
JoseCalero May 15, 2023
edff111
Merge branch 'esl-epfl:main' into app_fix
JoseCalero May 17, 2023
1ec980e
Fix compilation issues with some APPs
JoseCalero May 17, 2023
013bd49
Merge branch 'esl-epfl:main' into app_fix
JoseCalero May 17, 2023
40af91f
Added script to compile them all
JoseCalero May 18, 2023
8e3b578
Added script file
JoseCalero May 18, 2023
bd5fab3
Merge branch 'esl-epfl:main' into main
JoseCalero May 24, 2023
92784ce
Merge branch 'esl-epfl:main' into main
JoseCalero May 31, 2023
868c4ec
Fill linker flash load up to __boot_address
JoseCalero May 31, 2023
27d4dda
Merge branch 'esl-epfl:main' into main
JoseCalero Jul 28, 2023
162b16b
Merge branch 'esl-epfl:main' into main
JoseCalero Sep 6, 2023
ca75899
Added SES support
JoseCalero Sep 6, 2023
d4ceebb
Minor fixes, read, delete some files, add 2nd image
JoseCalero Sep 7, 2023
8f6ce8a
Update IDEs.md
JoseCalero Sep 7, 2023
2966b4d
Update IDEs.md
JoseCalero Sep 7, 2023
9241e74
Minor fixes, delete some files outputs
JoseCalero Sep 7, 2023
51c709d
Merge branch 'main' of https://github.com/JoseCalero/x-heep into main
JoseCalero Sep 7, 2023
0fe943d
test readthedocs
JoseCalero Sep 12, 2023
dd801b5
Test readthedocs
JoseCalero Sep 12, 2023
b6d3fea
Test readthedocs
JoseCalero Sep 12, 2023
020eebb
Readthedocs first integration
JoseCalero Sep 12, 2023
84ad5f1
Readthedocs first integration fix
JoseCalero Sep 12, 2023
435fbed
Readthedocs first integration fix
JoseCalero Sep 12, 2023
8219005
minor delete
JoseCalero Oct 5, 2023
0ddda95
minor delete
JoseCalero Oct 5, 2023
b849871
Merge branch 'esl-epfl:main' into main
JoseCalero Oct 27, 2023
ee13698
Compilation Fix
JoseCalero Oct 27, 2023
1701fbf
Compilation Fix, minor update, remove app_std command
JoseCalero Oct 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ MAKE = make

# Get the absolute path
mkfile_path := $(shell dirname "$(realpath $(firstword $(MAKEFILE_LIST)))")
$(info $$You are executing from: $(mkfile_path))

# Include the self-documenting tool
FILE=$(mkfile_path)/Makefile
Expand Down Expand Up @@ -49,14 +50,17 @@ COMPILER_PREFIX ?= riscv32-unknown-
ARCH ?= rv32imc

# Path relative from the location of sw/Makefile from which to fetch source files. The directory of that file is the default value.
SOURCE ?= "."
SOURCE ?= $(".")

# Simulation engines options are verilator (default) and questasim
SIMULATOR ?= verilator

# Timeout for simulation, default 120
TIMEOUT ?= 120

# Export variables to sub-makefiles
export

## @section Conda
conda: environment.yml
conda env create -f environment.yml
Expand Down
7 changes: 5 additions & 2 deletions sw/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ COMPILER_PREFIX ?= riscv32-unknown-
ARCH ?= rv32imc

# Path relative from the location of sw/Makefile from which to fetch source files. The directory of that file is the default value.
SOURCE ?= "."
SOURCE ?= $(".")

# riscv toolchain install path
RISCV ?= ~/.riscv
Expand All @@ -56,7 +56,7 @@ source_path := $(realpath $(mkfile_path)/$(SOURCE))
$(info $$You are fetching sources from $(source_path) )


SOURCE_PATH = $(source_path)/
SOURCE_PATH = $(source_path)/
ROOT_PROJECT = $(mkfile_path)/
INC_FOLDERS = $(mkfile_path)/device/target/$(TARGET)/
LINK_FOLDER = $(mkfile_path)/linker
Expand All @@ -70,6 +70,9 @@ else
CMAKE=cmake3
endif

# Export variables to sub-makefiles
export

# Let's CMake!
include cmake/targets.mak

Expand Down
Loading