Revert "Feature/add macos support (#88)" (#89)

This reverts commit a011ffc.

firmware/Makefile.linux

@@ -19,49 +19,23 @@ APP2_PATH=$(APP_OBJ_DIR)$(APP2_NAME)
 
 OBJ_DIR=obj/
 
-COMPILER_BASE = $(shell realpath ../../compiler)
-TOOLCHAIN=$(COMPILER_BASE)/gcc-arm-none-eabi-4_9-2015q1/bin/arm-none-eabi-
-CC=$(TOOLCHAIN)gcc
+TOOLCHAIN=../../compiler/gcc-arm-none-eabi-4_9-2015q1/bin/arm-none-eabi-
 OBJCOPY=$(TOOLCHAIN)objcopy
-OBJDUMP=$(TOOLCHAIN)objdump
-SIZE=$(TOOLCHAIN)size
-AR=$(TOOLCHAIN)ar
-
-SPL_FLAGS=-DSTM32F10X_HD -DCONFIG_BOOTLOADER
-CFLAGS=-g -Wall -Werror -O3  # Debugging flags: -g for debug symbols, -O0 for no optimization
-CFLAGS+=-ffunction-sections -fdata-sections
-CFLAGS+=-MMD -MP
-CFLAGS+=-mcpu=cortex-m3 -mthumb
-CFLAGS+=$(SPL_FLAGS)
-
-UNAME := $(shell uname)
-
 
 all:
-	$(MAKE) -C $(BOOT_DIR) CC=$(CC) CFLAGS="$(CFLAGS)" OBJCOPY=$(OBJCOPY) OBJDUMP=$(OBJDUMP) SIZE=$(SIZE) AR=$(AR)
-	$(MAKE) -C $(APP_DIR) CC=$(CC) CFLAGS="$(CFLAGS)" OBJCOPY=$(OBJCOPY) OBJDUMP=$(OBJDUMP) SIZE=$(SIZE) AR=$(AR)
-
+	$(MAKE) -C $(BOOT_DIR)
+	$(MAKE) -C $(APP_DIR)
 	mkdir -p $(OBJ_DIR)
 	cp $(BOOT_PATH) $(OBJ_DIR)
 	cp $(APP1_PATH) $(OBJ_DIR)
 	cp $(APP2_PATH) $(OBJ_DIR)
-ifeq ($(UNAME), Darwin)
-	sed -i '' '$$d' $(OBJ_DIR)$(BOOT_NAME)
-	sed -i '' '$$d' $(OBJ_DIR)$(APP1_NAME)
-else
 	sed -i '$$d' $(OBJ_DIR)$(BOOT_NAME)
 	sed -i '$$d' $(OBJ_DIR)$(APP1_NAME)
-endif
 	cat $(OBJ_DIR)$(BOOT_NAME) $(OBJ_DIR)$(APP1_NAME) \
 	  $(OBJ_DIR)$(APP2_NAME) > $(OBJ_DIR)$(GEN_NAME).hex
 	$(OBJCOPY) --input-target=ihex --output-target=binary \
 	  $(OBJ_DIR)$(GEN_NAME).hex $(OBJ_DIR)$(GEN_NAME).bin
 
-
-	$(OBJCOPY) -I ihex -O elf32-littlearm $(OBJ_DIR)$(GEN_NAME).hex $(OBJ_DIR)$(GEN_NAME).elf
-	# Show the size of the ELF file
-	$(SIZE) $(OBJ_DIR)$(GEN_NAME).elf
-.PHONY: all clean
 clean:
 	$(MAKE) -C $(BOOT_DIR) clean
 	$(MAKE) -C $(APP_DIR) clean

firmware/bootloader/Makefile.linux

@@ -7,6 +7,7 @@ PROG_NAME=bootloader_fw
 SRC_DIR=./
 OBJ_DIR=obj/
 LIB_DIR=../libs/
+TOOLCHAIN=../../../compiler/gcc-arm-none-eabi-4_9-2015q1/bin/arm-none-eabi-
 PROG=$(OBJ_DIR)$(PROG_NAME)
 
 SPL_PATH=$(LIB_DIR)spl/
@@ -15,7 +16,12 @@ SPL_CORE_SUPPORT=$(SPL_PATH)CMSIS/CM3/CoreSupport/
 SPL_PERIPH_PATH=$(SPL_PATH)STM32F10x_StdPeriph_Driver/
 SPL_LIB=stm32f10x
 SPL_CONFIG_FILE=$(SPL_PATH)stm32f10x_conf.h
+SPL_FLAGS=-DSTM32F10X_HD -DCONFIG_BOOTLOADER
 
+CC=$(TOOLCHAIN)gcc
+OBJCOPY=$(TOOLCHAIN)objcopy
+OBJDUMP=$(TOOLCHAIN)objdump
+SIZE=$(TOOLCHAIN)size
 
 INCLUDES=-include$(SPL_CONFIG_FILE)
 INCLUDES+=-I$(SPL_CORE_SUPPORT)
@@ -24,24 +30,31 @@ INCLUDES+=-I$(SPL_PATH)
 INCLUDES+=-I$(SPL_PERIPH_PATH)inc
 INCLUDES+=-I$(SRC_DIR)
 
+CFLAGS=-g -Wall -Werror -O3
+CFLAGS+=$(INCLUDES) -MMD -MP
+CFLAGS+=-ffunction-sections -fdata-sections
+CFLAGS+=-mcpu=cortex-m3 -mthumb
+CFLAGS+=$(SPL_FLAGS)
+
 LDFLAGS=-mcpu=cortex-m3 -mthumb -Wl,--gc-sections -Wl,-Map=$(PROG).map
 
 vpath %.c $(SRC_DIR) $(SPL_DEVICE_SUPPORT_PATH) $(SRC_BSP_DIR)
 vpath %.s $(SRC_DIR)
 
-STARTUP=$(SPL_PATH)startup_stm32f10x_hd.s
+STARTUP=startup_stm32f10x_hd.s
 
 SRCS=main.c system_stm32f10x.c syscalls.c uart.c
 
-OBJS=$(addprefix $(OBJ_DIR),$(SRCS:.c=.o))
+OBJS=$(addprefix $(OBJ_DIR),$(SRCS:.c=.o)) \
+  $(addprefix $(OBJ_DIR),$(STARTUP:.s=.o))
 DEPS=$(OBJS:%.o=%.d)
 
 LINKER_SCRIPT=$(SRC_DIR)stm32_flash.ld
 
 all: lib dirs $(PROG).elf
 
 lib:
-	$(MAKE) -C $(SPL_PATH) CC=$(CC) AR=$(AR) CFLAGS="$(CFLAGS)"
+	$(MAKE) -C $(SPL_PATH)
 
 dirs:
 	mkdir -p $(OBJ_DIR)
@@ -54,10 +67,10 @@ $(PROG).elf: $(OBJS)
 	$(SIZE) $(PROG).elf
 
 $(OBJ_DIR)%.o: %.c
-	$(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@
+	$(CC) -c $(CFLAGS) $< -o $@ 
 
 $(OBJ_DIR)%.o: %.s
-	$(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@
+	$(CC) -c $(CFLAGS) $< -o $@
 
 -include $(DEPS)