diff --git a/boards/samr21-xpro/include/at86rf2xx_params.h b/boards/samr21-xpro/include/at86rf2xx_params.h
deleted file mode 100644
index c74f33f160..0000000000
--- a/boards/samr21-xpro/include/at86rf2xx_params.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2015 Kaspar Schleiser <kaspar@schleiser.de>
- *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License v2.1. See the file LICENSE in the top level
- * directory for more details.
- */
-
-/**
- * @ingroup   board_samr21-xpro
- * @{
- *
- * @file
- * @brief     at86rf233 board specific configuration
- *
- * @author    Kaspar Schleiser <kaspar@schleiser.de>
- */
-
-#ifndef AT86RF2XX_PARAMS_H_
-#define AT86RF2XX_PARAMS_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @name AT86RF231 configuration
- */
-static const  at86rf2xx_params_t at86rf2xx_params[] =
-    {
-        {
-            .spi = AT86RF233_SPI,
-            .spi_speed = AT86RF233_SPI_CLK,
-            .cs_pin = AT86RF233_CS,
-            .int_pin = AT86RF233_INT,
-            .sleep_pin = AT86RF233_SLEEP,
-            .reset_pin = AT86RF233_RESET,
-        },
-    };
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* AT86RF2XX_PARAMS_H_ */
-/** @} */
diff --git a/boards/samr21-xpro/include/board.h b/boards/samr21-xpro/include/board.h
index 3a96c9e061..c4c3d56771 100644
--- a/boards/samr21-xpro/include/board.h
+++ b/boards/samr21-xpro/include/board.h
@@ -41,18 +41,6 @@ extern "C" {
 #define XTIMER              TIMER_1
 #define XTIMER_CHAN         (0)
 
-/**
-* @name AT86RF233 configuration
-* @{
-*/
-#define AT86RF233_SPI       (SPI_0)
-#define AT86RF233_CS        GPIO_PIN(PB, 31)
-#define AT86RF233_INT       GPIO_PIN(PB, 0)
-#define AT86RF233_RESET     GPIO_PIN(PB, 15)
-#define AT86RF233_SLEEP     GPIO_PIN(PA, 20)
-#define AT86RF233_SPI_CLK   (SPI_SPEED_1MHZ)
-/** @}*/
-
 /**
  * @name Define UART device and baudrate for stdio
  * @{
@@ -62,6 +50,18 @@ extern "C" {
 #define STDIO_RX_BUFSIZE    (64U)
 /** @} */
 
+/**
+ * @name AT86RF233 configuration
+ *
+ * {spi bus, spi speed, cs pin, int pin, reset pin, sleep pin}
+ */
+#define AT86RF2XX_PARAMS_BOARD      {.spi = SPI_0, \
+                                     .spi_speed = SPI_SPEED_5MHZ, \
+                                     .cs_pin = GPIO_PIN(PB, 31), \
+                                     .int_pin = GPIO_PIN(PB, 0), \
+                                     .sleep_pin = GPIO_PIN(PA, 20), \
+                                     .reset_pin = GPIO_PIN(PB, 15)}
+
 /**
  * @name LED pin definitions
  * @{