Commit graph

113 commits

Author SHA1 Message Date
Angus Gratton
5810dbef05 make: Add macro to test for & try to fix up files required for submodules
Now applied to both esptool.py & esp32 wifi libs
2016-09-12 18:00:20 +10:00
Angus Gratton
96852d49c2 Load esptool.py from submodule, currently WIP esptool.py v2.0
More details at https://github.com/themadinventor/esptool/pull/121
2016-09-01 18:45:10 +10:00
Angus Gratton
d793d23b94 Remove bin/ directory in favour of an add_path.sh script that can be sourced
Remaining file in bin/ will be moved out as part of !34
2016-09-01 18:45:10 +10:00
Angus Gratton
fb87346864 Merge branch 'feature/newlib_locking' into 'master'
newlib locking support

Has matching tests here: http://gitlab.espressif.cn/idf/esp-idf-tests/commits/feature/newlib_locking_tests

This is ready, the "bug" I saw was me not understanding how newlib stream locking works (I still don't understand why it works like it does, but that's less important for now.)

See merge request !17
2016-09-01 16:17:22 +08:00
Ivan Grokhotkov
9db4732861 Merge branch 'bugfix/gitlab_update_submodules' into 'master'
gitlab-ci: update submodules before build

Gitlab CI will cache build directory per branch and per build step. Also it doesn't try to update submodules.
We have to do this manually because otherwise we end up with old version of submodule in cached directory.

See merge request !47
2016-09-01 15:41:08 +08:00
Ivan Grokhotkov
02e70abf84 gitlab-ci: update submodules before build
Gitlab CI will cache build directory per branch and per build step. Also it doesn't try to update submodules.
We have to do this manually because otherwise we end up with old version of submodule in cached directory.
2016-09-01 15:13:15 +08:00
Angus Gratton
6367268f99 Merge branch 'bugfix/md5_rom_header_types' into 'master'
md5_hash.h: Replace outdated use of c_types.h with stdint



See merge request !44
2016-09-01 11:22:22 +08:00
Angus Gratton
a825fe8703 md5_hash.h: Replace outdated use of c_types.h with stdint 2016-09-01 08:58:29 +10:00
Jeroen Domburg
0f42f017e2 Merge branch 'bugfix/ocd_stop_on_unhandled_exception' into 'master'
Fix: Return after setting breakpoint when ocd is detected instead of continuing …

…into the panic routine

Made a small thinko when refactoring the panic handler code. This fixes it.

See merge request !36
2016-08-31 12:15:04 +08:00
Jeroen Domburg
8c7afb4b46 Merge branch 'feature/openocd_doc' into 'master'
Add openocd documentation and config file

As we (=Ivan/Angus) discussed, the esp32-specific openocd/gdb documentation and helper tools will live in the esp-idf repository. This is an initial document detailing the basics of setting up OpenOCD with an esp32 module. It should be sufficient for people already familiar with a similar setup on another platform to start using JTAG for debugging. It can be expanded much more (e.g. the tracetool still is missing) but we'llhave to add that later.

See merge request !31
2016-08-30 18:02:20 +08:00
Jeroen Domburg
c6394ed2ce Fix: Return after setting breakpoint when ocd is detected instead of continuing into the panic routine 2016-08-30 17:55:20 +08:00
Jeroen Domburg
69f7bf5235 Add bit of text saying openocd helper options for esp-idf are enabled by default 2016-08-30 15:44:20 +08:00
Liu Han
13022ceff6 Merge branch 'feature/json' into 'master'
components/json: add JSON parse feature

Develop and Compile JSON Parse function, can test by running list,  see test_json file.

See merge request !33
2016-08-30 13:54:16 +08:00
Liu Han
f9bf9b3269 Merge branch 'feature/expat' into 'master'
components/expat: add XML parse feature

Develop and Compile XML Parse based on XMPP protocol, can test from unity running list, see expat file.

See merge request !32
2016-08-30 13:52:51 +08:00
Jeroen Domburg
6858d2993f Fix issued raised in the merge request 2016-08-30 11:30:03 +08:00
Jeroen Domburg
16956f6474 Add openocd documentation and config file 2016-08-29 16:24:22 +08:00
Angus Gratton
23c235506f Merge branch 'feature/make_incremental_headers' into 'master'
Makefile: Fix "No rule to make target X.h" for generated header dependencies



See merge request !30
2016-08-29 15:06:18 +08:00
Ivan Grokhotkov
af5452706b Merge branch 'bugfix/rom_aes_set_endian' into 'master'
[Github] Fix prototype for ets_aes_set_endian

https://github.com/espressif/esp-idf/pull/3

Original description:
> 
> found small mistake in it
> 
> we have:
> 
```
PROVIDE ( ets_aes_crypt = 0x4005c9b8 );
PROVIDE ( ets_aes_disable = 0x4005c8f8 );
PROVIDE ( ets_aes_enable = 0x4005c8cc );
PROVIDE ( ets_aes_set_endian = 0x4005c928 );
PROVIDE ( ets_aes_setkey_dec = 0x4005c994 );
PROVIDE ( ets_aes_setkey_enc = 0x4005c97c );
```


See merge request !29
2016-08-29 15:04:15 +08:00
Angus Gratton
ee388097f6 Makefile: Fix "No rule to make target X.h" for generated header dependencies 2016-08-29 10:48:53 +10:00
rudi ;-)
fa310016dd Update aes.h
found small mistake in it

we have:

PROVIDE ( ets_aes_crypt = 0x4005c9b8 );
PROVIDE ( ets_aes_disable = 0x4005c8f8 );
PROVIDE ( ets_aes_enable = 0x4005c8cc );
PROVIDE ( ets_aes_set_endian = 0x4005c928 );
PROVIDE ( ets_aes_setkey_dec = 0x4005c994 );
PROVIDE ( ets_aes_setkey_enc = 0x4005c97c );

Signed-off-by: Ivan Grokhotkov <ivan@espressif.com>
2016-08-27 22:17:23 +08:00
liuhan
fbb6c2db08 components/json: add JSON parse feature
Develop and Compile JSON Parse function, see json file.
2016-08-25 17:04:14 +08:00
Angus Gratton
00ea21f736 FreeRTOS: Convert portMUX_DEBUG to a configuration item 2016-08-25 16:43:59 +08:00
Angus Gratton
96b9649aa4 newlib locking: Fix bug w/ _lock_close not clearing semaphore handle 2016-08-25 16:43:55 +08:00
liuhan
6e0bf01f25 components/expat: add XML parse feature
Develop and Compile XML Parse based on XMPP protocol, see expat file.
2016-08-25 16:40:23 +08:00
Wu Jian Gang
f4b3820ecd Merge branch 'feature/ld_change' into 'master'
update ld and heap region

Divide origin fpga ld to several lds,  choose specific ld for normal/BT/Trace by menuconfig, change iram/dram len in ld to full use hardware ram region.

See merge request !28
2016-08-25 15:52:11 +08:00
Angus Gratton
e6bc527dfb Merge branch 'master' into feature/newlib_locking 2016-08-25 12:09:21 +08:00
Wu Jian Gang
62296d9dfd mem: add comments for knock out 0x3ffe0000~0x3ffe8000
TODO: this region should be checked later
2016-08-25 11:59:29 +08:00
Jeroen Domburg
803aef6e97 Merge branch 'bugfix/tskNO_AFFINITY_ambiguous' into 'master'
FreeRTOS: Change tskNO_AFFINITY value to not match CPU 1 when UNICORE is set



See merge request !27
2016-08-25 11:48:21 +08:00
Angus Gratton
7458f9193b Rename build_system_tests to less-ambiguous test_build_system
Before it was unclear if we were building the system tests or testing
the build system.
2016-08-25 11:55:47 +08:00
Angus Gratton
f54348ff83 build_system_tests.sh: Replace use of second-precision-only [ a -ot b ] 2016-08-25 11:54:37 +08:00
Wu Jian Gang
28865fcb0d mem: knock out bt/trace data region if configed in menuconfig 2016-08-25 11:35:06 +08:00
Wu Jian Gang
c72248193b ld: fix ld for bootloader 2016-08-25 11:35:06 +08:00
Wu Jian Gang
ef36779bd3 ld: add ld for bt/trace, choose different ld by menuconfig 2016-08-25 11:34:21 +08:00
Angus Gratton
580fd635e5 FreeRTOS: Change tskNO_AFFINITY value to not match CPU 1 when UNICORE is set 2016-08-25 11:30:24 +08:00
Angus Gratton
9e703612a7 Merge branch 'master' into feature/newlib_locking 2016-08-25 11:25:05 +08:00
Angus Gratton
a04b510a21 Merge branch 'master' into feature/newlib_locking 2016-08-25 11:11:35 +08:00
Wu Jian Gang
3e8bb67e75 ld: fix ld to use ram as much as possible, rearrange heap_alloc area 2016-08-25 11:07:53 +08:00
Wu Jian Gang
c3102e8fb2 ld: seperate/rename eagle.xxx.ld to esp32.xxx.ld 2016-08-25 11:07:53 +08:00
Ivan Grokhotkov
842bc53549 Merge branch 'bugfix/dualcore_startup' into 'master'
Fix dualcore startup

This MR includes:
- a workaround for a hardware bug with cache initialization
- fix of `#if CONFIG_WIFI_ENABLED` block in cpu_start.c for the case when WiFi is disabled.
- removal of miscellaneous delays in cpu_start.c

See merge request !22
2016-08-25 11:07:21 +08:00
Angus Gratton
8369d328ed Merge remote-tracking branch 'origin/bugfix/dualcore_startup' into feature/newlib_locking 2016-08-25 10:29:36 +08:00
Ivan Grokhotkov
bce356b700 Merge branch 'bugfix/make_tests_noninteractive' into 'master'
make: update template configuration before running tests

This fixes build error for non-interactive builds

See merge request !26
2016-08-25 10:20:48 +08:00
Ivan Grokhotkov
cb6e0b18f1 make: update template configuration before running tests
This fixes build error for non-interactive builds
2016-08-25 10:28:25 +08:00
Ivan Grokhotkov
2cd1da31f9 Merge branch 'bugfix/dram_attr' into 'master'
fix DRAM_ATTR attribute

Variables marked with DRAM_ATTR were not placed in any specific section and were appended to the last section, causing some errors at binary file generation stage.
This change places contents of .dram1 section into .dram0.data.
Also removes .iram1pro/.iram1app/.dram1pro/.dram1app which weren't used anywhere.

See merge request !23
2016-08-25 10:19:17 +08:00
Angus Gratton
700dbca4db newlib locking: Remove lock table, much simpler implementation. 2016-08-24 20:59:02 +08:00
Ivan Grokhotkov
7ba0d90df2 Merge branch 'bugfix/bootloader_incremental_build' into 'master'
Make: fix incremental builds, add build tests

Four semi-related build changes in one:
* Add basic tests for make system sanity (can be expanded as we find corner cases)
* Fix incremental building of bootloader when source files change
* Don't regenerate component libraries or re-link the ELF file if nothing changed
* Rename `$(vecho)` to  `$(summary)` and add a new `$(details)` macro to echo some helpful build details when V=1.


See merge request !20
2016-08-24 20:24:33 +08:00
Jeroen Domburg
accea4718b Merge branch 'feature/openocd-freertos-support_try2' into 'master'
Add symbol needed for OpenOCD to detect FreeRTOS, add feature to break execution, try 2

Add symbol needed for OpenOCD to detect FreeRTOS, add optional feature to break execution when the scheduler is initially started. The workflow is now so that if you start an esp-idf program, you can reset the CPU and end up in a gdb prompt just before all threads start up. In gdb you can then inspect all threads and watch breakpoints. Has the nice side effect that OpenOCD will restore any break/watchpoints that were there before you reset the chip.

This is try 2 because seemingly, someone or something replaced the bit of my brain that is responsible for handling Git with a squeaky toy.

See merge request !24
2016-08-24 20:21:52 +08:00
Jeroen Domburg
95f547025b Undo two empty lines 2016-08-24 18:34:04 +08:00
Jeroen Domburg
b1ad6a16e9 Undo submodule commit 2016-08-24 18:31:37 +08:00
Angus Gratton
f5715ac28d FreeRTOS: Add xQueueGetMutexHolder support
Enables it as a config option, but there's no overhead at all if the
function is not called anywhere.
2016-08-24 18:13:10 +08:00
Angus Gratton
4b281af0f7 newlib locking: Turns out the "hack" is the way to make stdout thread-safe in newlib 2016-08-24 18:13:10 +08:00