Pull CPU-related configuration from the CPU header (CC13xx/CC26xx)

arch/platform/srf06-cc26xx/contiki-conf.h

@@ -44,164 +44,6 @@
 #include PROJECT_CONF_PATH
 #endif /* PROJECT_CONF_PATH */
 /*---------------------------------------------------------------------------*/
-/**
- * \name Network Stack Configuration
- *
- * @{
- */
-
-/*
- * If set, the systems keeps the HF crystal oscillator on even when the radio is off.
- * You need to set this to 1 to use TSCH with its default 2.2ms or larger guard time.
- */
-#ifndef CC2650_FAST_RADIO_STARTUP
-#define CC2650_FAST_RADIO_STARTUP               (MAC_CONF_WITH_TSCH)
-#endif
-
-#ifdef RF_CHANNEL
-#define RF_CORE_CONF_CHANNEL             RF_CHANNEL
-#endif
-
-#ifndef RF_CORE_CONF_CHANNEL
-#define RF_CORE_CONF_CHANNEL                     25
-#endif
-
-/* Number of Prop Mode RX buffers */
-#ifndef PROP_MODE_CONF_RX_BUF_CNT
-#define PROP_MODE_CONF_RX_BUF_CNT        4
-#endif
-
-/*
- * Auto-configure Prop-mode radio if we are running on CC13xx, unless the
- * project has specified otherwise. Depending on the final mode, determine a
- * default channel (again, if unspecified) and configure RDC params
- */
-#if CPU_FAMILY_CC13XX
-#ifndef CC13XX_CONF_PROP_MODE
-#define CC13XX_CONF_PROP_MODE 1
-#endif /* CC13XX_CONF_PROP_MODE */
-#endif /* CPU_FAMILY_CC13XX */
-
-#if CC13XX_CONF_PROP_MODE
-#define NETSTACK_CONF_RADIO        prop_mode_driver
-
-#ifndef RF_CORE_CONF_CHANNEL
-#define RF_CORE_CONF_CHANNEL                      0
-#endif
-
-#define CSMA_CONF_ACK_WAIT_TIME                (RTIMER_SECOND / 400)
-#define CSMA_CONF_AFTER_ACK_DETECTED_WAIT_TIME (RTIMER_SECOND / 1000)
-#define CSMA_CONF_SEND_SOFT_ACK              1
-
-#else /* CC13XX_CONF_PROP_MODE */
-#define NETSTACK_CONF_RADIO        ieee_mode_driver
-
-#define CSMA_CONF_SEND_SOFT_ACK              0
-#endif /* CC13XX_CONF_PROP_MODE */
-
-#define NETSTACK_RADIO_MAX_PAYLOAD_LEN        125
-
-/** @} */
-/*---------------------------------------------------------------------------*/
-/**
- * \name IEEE address configuration
- *
- * Used to generate our link-local & IPv6 address
- * @{
- */
-/**
- * \brief Location of the IEEE address
- * 0 => Read from InfoPage,
- * 1 => Use a hardcoded address, configured by IEEE_ADDR_CONF_ADDRESS
- */
-#ifndef IEEE_ADDR_CONF_HARDCODED
-#define IEEE_ADDR_CONF_HARDCODED             0
-#endif
-
-/**
- * \brief The hardcoded IEEE address to be used when IEEE_ADDR_CONF_HARDCODED
- * is defined as 1
- */
-#ifndef IEEE_ADDR_CONF_ADDRESS
-#define IEEE_ADDR_CONF_ADDRESS { 0x00, 0x12, 0x4B, 0x00, 0x89, 0xAB, 0xCD, 0xEF }
-#endif
-/** @} */
-/*---------------------------------------------------------------------------*/
-/**
- * \name RF configuration
- *
- * @{
- */
-/* RF Config */
-
-#ifndef IEEE_MODE_CONF_AUTOACK
-#define IEEE_MODE_CONF_AUTOACK               1 /**< RF H/W generates ACKs */
-#endif
-
-#ifndef IEEE_MODE_CONF_PROMISCOUS
-#define IEEE_MODE_CONF_PROMISCOUS            0 /**< 1 to enable promiscous mode */
-#endif
-
-#ifndef RF_BLE_CONF_ENABLED
-#define RF_BLE_CONF_ENABLED                  0 /**< 0 to disable BLE support */
-#endif
-/** @} */
-/*---------------------------------------------------------------------------*/
-/**
- * \name Character I/O Configuration
- *
- * @{
- */
-#ifndef CC26XX_UART_CONF_ENABLE
-#define CC26XX_UART_CONF_ENABLE            1 /**< Enable/Disable UART I/O */
-#endif
-
-#ifndef CC26XX_UART_CONF_BAUD_RATE
-#define CC26XX_UART_CONF_BAUD_RATE    115200 /**< Default UART0 baud rate */
-#endif
-
-/* Enable I/O over the Debugger Devpack - Only relevant for the SensorTag */
-#ifndef BOARD_CONF_DEBUGGER_DEVPACK
-#define BOARD_CONF_DEBUGGER_DEVPACK        1
-#endif
-
-#ifndef SLIP_ARCH_CONF_ENABLED
-/*
- * Determine whether we need SLIP
- * This will keep working while UIP_FALLBACK_INTERFACE and CMD_CONF_OUTPUT
- * keep using SLIP
- */
-#if defined(UIP_FALLBACK_INTERFACE) || defined(CMD_CONF_OUTPUT)
-#define SLIP_ARCH_CONF_ENABLED             1
-#endif
-#endif
-/** @} */
-/*---------------------------------------------------------------------------*/
-/**
- * \name JTAG interface configuration
- *
- * Enable/Disable the JTAG DAP and TAP interfaces on the chip.
- * Setting this to 0 will disable access to the debug interface
- * to secure deployed images.
- * @{
- */
-#ifndef CCXXWARE_CONF_JTAG_INTERFACE_ENABLE
-#define CCXXWARE_CONF_JTAG_INTERFACE_ENABLE              1
-#endif
-/** @} */
-/*---------------------------------------------------------------------------*/
-/**
- * \name ROM Bootloader configuration
- *
- * Enable/Disable the ROM bootloader in your image, if the board supports it.
- * Look in board.h to choose the DIO and corresponding level that will cause
- * the chip to enter bootloader mode.
- * @{
- */
-#ifndef ROM_BOOTLOADER_ENABLE
-#define ROM_BOOTLOADER_ENABLE              0
-#endif
-/** @} */
 #include "cc13xx-cc26xx-def.h"
 /*---------------------------------------------------------------------------*/
 /**
@@ -231,6 +73,9 @@
 /* board.h assumes that basic configuration is done */
 #include "board.h"
 /*---------------------------------------------------------------------------*/
+/* Include CPU-related configuration */
+#include "cc13xx-cc26xx-conf.h"
+/*---------------------------------------------------------------------------*/
 #endif /* CONTIKI_CONF_H */
 
 /** @} */