From c45354687f93c651441e8a9abeb21b16140de581 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Tue, 5 Nov 2019 14:04:23 +0100 Subject: Makefiles: Fix arch_drivers and drivers overides/additions += does not work for variables specified on the commandline unless the 'override' keyword is used --- Makefile | 2 +- src/app/ccs811test/Makefile.inc | 4 ++-- src/app/countertest/Makefile.inc | 2 +- src/app/mpu9250_motionlog/Makefile.inc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 15e83c6..17952bb 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ ifeq (${i2c_pullup}, gpio) endif ifeq (${softi2c_timer}, 1) - arch_drivers += ,timer + override arch_drivers += ,timer COMMON_FLAGS += -DSOFTI2C_TIMER endif diff --git a/src/app/ccs811test/Makefile.inc b/src/app/ccs811test/Makefile.inc index b6920c9..4889e55 100644 --- a/src/app/ccs811test/Makefile.inc +++ b/src/app/ccs811test/Makefile.inc @@ -1,3 +1,3 @@ -arch_drivers += ,i2c -drivers += ,ccs811 +override arch_drivers += ,i2c +override drivers += ,ccs811 loop ?= 1 diff --git a/src/app/countertest/Makefile.inc b/src/app/countertest/Makefile.inc index 7e15c58..f8a5514 100644 --- a/src/app/countertest/Makefile.inc +++ b/src/app/countertest/Makefile.inc @@ -1,2 +1,2 @@ loop ?= 1 -arch_drivers += ,counter +override arch_drivers += ,counter diff --git a/src/app/mpu9250_motionlog/Makefile.inc b/src/app/mpu9250_motionlog/Makefile.inc index e273aaa..5da92be 100644 --- a/src/app/mpu9250_motionlog/Makefile.inc +++ b/src/app/mpu9250_motionlog/Makefile.inc @@ -1,2 +1,2 @@ arch_drivers += ,i2c -drivers += ,mpu9250 +override drivers += ,mpu9250 -- cgit v1.2.3