From d0dcfef7b3a019c8c27d27675744b2c2ba12cea3 Mon Sep 17 00:00:00 2001
From: Bas Stottelaar <basstottelaar@gmail.com>
Date: Fri, 16 Mar 2018 19:37:54 +0100
Subject: [PATCH] boards: slstk3401a, sltb001a: cleanup of module includes

---
 boards/slstk3401a/board.c       | 2 +-
 boards/sltb001a/board.c         | 8 ++++----
 boards/sltb001a/include/board.h | 6 ------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/boards/slstk3401a/board.c b/boards/slstk3401a/board.c
index cde723bfae..37313bb027 100644
--- a/boards/slstk3401a/board.c
+++ b/boards/slstk3401a/board.c
@@ -31,7 +31,7 @@ void board_init(void)
     /* perform common board initialization */
     board_common_init();
 
-#ifdef MODULE_SI70XX
+#ifdef MODULE_SI7021
     /* initialize the Si7021 sensor */
     gpio_init(SI7021_EN_PIN, GPIO_OUT);
     gpio_set(SI7021_EN_PIN);
diff --git a/boards/sltb001a/board.c b/boards/sltb001a/board.c
index a53862753c..3ebbbd1144 100644
--- a/boards/sltb001a/board.c
+++ b/boards/sltb001a/board.c
@@ -34,23 +34,23 @@ void board_init(void)
     board_common_init();
 
 #ifdef MODULE_SILABS_PIC
-    /* enable the CCS811 air quality/gas sensor */
 #if CCS811_ENABLED
+    /* enable the CCS811 air quality/gas sensor */
     pic_write(CCS811_PIC_ADDR, (1 << CCS811_PIC_EN_BIT) | (1 << CCS811_PIC_WAKE_BIT));
 #endif
 
-    /* enable the IMU sensor */
 #if ICM_20648_ENABLED
+    /* enable the IMU sensor */
     pic_write(ICM20648_PIC_ADDR, 1 << ICM20648_PIC_EN_BIT);
 #endif
 
+#if defined(MODULE_BMP280) || defined(MODULE_SI7021) || SI1133_ENABLED || SI7210A_ENABLED
     /* enable the environmental sensors */
-#if BMP280_ENABLED || SI1133_ENABLED || SI7021_ENABLED || SI7210A_ENABLED
     pic_write(ENV_SENSE_PIC_ADDR, 1 << ENV_SENSE_PIC_BIT);
 #endif
 
-    /* enable the RGB leds */
 #if RGB_LED1_ENABLED || RGB_LED2_ENABLED || RGB_LED3_ENABLED || RGB_LED4_ENABLED
+    /* enable the RGB leds */
     pic_write(RGB_LED_ADDR,
               (1 << RGB_LED_EN_BIT) |
               (RGB_LED1_ENABLED << RGB_LED1_EN_BIT) |
diff --git a/boards/sltb001a/include/board.h b/boards/sltb001a/include/board.h
index 4fd5322b97..ead4796d49 100644
--- a/boards/sltb001a/include/board.h
+++ b/boards/sltb001a/include/board.h
@@ -86,9 +86,6 @@ extern "C" {
  * Connection to the on-board pressure sensor (BMP280).
  * @{
  */
-#ifndef BMP280_ENABLED
-#define BMP280_ENABLED          (1)
-#endif
 #define BMP280_I2C              I2C_DEV(0)
 
 #define BMX280_PARAM_I2C_DEV    BMP280_I2C
@@ -178,9 +175,6 @@ extern "C" {
  * Connection to the on-board temperature/humidity sensor (Si7021).
  * @{
  */
-#ifndef SI7021_ENABLED
-#define SI7021_ENABLED          (1)
-#endif
 #define SI7021_I2C              I2C_DEV(0)
 
 #define SI70XX_PARAM_I2C_DEV    SI7021_I2C