Skip to content

sdk: update to v2.2.0-3-gf8f27ce #4412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tools/sdk/include/user_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -729,8 +729,8 @@ typedef struct {
*
* @param wifi_country_t *country: the configured country info
*
* @return 0 : succeed
* @return -1 : fail
* @return true : succeed
* @return false : fail
*/
bool wifi_set_country(wifi_country_t *country);

Expand All @@ -739,8 +739,8 @@ bool wifi_set_country(wifi_country_t *country);
*
* @param wifi_country_t *country: country info
*
* @return 0 : succeed
* @return -1 : fail
* @return true : succeed
* @return false : fail
*/
bool wifi_get_country(wifi_country_t *country);

Expand Down
22 changes: 2 additions & 20 deletions tools/sdk/lib/README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,7 @@
## Updating SDK libraries

After updating SDK libraries to a new version, do the following changes.


Remove mem_manager.o from libmain.a to use custom heap implementation, and time.o to fix redefinition of time-related functions:

```bash
xtensa-lx106-elf-ar -d libmain.a mem_manager.o
xtensa-lx106-elf-ar -d libmain.a time.o
```

Rename `hostname` and `default_hostname` symbols:

```bash
xtensa-lx106-elf-ar x libmain.a eagle_lwip_if.o user_interface.o
xtensa-lx106-elf-objcopy --redefine-sym hostname=wifi_station_hostname user_interface.o
xtensa-lx106-elf-objcopy --redefine-sym hostname=wifi_station_hostname eagle_lwip_if.o
xtensa-lx106-elf-objcopy --redefine-sym default_hostname=wifi_station_default_hostname user_interface.o
xtensa-lx106-elf-objcopy --redefine-sym default_hostname=wifi_station_default_hostname eagle_lwip_if.o
xtensa-lx106-elf-ar r libmain.a eagle_lwip_if.o user_interface.o
```
- Copy .a files from SDK `lib` directory to this directory
- Run `fix_sdk_libs.sh`

## Updating libstdc++

Expand Down
16 changes: 16 additions & 0 deletions tools/sdk/lib/fix_sdk_libs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash
set -e

# Remove mem_manager.o from libmain.a to use custom heap implementation,
# and time.o to fix redefinition of time-related functions:
xtensa-lx106-elf-ar d libmain.a mem_manager.o
xtensa-lx106-elf-ar d libmain.a time.o

# Rename `hostname` and `default_hostname` symbols:
xtensa-lx106-elf-ar x libmain.a eagle_lwip_if.o user_interface.o
xtensa-lx106-elf-objcopy --redefine-sym hostname=wifi_station_hostname user_interface.o
xtensa-lx106-elf-objcopy --redefine-sym hostname=wifi_station_hostname eagle_lwip_if.o
xtensa-lx106-elf-objcopy --redefine-sym default_hostname=wifi_station_default_hostname user_interface.o
xtensa-lx106-elf-objcopy --redefine-sym default_hostname=wifi_station_default_hostname eagle_lwip_if.o
xtensa-lx106-elf-ar r libmain.a eagle_lwip_if.o user_interface.o
rm eagle_lwip_if.o user_interface.o
Binary file modified tools/sdk/lib/libmain.a
Binary file not shown.
Binary file modified tools/sdk/lib/libpp.a
Binary file not shown.