@@ -4,20 +4,20 @@ ifndef PDIR
4
4
5
5
endif
6
6
7
- ifeq ($(COMPILE ) , gcc)
7
+ ifeq ($(COMPILE ) , xcc)
8
+ AR = xt-ar
9
+ CC = xt-xcc
10
+ NM = xt-nm
11
+ CPP = xt-xt++
12
+ OBJCOPY = xt-objcopy
13
+ OBJDUMP = xt-objdump
14
+ else
8
15
AR = xtensa-lx106-elf-ar
9
16
CC = xtensa-lx106-elf-gcc
10
17
NM = xtensa-lx106-elf-nm
11
18
CPP = xtensa-lx106-elf-g++
12
19
OBJCOPY = xtensa-lx106-elf-objcopy
13
20
OBJDUMP = xtensa-lx106-elf-objdump
14
- else
15
- AR = xt-ar
16
- CC = xt-xcc
17
- NM = xt-nm
18
- CPP = xt-xt++
19
- OBJCOPY = xt-objcopy
20
- OBJDUMP = xt-objdump
21
21
endif
22
22
23
23
BOOT? =none
@@ -238,14 +238,14 @@ $(BINODIR)/%.bin: $(IMAGEODIR)/%.out
238
238
@mkdir -p $(BINODIR )
239
239
240
240
ifeq ($(APP ) , 0)
241
- @$(RM) -r ../bin/ eagle.S ../bin /eagle.dump
242
- @$(OBJDUMP) -x -s $< > ../bin /eagle.dump
243
- @$(OBJDUMP) -S $< > ../bin /eagle.S
241
+ @$(RM) -r $(BIN_PATH)/ eagle.S $(BIN_PATH) /eagle.dump
242
+ @$(OBJDUMP) -x -s $< > $(BIN_PATH) /eagle.dump
243
+ @$(OBJDUMP) -S $< > $(BIN_PATH) /eagle.S
244
244
else
245
- @mkdir -p ../bin /upgrade
246
- @$(RM) -r ../bin/ upgrade/$(BIN_NAME).S ../bin /upgrade/$(BIN_NAME).dump
247
- @$(OBJDUMP) -x -s $< > ../bin /upgrade/$(BIN_NAME).dump
248
- @$(OBJDUMP) -S $< > ../bin /upgrade/$(BIN_NAME).S
245
+ @mkdir -p $(BIN_PATH) /upgrade
246
+ @$(RM) -r $(BIN_PATH)/ upgrade/$(BIN_NAME).S $(BIN_PATH) /upgrade/$(BIN_NAME).dump
247
+ @$(OBJDUMP) -x -s $< > $(BIN_PATH) /upgrade/$(BIN_NAME).dump
248
+ @$(OBJDUMP) -S $< > $(BIN_PATH) /upgrade/$(BIN_NAME).S
249
249
endif
250
250
251
251
@$(OBJCOPY) --only-section .text -O binary $< eagle.app.v6.text.bin
@@ -255,22 +255,28 @@ endif
255
255
256
256
@echo ""
257
257
@echo "!!!"
258
+ @echo "SDK_PATH: $(SDK_PATH)"
258
259
259
260
ifeq ($(app ) , 0)
260
- @python .. /tools/gen_appbin.py $< 0 $(mode) $(freqdiv) $(size_map)
261
- @mv eagle.app.flash.bin ../bin /eagle.flash.bin
262
- @mv eagle.app.v6.irom0text.bin ../bin /eagle.irom0text.bin
261
+ @python $(SDK_PATH) /tools/gen_appbin.py $< 0 $(mode) $(freqdiv) $(size_map)
262
+ @mv eagle.app.flash.bin $(BIN_PATH) /eagle.flash.bin
263
+ @mv eagle.app.v6.irom0text.bin $(BIN_PATH) /eagle.irom0text.bin
263
264
@rm eagle.app.v6.*
265
+ @echo "BIN_PATH: $(BIN_PATH)"
266
+ @echo ""
264
267
@echo "No boot needed."
265
- @echo "Generate eagle.flash.bin and eagle.irom0text.bin successully in folder bin. "
268
+ @echo "Generate eagle.flash.bin and eagle.irom0text.bin successully in BIN_PATH "
266
269
@echo "eagle.flash.bin-------->0x00000"
267
270
@echo "eagle.irom0text.bin---->0x40000"
268
271
else
272
+ @echo "BIN_PATH: $(BIN_PATH)/upgrade"
273
+ @echo ""
274
+
269
275
ifneq ($(boot), new)
270
- @python .. /tools/gen_appbin.py $< 1 $(mode) $(freqdiv) $(size_map)
276
+ @python $(SDK_PATH) /tools/gen_appbin.py $< 1 $(mode) $(freqdiv) $(size_map)
271
277
@echo "Support boot_v1.1 and +"
272
278
else
273
- @python .. /tools/gen_appbin.py $< 2 $(mode) $(freqdiv) $(size_map)
279
+ @python $(SDK_PATH) /tools/gen_appbin.py $< 2 $(mode) $(freqdiv) $(size_map)
274
280
275
281
ifeq ($(size_map), 6)
276
282
@echo "Support boot_v1.4 and +"
283
289
endif
284
290
endif
285
291
286
- @mv eagle.app.flash.bin ../bin /upgrade/$(BIN_NAME).bin
292
+ @mv eagle.app.flash.bin $(BIN_PATH) /upgrade/$(BIN_NAME).bin
287
293
@rm eagle.app.v6.*
288
- @echo "Generate $(BIN_NAME).bin successully in folder bin/upgrade. "
294
+ @echo "Generate $(BIN_NAME).bin successully in BIN_PATH "
289
295
@echo "boot.bin------------>0x00000"
290
296
@echo "$(BIN_NAME).bin--->$(addr)"
291
297
endif
@@ -389,8 +395,6 @@ $(foreach image,$(GEN_IMAGES),$(eval $(call MakeImage,$(basename $(image)))))
389
395
# Required for each makefile to inherit from the parent
390
396
#
391
397
392
- INCLUDES := $(INCLUDES ) -I $(PDIR ) include -I $(PDIR ) extra_include
393
- INCLUDES += -I $(PDIR ) include/lwip -I $(PDIR ) include/lwip/ipv4 -I $(PDIR ) include/lwip/ipv6
394
- INCLUDES += -I $(PDIR ) include/espressif
395
- PDIR := ../$(PDIR )
396
- sinclude $(PDIR ) Makefile
398
+ INCLUDES := $(INCLUDES ) -I $(SDK_PATH ) /include -I $(SDK_PATH ) /extra_include
399
+ INCLUDES += -I $(SDK_PATH ) /include/lwip -I $(SDK_PATH ) /include/lwip/ipv4 -I $(SDK_PATH ) /include/lwip/ipv6
400
+ INCLUDES += -I $(SDK_PATH ) /include/espressif
0 commit comments