Fixed paths and file names to compile under Linux

LdB-ECM · Dec 6, 2018 · a2ea686 · a2ea686
1 parent 8c40ab6
commit a2ea686
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/FreeRTOSv10.1.1/Demo/main.c b/FreeRTOSv10.1.1/Demo/main.c
@@ -1,10 +1,10 @@
 #include <stdint.h>
 #include <string.h>
-#include "rpi-smartstart.h"
+#include "rpi-SmartStart.h"
 #include "emb-stdio.h"
 #include "FreeRTOS.h"
 #include "task.h"
-#include "rpi-irq.h"
+#include "rpi-Irq.h"
 #include "semphr.h"
 
 

diff --git a/FreeRTOSv10.1.1/FreeRTOS/Source/Makerules b/FreeRTOSv10.1.1/FreeRTOS/Source/Makerules
@@ -3,11 +3,11 @@ COMP = FreeRTOS/Source
 
 # All c files in this directory and the platforms sub directory
 C_FILES := $(wildcard $(TOP_DIR)/$(COMP)/*.c) \
-		   $(wildcard $(TOP_DIR)/$(COMP)/Portable/GCC/$(PLATFORM)/*.c)
+		   $(wildcard $(TOP_DIR)/$(COMP)/portable/GCC/$(PLATFORM)/*.c)
 
 # All S files in this directory
 S_FILES = $(wildcard $(TOP_DIR)/$(COMP)/*.S) \
-		  $(wildcard $(TOP_DIR)/$(COMP)/Portable/GCC/$(PLATFORM)/*.S)
+		  $(wildcard $(TOP_DIR)/$(COMP)/portable/GCC/$(PLATFORM)/*.S)
 
 # Add the files to the compile source path
 COMP_SRC += ${S_FILES} ${C_FILES}
diff --git a/FreeRTOSv10.1.1/FreeRTOS/Source/portable/GCC/RaspberryPi/port.c b/FreeRTOSv10.1.1/FreeRTOS/Source/portable/GCC/RaspberryPi/port.c
@@ -4,8 +4,8 @@
 
 #include "FreeRTOS.h"
 #include "task.h"
-#include "rpi-smartstart.h"
-#include "rpi-irq.h"
+#include "rpi-SmartStart.h"
+#include "rpi-Irq.h"
 
  /* Constants required to setup the task context. */
 #define portNO_CRITICAL_NESTING					( 0 )

diff --git a/FreeRTOSv10.1.1/FreeRTOS/Source/portable/GCC/RaspberryPi/rpi-Irq.c b/FreeRTOSv10.1.1/FreeRTOS/Source/portable/GCC/RaspberryPi/rpi-Irq.c
@@ -1,6 +1,6 @@
 #include <stdbool.h>		// C standard unit needed for bool and true/false
 #include <stdint.h>			// C standard unit needed for uint8_t, uint32_t, etc
-#include "rpi-smartstart.h"	// SmartStart unit needed for getCoreID
+#include "rpi-SmartStart.h"	// SmartStart unit needed for getCoreID
 #include "rpi-Irq.h"		// This units header
 
 /*--------------------------------------------------------------------------}

diff --git a/FreeRTOSv10.1.1/Makefile b/FreeRTOSv10.1.1/Makefile
@@ -16,12 +16,20 @@ endif
 
 # You will need to change the first line (ARMGNU) of these to match your compiler directories
 ifeq ($(MAKECMDGOALS),Pi3-64)
+ifeq ($(OS), Windows_NT)
 ARMGNU := D:/gcc_linaro_7_1/bin/aarch64-elf
+else
+ARMGNU := aarch64-elf
+endif
 SMARTSTART := SmartStart64.S
 SPECIAL_FLAGS := -mcpu=cortexa53 -mstrict-align -fno-tree-loop-vectorize -fno-tree-slp-vectorize
 LINKER_FILE := rpi64.ld
 else
+ifeq ($(OS), Windows_NT)
 ARMGNU := D:/gcc_pi_7_2/bin/arm-none-eabi
+else
+ARMGNU := arm-none-eabi
+endif
 SMARTSTART := SmartStart32.S
 SPECIAL_FLAGS := -mno-unaligned-access
 LINKER_FILE := rpi32.ld
@@ -108,15 +116,15 @@ PLATFORM := RaspberryPi
 SYSCOMPS := $(TOP_DIR)/loader/$(PLATFORM)
 INCLUDEPATH1 ?=  $(TOP_DIR)/loader/$(PLATFORM)
 INCLUDEPATH2 ?=  $(TOP_DIR)/FreeRTOS/Source/include
-INCLUDEPATH3 ?=  $(TOP_DIR)/FreeRTOS/Source/portable/gcc/$(PLATFORM)
+INCLUDEPATH3 ?=  $(TOP_DIR)/FreeRTOS/Source/portable/GCC/$(PLATFORM)
 
 INCLUDE = -I$(INCLUDEPATH1) -I$(INCLUDEPATH2) -I$(INCLUDEPATH3) -I$(TOP_DIR)/Demo
 
 # Directory which has our demo files to compile
 DEMOCOMPS := $(TOP_DIR)/Demo
 
 # Directory that has the FreeRTOS source
-RTOSCOMPS := $(TOP_DIR)/FreeRTOS/source
+RTOSCOMPS := $(TOP_DIR)/FreeRTOS/Source
 
 # List of all components to include  ... Loader + FreeRTOS + Demo
 COMPS := $(SYSCOMPS) $(RTOSCOMPS) $(DEMOCOMPS)

diff --git a/...0.1.1/loader/RaspberryPi/rpi-smartstart.h → ...0.1.1/loader/RaspberryPi/rpi-SmartStart.h b/...0.1.1/loader/RaspberryPi/rpi-smartstart.h → ...0.1.1/loader/RaspberryPi/rpi-SmartStart.h