Merge pull request #622 from g-oikonomou/contrib/cc26xx/bootloader-config

Simplify configuration of the CC13xx/CC26xx ROM bootloader
2018-09-17 14:11:24 +01:00 · 2018-09-17 14:11:24 +01:00 · 182ef5a974
parent ccc89bf745 9a2a3d50aa
commit 182ef5a974
14 changed files with 90 additions and 99 deletions
--- a/arch/cpu/cc26xx-cc13xx/cc13xx-cc26xx-conf.h
+++ b/arch/cpu/cc26xx-cc13xx/cc13xx-cc26xx-conf.h
@ -199,8 +199,14 @@
 * the chip to enter bootloader mode.
 * @{
 */
-#ifndef ROM_BOOTLOADER_ENABLE
-#define ROM_BOOTLOADER_ENABLE              1
+
+/* Backward compatibility */
+#ifdef ROM_BOOTLOADER_ENABLE
+#define CCXXWARE_CONF_ROM_BOOTLOADER_ENABLE ROM_BOOTLOADER_ENABLE
+#endif
+
+#ifndef CCXXWARE_CONF_ROM_BOOTLOADER_ENABLE
+#define CCXXWARE_CONF_ROM_BOOTLOADER_ENABLE              1
 #endif
 /** @} */
 /*---------------------------------------------------------------------------*/
--- a/arch/cpu/cc26xx-cc13xx/ccxxware-conf.h
+++ b/arch/cpu/cc26xx-cc13xx/ccxxware-conf.h
@ -68,6 +68,26 @@
 #define SET_CCFG_CCFG_TAP_DAP_1_WUC_TAP_ENABLE          0x00
 #endif
 /** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief ROM bootloader configuration
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#if CCXXWARE_CONF_ROM_BOOTLOADER_ENABLE
+#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE      0xC5
+#define SET_CCFG_BL_CONFIG_BL_LEVEL               CCXXWARE_CONF_BL_LEVEL
+#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER          CCXXWARE_CONF_BL_PIN_NUMBER
+#define SET_CCFG_BL_CONFIG_BL_ENABLE              0xC5
+#else
+#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE      0x00
+#define SET_CCFG_BL_CONFIG_BL_LEVEL               0x01
+#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER          IOID_UNUSED
+#define SET_CCFG_BL_CONFIG_BL_ENABLE              0xFF
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
 #endif /* CCXXWARE_CONF_H_ */
 /*---------------------------------------------------------------------------*/
 /**
--- a/arch/platform/srf06-cc26xx/launchpad/cc1310/board.h
+++ b/arch/platform/srf06-cc26xx/launchpad/cc1310/board.h
@ -136,23 +136,14 @@
 /**
 * \brief ROM bootloader configuration
 *
- * Change SET_CCFG_BL_CONFIG_BL_PIN_NUMBER to BOARD_IOID_KEY_xyz to select
- * which button triggers the bootloader on reset.
- *
- * The remaining values are not meant to be modified by the user
+ * Change CCXXWARE_CONF_BL_PIN_NUMBER to BOARD_IOID_KEY_xyz to select which
+ * button triggers the bootloader on reset. Use CCXXWARE_CONF_BL_LEVEL to
+ * control the pin level that enables the bootloader (0: low, 1: high). It is
+ * also possible to use any other externally-controlled DIO.
 * @{
 */
-#if ROM_BOOTLOADER_ENABLE
-#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE            0xC5
-#define SET_CCFG_BL_CONFIG_BL_LEVEL                     0x00
-#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER                BOARD_IOID_KEY_LEFT
-#define SET_CCFG_BL_CONFIG_BL_ENABLE                    0xC5
-#else
-#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE            0x00
-#define SET_CCFG_BL_CONFIG_BL_LEVEL                     0x01
-#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER                0xFF
-#define SET_CCFG_BL_CONFIG_BL_ENABLE                    0xFF
-#endif
+#define CCXXWARE_CONF_BL_PIN_NUMBER   BOARD_IOID_KEY_LEFT
+#define CCXXWARE_CONF_BL_LEVEL        0
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
--- a/arch/platform/srf06-cc26xx/launchpad/cc1350/board.h
+++ b/arch/platform/srf06-cc26xx/launchpad/cc1350/board.h
@ -153,23 +153,14 @@
 /**
 * \brief ROM bootloader configuration
 *
- * Change SET_CCFG_BL_CONFIG_BL_PIN_NUMBER to BOARD_IOID_KEY_xyz to select
- * which button triggers the bootloader on reset.
- *
- * The remaining values are not meant to be modified by the user
+ * Change CCXXWARE_CONF_BL_PIN_NUMBER to BOARD_IOID_KEY_xyz to select which
+ * button triggers the bootloader on reset. Use CCXXWARE_CONF_BL_LEVEL to
+ * control the pin level that enables the bootloader (0: low, 1: high). It is
+ * also possible to use any other externally-controlled DIO.
 * @{
 */
-#if ROM_BOOTLOADER_ENABLE
-#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE            0xC5
-#define SET_CCFG_BL_CONFIG_BL_LEVEL                     0x00
-#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER                BOARD_IOID_KEY_LEFT
-#define SET_CCFG_BL_CONFIG_BL_ENABLE                    0xC5
-#else
-#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE            0x00
-#define SET_CCFG_BL_CONFIG_BL_LEVEL                     0x01
-#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER                0xFF
-#define SET_CCFG_BL_CONFIG_BL_ENABLE                    0xFF
-#endif
+#define CCXXWARE_CONF_BL_PIN_NUMBER   BOARD_IOID_KEY_LEFT
+#define CCXXWARE_CONF_BL_LEVEL        0
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
--- a/arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h
+++ b/arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h
@ -136,23 +136,14 @@
 /**
 * \brief ROM bootloader configuration
 *
- * Change SET_CCFG_BL_CONFIG_BL_PIN_NUMBER to BOARD_IOID_KEY_xyz to select
- * which button triggers the bootloader on reset.
- *
- * The remaining values are not meant to be modified by the user
+ * Change CCXXWARE_CONF_BL_PIN_NUMBER to BOARD_IOID_KEY_xyz to select which
+ * button triggers the bootloader on reset. Use CCXXWARE_CONF_BL_LEVEL to
+ * control the pin level that enables the bootloader (0: low, 1: high). It is
+ * also possible to use any other externally-controlled DIO.
 * @{
 */
-#if ROM_BOOTLOADER_ENABLE
-#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE            0xC5
-#define SET_CCFG_BL_CONFIG_BL_LEVEL                     0x00
-#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER                BOARD_IOID_KEY_LEFT
-#define SET_CCFG_BL_CONFIG_BL_ENABLE                    0xC5
-#else
-#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE            0x00
-#define SET_CCFG_BL_CONFIG_BL_LEVEL                     0x01
-#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER                0xFF
-#define SET_CCFG_BL_CONFIG_BL_ENABLE                    0xFF
-#endif
+#define CCXXWARE_CONF_BL_PIN_NUMBER   BOARD_IOID_KEY_LEFT
+#define CCXXWARE_CONF_BL_LEVEL        0
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
--- a/arch/platform/srf06-cc26xx/launchpad/cc2650/board.h
+++ b/arch/platform/srf06-cc26xx/launchpad/cc2650/board.h
@ -136,23 +136,14 @@
 /**
 * \brief ROM bootloader configuration
 *
- * Change SET_CCFG_BL_CONFIG_BL_PIN_NUMBER to BOARD_IOID_KEY_xyz to select
- * which button triggers the bootloader on reset.
- *
- * The remaining values are not meant to be modified by the user
+ * Change CCXXWARE_CONF_BL_PIN_NUMBER to BOARD_IOID_KEY_xyz to select which
+ * button triggers the bootloader on reset. Use CCXXWARE_CONF_BL_LEVEL to
+ * control the pin level that enables the bootloader (0: low, 1: high). It is
+ * also possible to use any other externally-controlled DIO.
 * @{
 */
-#if ROM_BOOTLOADER_ENABLE
-#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE            0xC5
-#define SET_CCFG_BL_CONFIG_BL_LEVEL                     0x00
-#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER                BOARD_IOID_KEY_LEFT
-#define SET_CCFG_BL_CONFIG_BL_ENABLE                    0xC5
-#else
-#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE            0x00
-#define SET_CCFG_BL_CONFIG_BL_LEVEL                     0x01
-#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER                0xFF
-#define SET_CCFG_BL_CONFIG_BL_ENABLE                    0xFF
-#endif
+#define CCXXWARE_CONF_BL_PIN_NUMBER   BOARD_IOID_KEY_LEFT
+#define CCXXWARE_CONF_BL_LEVEL        0
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
--- a/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h
+++ b/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h
@ -248,6 +248,16 @@
 #define BOARD_BUTTON_HAL_INDEX_REED_RELAY 0xFF
 /** @} */
 /*---------------------------------------------------------------------------*/
+/**
+ * \brief ROM bootloader configuration
+ *
+ * Sensortags do not support the bootloader
+ * @{
+ */
+#define CCXXWARE_CONF_BL_PIN_NUMBER   IOID_UNUSED
+#define CCXXWARE_CONF_BL_LEVEL        0
+/** @} */
+/*---------------------------------------------------------------------------*/
 /**
 * \name Device string used on startup
 * @{
--- a/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h
+++ b/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h
@ -229,6 +229,16 @@
 #define BOARD_BUTTON_HAL_INDEX_REED_RELAY 0xFF
 /** @} */
 /*---------------------------------------------------------------------------*/
+/**
+ * \brief ROM bootloader configuration
+ *
+ * Sensortags do not support the bootloader
+ * @{
+ */
+#define CCXXWARE_CONF_BL_PIN_NUMBER   IOID_UNUSED
+#define CCXXWARE_CONF_BL_LEVEL        0
+/** @} */
+/*---------------------------------------------------------------------------*/
 /**
 * \name Device string used on startup
 * @{
--- a/arch/platform/srf06-cc26xx/srf06/cc13xx/board.h
+++ b/arch/platform/srf06-cc26xx/srf06/cc13xx/board.h
@ -213,23 +213,14 @@
 /**
 * \brief ROM bootloader configuration
 *
- * Change SET_CCFG_BL_CONFIG_BL_PIN_NUMBER to BOARD_IOID_KEY_xyz to select
- * which button triggers the bootloader on reset.
- *
- * The remaining values are not meant to be modified by the user
+ * Change CCXXWARE_CONF_BL_PIN_NUMBER to BOARD_IOID_KEY_xyz to select which
+ * button triggers the bootloader on reset. Use CCXXWARE_CONF_BL_LEVEL to
+ * control the pin level that enables the bootloader (0: low, 1: high). It is
+ * also possible to use any other externally-controlled DIO.
 * @{
 */
-#if ROM_BOOTLOADER_ENABLE
-#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE            0xC5
-#define SET_CCFG_BL_CONFIG_BL_LEVEL                     0x00
-#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER                BOARD_IOID_KEY_SELECT
-#define SET_CCFG_BL_CONFIG_BL_ENABLE                    0xC5
-#else
-#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE            0x00
-#define SET_CCFG_BL_CONFIG_BL_LEVEL                     0x01
-#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER                0xFF
-#define SET_CCFG_BL_CONFIG_BL_ENABLE                    0xFF
-#endif
+#define CCXXWARE_CONF_BL_PIN_NUMBER   BOARD_IOID_KEY_SELECT
+#define CCXXWARE_CONF_BL_LEVEL        0
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
--- a/arch/platform/srf06-cc26xx/srf06/cc26xx/board.h
+++ b/arch/platform/srf06-cc26xx/srf06/cc26xx/board.h
@ -213,23 +213,14 @@
 /**
 * \brief ROM bootloader configuration
 *
- * Change SET_CCFG_BL_CONFIG_BL_PIN_NUMBER to BOARD_IOID_KEY_xyz to select
- * which button triggers the bootloader on reset.
- *
- * The remaining values are not meant to be modified by the user
+ * Change CCXXWARE_CONF_BL_PIN_NUMBER to BOARD_IOID_KEY_xyz to select which
+ * button triggers the bootloader on reset. Use CCXXWARE_CONF_BL_LEVEL to
+ * control the pin level that enables the bootloader (0: low, 1: high). It is
+ * also possible to use any other externally-controlled DIO.
 * @{
 */
-#if ROM_BOOTLOADER_ENABLE
-#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE            0xC5
-#define SET_CCFG_BL_CONFIG_BL_LEVEL                     0x00
-#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER                BOARD_IOID_KEY_SELECT
-#define SET_CCFG_BL_CONFIG_BL_ENABLE                    0xC5
-#else
-#define SET_CCFG_BL_CONFIG_BOOTLOADER_ENABLE            0x00
-#define SET_CCFG_BL_CONFIG_BL_LEVEL                     0x01
-#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER                0xFF
-#define SET_CCFG_BL_CONFIG_BL_ENABLE                    0xFF
-#endif
+#define CCXXWARE_CONF_BL_PIN_NUMBER   BOARD_IOID_KEY_SELECT
+#define CCXXWARE_CONF_BL_LEVEL        0
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/project-conf.h
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/project-conf.h
@ -64,7 +64,7 @@
 #define SENSORTAG_CC2650_REV_1_2_0            0
 /*---------------------------------------------------------------------------*/
 /* Enable the ROM bootloader */
-#define ROM_BOOTLOADER_ENABLE                 1
+#define CCXXWARE_CONF_ROM_BOOTLOADER_ENABLE   1
 /*---------------------------------------------------------------------------*/
 /*
 * Shrink the size of the uIP buffer, routing table and ND cache.
--- a/examples/platform-specific/cc26xx/project-conf.h
+++ b/examples/platform-specific/cc26xx/project-conf.h
@ -32,7 +32,7 @@
 #define PROJECT_CONF_H_
 /*---------------------------------------------------------------------------*/
 /* Enable the ROM bootloader */
-#define ROM_BOOTLOADER_ENABLE                 1
+#define CCXXWARE_CONF_ROM_BOOTLOADER_ENABLE   1
 /*---------------------------------------------------------------------------*/
 /* Change to match your configuration */
 #define IEEE802154_CONF_PANID            0xABCD
--- a/examples/platform-specific/cc26xx/very-sleepy-demo/project-conf.h
+++ b/examples/platform-specific/cc26xx/very-sleepy-demo/project-conf.h
@ -35,9 +35,8 @@
 #define IEEE802154_CONF_PANID            0xABCD
 #define IEEE802154_CONF_DEFAULT_CHANNEL      25
 /*---------------------------------------------------------------------------*/
-
 /* Enable the ROM bootloader */
-#define ROM_BOOTLOADER_ENABLE                 1
+#define CCXXWARE_CONF_ROM_BOOTLOADER_ENABLE   1
 /*---------------------------------------------------------------------------*/
 /* For very sleepy operation */
 #define RF_BLE_CONF_ENABLED                   0
--- a/examples/sensniff/srf06-cc26xx/target-conf.h
+++ b/examples/sensniff/srf06-cc26xx/target-conf.h
@ -32,9 +32,9 @@
 #ifndef TARGET_CONF_H_
 #define TARGET_CONF_H_
 /*---------------------------------------------------------------------------*/
-#define CC26XX_UART_CONF_BAUD_RATE    460800
-#define RF_BLE_CONF_ENABLED                0
-#define ROM_BOOTLOADER_ENABLE              1
+#define CC26XX_UART_CONF_BAUD_RATE     460800
+#define RF_BLE_CONF_ENABLED                 0
+#define CCXXWARE_CONF_ROM_BOOTLOADER_ENABLE 1
 /*---------------------------------------------------------------------------*/
 #define SENSNIFF_IO_DRIVER_H "pool/cc13xx-cc26xx-io.h"
 /*---------------------------------------------------------------------------*/