Commit ae6ff1a0 authored by Peter Magnusson's avatar Peter Magnusson
Browse files

fixes from comments on esptool usage

parent 32ea83c2
...@@ -29,6 +29,7 @@ ifeq ($(OS),Windows_NT) ...@@ -29,6 +29,7 @@ ifeq ($(OS),Windows_NT)
CPP = xtensa-lx106-elf-cpp CPP = xtensa-lx106-elf-cpp
OBJCOPY = xtensa-lx106-elf-objcopy OBJCOPY = xtensa-lx106-elf-objcopy
endif endif
FIRMWAREDIR = ..\\bin\\
ESPPORT = com1 ESPPORT = com1
ifeq ($(PROCESSOR_ARCHITECTURE),AMD64) ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
# ->AMD64 # ->AMD64
...@@ -46,6 +47,7 @@ else ...@@ -46,6 +47,7 @@ else
NM = xtensa-lx106-elf-nm NM = xtensa-lx106-elf-nm
CPP = xtensa-lx106-elf-cpp CPP = xtensa-lx106-elf-cpp
OBJCOPY = xtensa-lx106-elf-objcopy OBJCOPY = xtensa-lx106-elf-objcopy
FIRMWAREDIR = ../bin/
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
# LINUX # LINUX
...@@ -65,8 +67,8 @@ else ...@@ -65,8 +67,8 @@ else
endif endif
endif endif
############################################################# #############################################################
ESPTOOL = python ../tools/esptool.py ESPTOOL = ../tools/esptool.py
FIRMWAREDIR = ../bin/
CSRCS ?= $(wildcard *.c) CSRCS ?= $(wildcard *.c)
ASRCs ?= $(wildcard *.s) ASRCs ?= $(wildcard *.s)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment