diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-12-14 12:19:24 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-12-14 12:54:11 +0100 |
| commit | 97183ed760478c5b970c8c549d99c8147a72e293 (patch) | |
| tree | b2d9568f8e28a1559442f0a2faaaeb8e454f72db /dashboard | |
| parent | b22a7ec30951c01f7f54f811b7f636987c86b0ca (diff) | |
dashboard/config/linux: disable IIO_CROS_EC_SENSORS_CORE
It's build broken on ChromeOS:
cros_ec_activity.c:232:7: error: this statement may fall through
Diffstat (limited to 'dashboard')
| -rw-r--r-- | dashboard/config/linux/bits/chromeos.yml | 5 | ||||
| -rw-r--r-- | dashboard/config/linux/chromeos-5.4-base.config | 10 | ||||
| -rw-r--r-- | dashboard/config/linux/chromeos-5.4.config | 10 |
3 files changed, 7 insertions, 18 deletions
diff --git a/dashboard/config/linux/bits/chromeos.yml b/dashboard/config/linux/bits/chromeos.yml index 08058a145..c1607cd95 100644 --- a/dashboard/config/linux/bits/chromeos.yml +++ b/dashboard/config/linux/bits/chromeos.yml @@ -8,3 +8,8 @@ config: - SECURITY_CHROMIUMOS_NO_UNPRIVILEGED_UNSAFE_MOUNTS: n # These were used historically, their origins are lost. - CMDLINE: [append, "noresume noswap dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=1 i915.modeset=1 cros_efi"] + # These break build on e28e048c with the following error and we don't test them anyway: + # cros_ec_activity.c:232:7: error: this statement may fall through + - IIO_CROS_EC_SENSORS_CORE: n + - IIO_CROS_EC_SENSORS_RING: n + - IIO_CROS_EC_SENSORS_SYNC: n diff --git a/dashboard/config/linux/chromeos-5.4-base.config b/dashboard/config/linux/chromeos-5.4-base.config index fd3ec139a..cee1367f3 100644 --- a/dashboard/config/linux/chromeos-5.4-base.config +++ b/dashboard/config/linux/chromeos-5.4-base.config @@ -5317,7 +5317,6 @@ CONFIG_IIO_SW_TRIGGER=y # CONFIG_DA311 is not set # CONFIG_DMARD09 is not set # CONFIG_DMARD10 is not set -CONFIG_IIO_CROS_EC_ACCEL_LEGACY=y # CONFIG_IIO_ST_ACCEL_3AXIS is not set # CONFIG_KXSD9 is not set # CONFIG_KXCJK1013 is not set @@ -5405,12 +5404,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=y # CONFIG_VZ89X is not set # end of Chemical Sensors -CONFIG_IIO_CROS_EC_SENSORS_CORE=y -CONFIG_IIO_CROS_EC_SENSORS=y -CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=y -CONFIG_IIO_CROS_EC_ACTIVITY=y -CONFIG_IIO_CROS_EC_SENSORS_RING=y -CONFIG_IIO_CROS_EC_SENSORS_SYNC=y +# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set # # Hid Sensor IIO Common @@ -5550,7 +5544,6 @@ CONFIG_ACPI_ALS=y # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set # CONFIG_CM36651 is not set -CONFIG_IIO_CROS_EC_LIGHT_PROX=y # CONFIG_GP2AP020A00F is not set CONFIG_SENSORS_ISL29018=y # CONFIG_SENSORS_ISL29028 is not set @@ -5643,7 +5636,6 @@ CONFIG_IIO_SYSFS_TRIGGER=y # # CONFIG_ABP060MG is not set # CONFIG_BMP280 is not set -CONFIG_IIO_CROS_EC_BARO=y # CONFIG_DPS310 is not set # CONFIG_HP03 is not set # CONFIG_MPL115_I2C is not set diff --git a/dashboard/config/linux/chromeos-5.4.config b/dashboard/config/linux/chromeos-5.4.config index 7e7602cd6..701cb59c3 100644 --- a/dashboard/config/linux/chromeos-5.4.config +++ b/dashboard/config/linux/chromeos-5.4.config @@ -5533,7 +5533,6 @@ CONFIG_IIO_SW_TRIGGER=y # CONFIG_DMARD06 is not set # CONFIG_DMARD09 is not set # CONFIG_DMARD10 is not set -CONFIG_IIO_CROS_EC_ACCEL_LEGACY=y # CONFIG_IIO_ST_ACCEL_3AXIS is not set # CONFIG_KXSD9 is not set # CONFIG_KXCJK1013 is not set @@ -5628,12 +5627,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=y # CONFIG_VZ89X is not set # end of Chemical Sensors -CONFIG_IIO_CROS_EC_SENSORS_CORE=y -CONFIG_IIO_CROS_EC_SENSORS=y -CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=y -CONFIG_IIO_CROS_EC_ACTIVITY=y -CONFIG_IIO_CROS_EC_SENSORS_RING=y -CONFIG_IIO_CROS_EC_SENSORS_SYNC=y +# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set # # Hid Sensor IIO Common @@ -5777,7 +5771,6 @@ CONFIG_ACPI_ALS=y # CONFIG_CM3323 is not set # CONFIG_CM3605 is not set # CONFIG_CM36651 is not set -CONFIG_IIO_CROS_EC_LIGHT_PROX=y # CONFIG_GP2AP020A00F is not set CONFIG_SENSORS_ISL29018=y # CONFIG_SENSORS_ISL29028 is not set @@ -5872,7 +5865,6 @@ CONFIG_IIO_SYSFS_TRIGGER=y # # CONFIG_ABP060MG is not set # CONFIG_BMP280 is not set -CONFIG_IIO_CROS_EC_BARO=y # CONFIG_DPS310 is not set # CONFIG_HP03 is not set # CONFIG_MPL115_I2C is not set |