Skip to content

Fixes for some of the errors known at compile time #6

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.

Sign up for GitHub

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

Open
vinsec wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fixes for some of the errors known at compile time #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0dcc0a
add the missing static library
vinsec Mar 13, 2019
308d438
Create LICENSE.txt
vinsec Mar 13, 2019
b986117
Update Makefile
vinsec Mar 13, 2019
ceb52a9
Update Makefile
vinsec Mar 13, 2019
fc650a3
Update README.md
vinsec Mar 13, 2019
ecb5bde
Create README.md
vinsec Mar 13, 2019
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
2 changes: 1 addition & 1 deletion boards/nrf52840-mdk-usb-dongle/armgcc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ INC_FOLDERS += \
# Libraries common to all targets
LIB_FILES += \
$(SDK_ROOT)/external/nrf_cc310/lib/libnrf_cc310_0.9.10.a \
$(SDK_ROOT)/external/micro-ecc/nrf52hf_armgcc/armgcc/micro_ecc_lib_nrf52.a \
$(SDK_ROOT)/../micro_ecc_lib_nrf52.a \
$(SDK_ROOT)/external/nrf_oberon/lib/nrf52/liboberon_2.0.5.a \

# Optimization flags
Expand Down
2 changes: 1 addition & 1 deletion boards/nrf52840-mdk/armgcc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ INC_FOLDERS += \
# Libraries common to all targets
LIB_FILES += \
$(SDK_ROOT)/external/nrf_cc310/lib/libnrf_cc310_0.9.10.a \
$(SDK_ROOT)/external/micro-ecc/nrf52hf_armgcc/armgcc/micro_ecc_lib_nrf52.a \
$(SDK_ROOT)/../micro_ecc_lib_nrf52.a \
$(SDK_ROOT)/external/nrf_oberon/lib/nrf52/liboberon_2.0.5.a \

# Optimization flags
Expand Down
21 changes: 21 additions & 0 deletions nrf_sdks/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Copyright (c) 2014, Kenneth MacKay
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 2 additions & 0 deletions nrf_sdks/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ GNU_INSTALL_ROOT := $(HOME)/gcc-arm-none-eabi/gcc-arm-none-eabi-6-2017-q2-update
GNU_VERSION := 6.3.1
GNU_PREFIX := arm-none-eabi
```

> To avoid some known compilation errors, some precompiled static link library files have been added to the `nrf_sdks` directory. For more information, please refer to: [micro-ecc](http://infocenter.nordicsemi.com/index.jsp?topic=%2Fcom.nordic.infocenter.sdk5.v15.0.0%2Flib_crypto_backend_micro_ecc.html)
Binary file added nrf_sdks/micro_ecc_lib_nrf52.a
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions open_bootloader/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
You may be prompted that there is no Mergehex command, at which point the `nRF5x Command Line Tools` need to be installed in advance.

It is recommended that you refer to the relevant documentation for installation.
[nRF5x Command Line Tools](http://infocenter.nordicsemi.com/index.jsp?topic=%2Fcom.nordic.infocenter.tools%2Fdita%2Ftools%2Fnrf5x_command_line_tools%2Fnrf5x_command_line_tools_lpage.html)