app makefiles: set CONFIG_* variables where applicable

22 files changed, 28 insertions, 31 deletions

diff --git a/Makefile b/Makefile
index 369d26c..d45e8be 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,11 @@
 # Only load .config when app/arch are not specified on commandline
 ifneq (${app}, )
 	CONFIG_app = ${app}
+	CONFIG_arch = ${arch}
 else
 	-include .config
 endif
 
-ifneq (${arch}, )
-	CONFIG_arch = ${arch}
-endif
-
 # Make cannot include "foo"/Makefile.inc, so remove quotes from config entries
 quote="
 app_dir = $(subst ${quote},,${CONFIG_app})
diff --git a/src/app/blinkencat3/Makefile.inc b/src/app/blinkencat3/Makefile.inc
index 4d82280..1e6ffd2 100644
--- a/src/app/blinkencat3/Makefile.inc
+++ b/src/app/blinkencat3/Makefile.inc
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 	override arch_drivers += ,neopixel
 endif
diff --git a/src/app/bme680-max44009-logger/Makefile.inc b/src/app/bme680-max44009-logger/Makefile.inc
index 8a7f5d3..226bc40 100644
--- a/src/app/bme680-max44009-logger/Makefile.inc
+++ b/src/app/bme680-max44009-logger/Makefile.inc
@@ -5,9 +5,10 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 	override arch_drivers += ,i2c
-	override drivers += ,bme680,max44009
+	CONFIG_driver_bme680 = y
+	CONFIG_driver_max44009 = y
 endif
 
 COMMON_FLAGS += -DBME680_FLOAT_POINT_COMPENSATION
diff --git a/src/app/button-and-motion-logger/Makefile.inc b/src/app/button-and-motion-logger/Makefile.inc
index f783342..369a0d8 100644
--- a/src/app/button-and-motion-logger/Makefile.inc
+++ b/src/app/button-and-motion-logger/Makefile.inc
@@ -6,5 +6,5 @@
 
 ifdef app
 	override arch_drivers += ,adc,i2c
-	override drivers += ,mpu9250
+	CONFIG_driver_mpu9250 = y
 endif
diff --git a/src/app/ccs811test/Makefile.inc b/src/app/ccs811test/Makefile.inc
index 3e53dfa..933df6b 100644
--- a/src/app/ccs811test/Makefile.inc
+++ b/src/app/ccs811test/Makefile.inc
@@ -6,6 +6,6 @@
 
 ifdef app
 	override arch_drivers += ,i2c
-	override drivers += ,ccs811
-	override loop = 1
+	CONFIG_driver_ccS811 = y
+	CONFIG_loop = y
 endif
diff --git a/src/app/countertest/Makefile.inc b/src/app/countertest/Makefile.inc
index a75805d..836882a 100644
--- a/src/app/countertest/Makefile.inc
+++ b/src/app/countertest/Makefile.inc
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 	override arch_drivers += ,counter
 endif
diff --git a/src/app/deflatetest/Makefile.inc b/src/app/deflatetest/Makefile.inc
index 1a60b75..9d39819 100644
--- a/src/app/deflatetest/Makefile.inc
+++ b/src/app/deflatetest/Makefile.inc
@@ -6,9 +6,9 @@
 
 ifdef app
 	override timer_s = 0
-	override loop = 0
 	override arch_drivers += ,counter
 	override CONFIG_lib_inflate = y
+	#COMMON_FLAGS += -Wl,--library-path=src/arch/msp430fr5994lp -T msp430fr5994-no-lea.ld
 endif
 
 ifdef deflate_nop
diff --git a/src/app/donothing/Makefile.inc b/src/app/donothing/Makefile.inc
index b8ed566..37186e2 100644
--- a/src/app/donothing/Makefile.inc
+++ b/src/app/donothing/Makefile.inc
@@ -6,5 +6,4 @@
 
 ifdef app
 	override timer_s = 0
-	override loop = 0
 endif
diff --git a/src/app/i2cdetect/Makefile.inc b/src/app/i2cdetect/Makefile.inc
index eaf91d6..d2a9de5 100644
--- a/src/app/i2cdetect/Makefile.inc
+++ b/src/app/i2cdetect/Makefile.inc
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 	override arch_drivers += ,i2c
 endif
diff --git a/src/app/ledblink/Makefile.inc b/src/app/ledblink/Makefile.inc
index c0417b6..c10dce5 100644
--- a/src/app/ledblink/Makefile.inc
+++ b/src/app/ledblink/Makefile.inc
@@ -5,5 +5,5 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 endif
diff --git a/src/app/loratest/Makefile.inc b/src/app/loratest/Makefile.inc
index c0417b6..c10dce5 100644
--- a/src/app/loratest/Makefile.inc
+++ b/src/app/loratest/Makefile.inc
@@ -5,5 +5,5 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 endif
diff --git a/src/app/luxlog/Makefile.inc b/src/app/luxlog/Makefile.inc
index 13b9ac9..bb965e3 100644
--- a/src/app/luxlog/Makefile.inc
+++ b/src/app/luxlog/Makefile.inc
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 	override arch_drivers += ,i2c
-	override drivers += ,max44009
+	CONFIG_driver_max44009 = y
 endif
diff --git a/src/app/mpu9250_motionlog/Makefile.inc b/src/app/mpu9250_motionlog/Makefile.inc
index cade3de..3ae4770 100644
--- a/src/app/mpu9250_motionlog/Makefile.inc
+++ b/src/app/mpu9250_motionlog/Makefile.inc
@@ -6,5 +6,5 @@
 
 ifdef app
 	override arch_drivers += ,i2c
-	override drivers += ,mpu9250
+	CONFIG_driver_mpu9250 = y
 endif
diff --git a/src/app/sharp96test/Makefile.inc b/src/app/sharp96test/Makefile.inc
index 8cd8a11..b0c74ef 100644
--- a/src/app/sharp96test/Makefile.inc
+++ b/src/app/sharp96test/Makefile.inc
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
-	override arch_drivers += spi
-	override drivers += sharp96
+	CONFIG_loop = y
+	override arch_drivers += ,spi
+	CONFIG_driver_sharp96 = y
 endif
diff --git a/src/app/shell/Makefile.inc b/src/app/shell/Makefile.inc
index 83986cd..0cc1dcf 100644
--- a/src/app/shell/Makefile.inc
+++ b/src/app/shell/Makefile.inc
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 0
-	override wakeup = 1
+	override undefine CONFIG_loop
+	CONFIG_wakeup = y
 	override arch_drivers += ,stdin
 endif
diff --git a/src/app/sysinfo/Makefile.inc b/src/app/sysinfo/Makefile.inc
index c0417b6..c10dce5 100644
--- a/src/app/sysinfo/Makefile.inc
+++ b/src/app/sysinfo/Makefile.inc
@@ -5,5 +5,5 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 endif
diff --git a/src/app/timertest/Makefile.inc b/src/app/timertest/Makefile.inc
index d00b239..cf91e0c 100644
--- a/src/app/timertest/Makefile.inc
+++ b/src/app/timertest/Makefile.inc
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 	override timer_s = 1
 	override arch_drivers += ,timer
 endif
diff --git a/src/app/transactiontest/Makefile.inc b/src/app/transactiontest/Makefile.inc
index 6d5b4f1..d1766bb 100644
--- a/src/app/transactiontest/Makefile.inc
+++ b/src/app/transactiontest/Makefile.inc
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 	override timer_s = 1
 endif
 
diff --git a/src/app/waittest/Makefile.inc b/src/app/waittest/Makefile.inc
index d00b239..cf91e0c 100644
--- a/src/app/waittest/Makefile.inc
+++ b/src/app/waittest/Makefile.inc
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 	override timer_s = 1
 	override arch_drivers += ,timer
 endif
diff --git a/src/app/wetterstation/Makefile.inc b/src/app/wetterstation/Makefile.inc
index c0417b6..c10dce5 100644
--- a/src/app/wetterstation/Makefile.inc
+++ b/src/app/wetterstation/Makefile.inc
@@ -5,5 +5,5 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 endif
diff --git a/src/app/ws2812b_dmap/Makefile.inc b/src/app/ws2812b_dmap/Makefile.inc
index 18bc352..643d85e 100644
--- a/src/app/ws2812b_dmap/Makefile.inc
+++ b/src/app/ws2812b_dmap/Makefile.inc
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 	override arch_drivers += ,stdin,neopixel
 endif
diff --git a/src/app/ws2812b_uart/Makefile.inc b/src/app/ws2812b_uart/Makefile.inc
index 18bc352..643d85e 100644
--- a/src/app/ws2812b_uart/Makefile.inc
+++ b/src/app/ws2812b_uart/Makefile.inc
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 ifdef app
-	override loop = 1
+	CONFIG_loop = y
 	override arch_drivers += ,stdin,neopixel
 endif