diff options
| author | Christopher Collins <ccollins@apache.org> | 2016-08-23 17:35:28 -0700 |
|---|---|---|
| committer | Christopher Collins <ccollins@apache.org> | 2016-08-23 17:35:28 -0700 |
| commit | 70987f7d2e3c791132509f08566fe77de34142ac (patch) | |
| tree | 269ca9b857f65c22b8f2b93560466984f96091e5 /net/nimble/host/pkg.yml | |
| parent | 0d9c8f30efbe2dba00b21d9185e9db8e36cd579e (diff) | |
| parent | 665e22f5722d6348c1b260192e27f69d855b58fd (diff) | |
Merge branch 'develop' - in preparation for
backwards-compatibility-breaking changes to develop.
* develop: (290 commits)
sim compiler - replace objsize with size
Fix warnings reported by clang.
MYNEWT-329
MYNEWT-354
STM32f407 discovery board BSP
mbedtls; use smaller version of SHA256.
boot; boot loader does not need to call os_init() anymore, as bsp_init() has been exported.
boot; app does not need the dependency to mbedtls
slinky; time-based waits must use OS_TICKS_PER_SEC.
bootutil; adjust unit tests to work with status upkeep outside sys/config.
bootutil; was returning wrong image header in response when swithing images. Add boot_set_req() routine for unit test use.
boot/bootutil; remove debug console use from bootloader.
bootutil/imgmgr; output of boot now shows the fallback image.
imgmgr; automatically confirm image as good for now.
bootutil; add 'confirm' step, telling that image was confirmed as good. Otherwise next restart we'll go back to old image.
bootutil; make status element size depend on flash alignment restrictions.
boot, imgmgr; return the slot number for test image.
bootutil; move routines reading boot-copy-status from loader.c to bootutil_misc.c.
boot; return full flash location of status bytes, instead of just offset.
boot; don't use NFFS or FCB for keeping status. Interim commit.
...
Diffstat (limited to 'net/nimble/host/pkg.yml')
| -rw-r--r-- | net/nimble/host/pkg.yml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/net/nimble/host/pkg.yml b/net/nimble/host/pkg.yml index f597f344..a45ba1e5 100644 --- a/net/nimble/host/pkg.yml +++ b/net/nimble/host/pkg.yml @@ -36,17 +36,23 @@ pkg.deps: # Tinycrypt is only required when secure connections (NIMBPLE_OPT_SM_SC) # is enabled. It always gets built as a dependency, but not is not # included by the linker unless SC is enabled. XXX: We should not build - # this library if it is not requiresd. + # this library if it is not required. - libs/tinycrypt pkg.req_apis: + - ble_transport - console +pkg.features: + - BLE_HOST + # Satisfy capability dependencies for the self-contained test executable. -pkg.deps.SELFTEST: libs/console/stub +pkg.deps.SELFTEST: + - libs/console/stub + - net/nimble/transport/ram + pkg.cflags.SELFTEST: - - -DPHONY_TRANSPORT=1 - - -DPHONY_HCI_ACKS=1 - - -DNIMBLE_OPT_SM=1 - - -DNIMBLE_OPT_SM_SC=1 + - "-DPHONY_HCI_ACKS=1" + - "-DNIMBLE_OPT_SM=1" + - "-DNIMBLE_OPT_SM_SC=1" pkg.cflags.TEST: -DBLE_HS_DEBUG |