File tree 3 files changed +9
-8
lines changed
3 files changed +9
-8
lines changed Original file line number Diff line number Diff line change 1
1
XTENSA_TOOLCHAIN ?= ../../tools/xtensa-lx106-elf/bin/
2
- ESPTOOL ?= ../../tools/esptool
2
+ ESPTOOL ?= ../../tools/esptool/esptool
3
3
4
4
BIN_DIR := ./
5
5
TARGET_DIR := ./
6
6
7
7
TARGET_OBJ_FILES := \
8
8
eboot.o \
9
9
eboot_command.o \
10
-
10
+
11
11
12
12
TARGET_OBJ_PATHS := $(addprefix $(TARGET_DIR ) /,$(TARGET_OBJ_FILES ) )
13
13
50
50
51
51
52
52
.PHONY : all clean default
53
-
Original file line number Diff line number Diff line change 1
- /* Copyright (c) 2015 Ivan Grokhotkov. All rights reserved.
1
+ /* Copyright (c) 2015-2016 Ivan Grokhotkov. All rights reserved.
2
2
* This file is part of eboot bootloader.
3
3
*
4
4
* Redistribution and use is permitted according to the conditions of the
@@ -115,14 +115,16 @@ void main()
115
115
int res = 9 ;
116
116
struct eboot_command cmd ;
117
117
118
- if (eboot_command_read (& cmd )) {
118
+ if (eboot_command_read (& cmd ) == 0 ) {
119
+ // valid command was passed via RTC_MEM
120
+ eboot_command_clear ();
121
+ ets_putc ('@' );
122
+ } else {
123
+ // no valid command found
119
124
cmd .action = ACTION_LOAD_APP ;
120
125
cmd .args [0 ] = 0 ;
121
126
ets_putc ('~' );
122
- } else {
123
- ets_putc ('@' );
124
127
}
125
- eboot_command_clear ();
126
128
127
129
if (cmd .action == ACTION_COPY_RAW ) {
128
130
ets_putc ('c' ); ets_putc ('p' ); ets_putc (':' );
You can’t perform that action at this time.
0 commit comments