ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mbed-os/tools
History
Jimmy Brisson f3127a43ba Merge duplicate keys in JSON. 
### Description

I would love to make this an error, but we have had a duplicate key in
`targets.json` for a while now. Instead, we're merging in a semi-smart way.
This will allow you to have things like `"target.features_add"` twice, and
both will take affect.

### Pull request type

    [x] Fix
    [ ] Refactor
    [ ] Target update
    [ ] Functionality change
    [ ] Docs update
    [ ] Test update
    [ ] Breaking change
 		2018-11-02 19:49:54 -05:00
..
arm_pack_manager Update arm pack manager for GR-PEACH 2018-06-22 10:53:21 +09:00
bootloaders rtl8195am lib updates 2018-10-08 15:18:50 +01:00
compliance
…
config Tools: Ensure vtor reserved bits are all 0 2018-10-19 11:46:55 +01:00
data
…
debug_tools/crash_log_parser Fix tool crashing when lines end with cr(not crlf) 2018-06-27 17:06:50 -05:00
dev
…
export Remove unused local 2018-11-02 19:49:52 -05:00
flash_algo Python2+3: flash_algo 2018-02-05 11:13:40 -06:00
git_hooks Remove unused git hook 2018-07-16 14:10:21 -05:00
host_tests Python2+3: tests import correctly 2018-02-05 11:04:36 -06:00
importer Add details to importer script docs 2018-08-25 20:40:36 -05:00
misc Python2+3: iteritems -> items 2018-02-05 11:04:36 -06:00
notifier Merge pull request #6999 from evva-sfw/feature/extend_error_warning_msg_as_link 2018-06-07 10:11:23 -05:00
profiles IOTCORE-389 - bring back legacy alignment for Arm C6 2018-09-11 15:04:48 +01:00
resources Remove what we're checking for membership 2018-11-02 19:49:52 -05:00
targets tools: Raise NotSupported when target definition is incomplete 2018-10-19 11:46:55 +01:00
test Remove mbed-os-example-client 2018-10-19 11:46:55 +01:00
test_configs Enabled trace, added KW24D default driver 2018-10-08 15:29:18 +01:00
toolchains Tools: Don't traceback on missing linker script 2018-11-02 19:49:52 -05:00
.mbedignore
…
__init__.py
…
build.py build: fix notifier typo and passing to builds API 2018-05-16 13:30:06 +01:00
build_api.py Adding file type for linker script arg in make script 2018-11-02 19:49:53 -05:00
build_release.py Make release errors very visible 2018-07-16 14:12:00 -05:00
build_travis.py Disable Maxim boards as LP_TICKER is used in RTC and they don't respect device_has 2018-05-25 12:20:09 -05:00
check_release.json Add an ignore list so that sets of test, target can be excluded from the 2017-03-16 15:46:20 +00:00
check_release.py Add an ignore list so that sets of test, target can be excluded from the 2017-03-16 15:46:20 +00:00
default_settings.py Removing GCC_CR mention from settings.py 2018-10-19 11:46:55 +01:00
detect_targets.py Merge pull request #6000 from daid/patch-1 2018-02-15 10:57:15 -06:00
device_management.py mbed dm: Check for missing payload and give a better error message 2018-10-19 11:46:55 +01:00
get_config.py Simplify get_config toolchain handling 2018-07-16 14:11:09 -05:00
hooks.py Python2+3: working through many has_attr exceptions 2018-02-05 11:04:01 -06:00
libraries.py tools: remove usb host from mbed 2 scripts 2017-05-12 14:51:49 -05:00
make.py Create update images with managed bl mode 2018-07-20 10:53:00 -05:00
memap.py Tools, memap: Silence warnings that we handled correctly 2018-10-19 11:46:55 +01:00
memap_flamegraph.html Impl differential memap 2018-07-24 11:40:43 -05:00
options.py Python2+3: Use absolute import where possible 2018-02-05 11:07:37 -06:00
paths.py tools: remove usb host from mbed 2 scripts 2017-05-12 14:51:49 -05:00
project.py Improve resources API to include more use cases 2018-07-16 14:11:08 -05:00
run_icetea.py Move exception earlier 2018-10-08 15:18:50 +01:00
settings.py Removing GCC_CR mention from settings.py 2018-10-19 11:46:55 +01:00
singletest.py Remove references to GCC_CR from the rest of the tools 2018-10-19 11:46:55 +01:00
size.py Remove references to GCC_CR from the rest of the tools 2018-10-19 11:46:55 +01:00
synch.py Updated to allow for new directory structure for mbed-dev source. 2017-02-03 16:50:45 +00:00
test.py Small fixes based on github comments 2018-08-31 11:52:30 +03:00
test_api.py python scripts : table print with github policy 2018-09-11 15:04:48 +01:00
test_db.py
…
test_exporters.py Python2+3: iteritems -> items 2018-02-05 11:04:36 -06:00
test_mysql.py
…
test_webapi.py
…
tests.py Python2+3: make.py -n 2018-02-05 11:07:37 -06:00
upload_results.py Python2+3: iteritems -> items 2018-02-05 11:04:36 -06:00
utils.py Merge duplicate keys in JSON. 2018-11-02 19:49:54 -05:00