From d796a71e168b2e6289ec7da8f02a8350fa1c9228 Mon Sep 17 00:00:00 2001 From: FPGALover Date: Sat, 24 Feb 2024 09:34:09 +0000 Subject: [PATCH 1/2] Update README.md --- README.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index fc16f70..151ce3f 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,61 @@ # neorv32 -neorv32 with Makefiles compatible with MSYS2 64 for windows and regular Linux. +neorv32 with Makefiles compatible with MSYS2 64 on Windows and Linux. + + + ## Windows Installation -1. clone this repository on your windows machine. -2. download and install MSYS2(msys2-x86_64-20240113.exe) --> https://www.msys2.org/ -3. once MSYS2 is installed, run MSYS2, and run the command +You must download the latest RISCV precompiled binaries for your platform from: https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/ + +in this case the architecture x64 for windows binaries(https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v13.2.0-2/xpack-riscv-none-elf-gcc-13.2.0-2-darwin-x64.tar.gz), then extract these under the folder C:\riscv_precompiled\ +
+ + +1. clone or download this repository on your windows machine. ``` - pacman -S mingw-w64-ucrt-x86_64-gcc + $ git clone https://gitea.squirrelnut.synology.me:5001/FPGALover/neorv32 + ``` +2. download and install MSYS2(msys2-x86_64-20240113.exe) --> https://www.msys2.org/ +3. once MSYS2 is installed, run MSYS2, and run the command(pacman -S mingw-w64-ucrt-x86_64-gcc) + ``` + $ pacman -S mingw-w64-ucrt-x86_64-gcc ``` 4. Select ALL dependencies by pressing Enter and select Y[yes]. -5. after the installation is completed, add the *Path* *"C:\msys64\ucrt64\bin"* under the enviroments variable on Windows. + ``` + resolving dependencies... + looking for conflicting packages... -6. open a cmd and run the command + Packages (15) mingw-w64-ucrt-x86_64-binutils-2.41-2 + mingw-w64-ucrt-x86_64-crt-git-11.0.0.r216.gffe883434-1 + mingw-w64-ucrt-x86_64-gcc-libs-13.2.0-2 mingw-w64-ucrt-x86_64-gmp-6.3.0-2 + mingw-w64-ucrt-x86_64-headers-git-11.0.0.r216.gffe883434-1 + mingw-w64-ucrt-x86_64-isl-0.26-1 mingw-w64-ucrt-x86_64-libiconv-1.17-3 + mingw-w64-ucrt-x86_64-libwinpthread-git-11.0.0.r216.gffe883434-1 + mingw-w64-ucrt-x86_64-mpc-1.3.1-2 mingw-w64-ucrt-x86_64-mpfr-4.2.1-2 + mingw-w64-ucrt-x86_64-windows-default-manifest-6.4-4 + mingw-w64-ucrt-x86_64-winpthreads-git-11.0.0.r216.gffe883434-1 + mingw-w64-ucrt-x86_64-zlib-1.3-1 mingw-w64-ucrt-x86_64-zstd-1.5.5-1 + mingw-w64-ucrt-x86_64-gcc-13.2.0-2 + + Total Download Size: 49.38 MiB + Total Installed Size: 418.82 MiB + + :: Proceed with installation? [Y/n] + [... downloading and installation continues ...] ``` - gcc --version +5. after the installation is completed, add the *Path* *"C:\msys64\ucrt64\bin"* under the enviroments variable on Windows. +
+ + +6. open a cmd and run the command (gcc --version) ``` + $ gcc --version + gcc.exe (Rev2, Built by MSYS2 project) 13.2.0 + ``` + +7. go to the directory where you cloned or donwloaded this repository +8. From 277af5ef37dd5e6321119a558dcf53748c93a089 Mon Sep 17 00:00:00 2001 From: FPGALover Date: Sat, 24 Feb 2024 09:34:54 +0000 Subject: [PATCH 2/2] Update sw/example/demo_blink_led_asm/makefile --- sw/example/demo_blink_led_asm/makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sw/example/demo_blink_led_asm/makefile b/sw/example/demo_blink_led_asm/makefile index 8f9e2fd..fa59946 100644 --- a/sw/example/demo_blink_led_asm/makefile +++ b/sw/example/demo_blink_led_asm/makefile @@ -1,4 +1,13 @@ # Modify this variable to fit your NEORV32 setup (neorv32 home folder) +OSFLAG := + +ifeq ($(OS),Windows_NT) +NEORV32_HOME ?= ..\..\.. + +include $(NEORV32_HOME)\sw\common\common.mk +else + NEORV32_HOME ?= ../../.. include $(NEORV32_HOME)/sw/common/common.mk +endif \ No newline at end of file