You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2018/11/26 14:39:29 UTC
[mynewt-core] branch master updated: hw/bus: Make proper fix for
bus driver enable...
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new cb6e535 hw/bus: Make proper fix for bus driver enable...
cb6e535 is described below
commit cb6e535f3a6f32d74e1448626c8ff51570e3ff68
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Mon Nov 26 14:23:49 2018 +0100
hw/bus: Make proper fix for bus driver enable...
My previous patch was just plain stupid since bus driver is enabled by
package dependencies, not by BUS_DRIVER_PRESENT which shall always be
set to 1...
So, in order to enable bus driver one has to pull proper dependencies
and other packages will just use it.
---
hw/bus/syscfg.yml | 2 +-
hw/drivers/sensors/bme280/pkg.yml | 3 ---
hw/mcu/nordic/nrf52xxx/pkg.yml | 11 -----------
hw/sensor/pkg.yml | 6 ------
4 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/hw/bus/syscfg.yml b/hw/bus/syscfg.yml
index 4c21f55..62653bc 100644
--- a/hw/bus/syscfg.yml
+++ b/hw/bus/syscfg.yml
@@ -21,7 +21,7 @@ syscfg.defs:
description: >
This indicated that hw/bus package is present in build.
Do not override this settings.
- value: 0
+ value: 1
BUS_DEBUG_OS_DEV:
description: >
diff --git a/hw/drivers/sensors/bme280/pkg.yml b/hw/drivers/sensors/bme280/pkg.yml
index 2e7ed1a..8f9780e 100644
--- a/hw/drivers/sensors/bme280/pkg.yml
+++ b/hw/drivers/sensors/bme280/pkg.yml
@@ -39,6 +39,3 @@ pkg.req_apis:
pkg.deps.BME280_CLI:
- "@apache-mynewt-core/util/parse"
-pkg.deps.BUS_DRIVER_PRESENT:
- - "@apache-mynewt-core/hw/bus/i2c"
- - "@apache-mynewt-core/hw/bus/spi"
diff --git a/hw/mcu/nordic/nrf52xxx/pkg.yml b/hw/mcu/nordic/nrf52xxx/pkg.yml
index 63c0fd2..1080532 100644
--- a/hw/mcu/nordic/nrf52xxx/pkg.yml
+++ b/hw/mcu/nordic/nrf52xxx/pkg.yml
@@ -68,14 +68,3 @@ pkg.deps.PWM_2:
pkg.deps.PWM_3:
- "@apache-mynewt-core/hw/drivers/pwm/pwm_nrf52"
-pkg.deps.I2C_0:
- - "@apache-mynewt-core/hw/bus"
- - "@apache-mynewt-core/hw/bus/i2c"
-
-pkg.deps.I2C_1:
- - "@apache-mynewt-core/hw/bus"
- - "@apache-mynewt-core/hw/bus/i2c"
-
-pkg.deps.SPI_1_MASTER:
- - "@apache-mynewt-core/hw/bus"
- - "@apache-mynewt-core/hw/bus/spi"
diff --git a/hw/sensor/pkg.yml b/hw/sensor/pkg.yml
index db27064..7c61a7c 100644
--- a/hw/sensor/pkg.yml
+++ b/hw/sensor/pkg.yml
@@ -33,12 +33,6 @@ pkg.deps.SENSOR_CLI:
- "@apache-mynewt-core/sys/shell"
- "@apache-mynewt-core/util/parse"
-# XXX probably both do not need to be always included, but let's keep it like
-# this for now to make things simpler
-pkg.deps.BUS_DRIVER_PRESENT:
- - "@apache-mynewt-core/hw/bus/i2c"
- - "@apache-mynewt-core/hw/bus/spi"
-
pkg.req_apis:
- console