From 8d12ca730f7d3fc1bcd3208b2f3d389f2cf0ead3 Mon Sep 17 00:00:00 2001 From: Atis Elsts Date: Sat, 15 Sep 2018 14:30:17 +0100 Subject: [PATCH] remove duplicate definitions of CC26xx/CC13xx flash pins --- arch/platform/srf06-cc26xx/launchpad/cc1310/board.h | 13 ++++--------- arch/platform/srf06-cc26xx/launchpad/cc1350/board.h | 13 ++++--------- .../srf06-cc26xx/launchpad/cc2640r2/board.h | 13 ++++--------- arch/platform/srf06-cc26xx/launchpad/cc2650/board.h | 13 ++++--------- arch/platform/srf06-cc26xx/sensortag/cc1350/board.h | 13 ++++--------- arch/platform/srf06-cc26xx/sensortag/cc2650/board.h | 13 ++++--------- 6 files changed, 24 insertions(+), 54 deletions(-) diff --git a/arch/platform/srf06-cc26xx/launchpad/cc1310/board.h b/arch/platform/srf06-cc26xx/launchpad/cc1310/board.h index 41e929571..f3c1dcd0f 100644 --- a/arch/platform/srf06-cc26xx/launchpad/cc1310/board.h +++ b/arch/platform/srf06-cc26xx/launchpad/cc1310/board.h @@ -111,15 +111,10 @@ */ #define EXT_FLASH_SPI_CONTROLLER SPI_CONTROLLER_SPI0 -#define BOARD_IOID_FLASH_SCK IOID_10 -#define BOARD_IOID_FLASH_MOSI IOID_9 -#define BOARD_IOID_FLASH_MISO IOID_8 -#define BOARD_IOID_FLASH_CS IOID_20 - -#define EXT_FLASH_SPI_PIN_SCK 10 -#define EXT_FLASH_SPI_PIN_MOSI 9 -#define EXT_FLASH_SPI_PIN_MISO 8 -#define EXT_FLASH_SPI_PIN_CS 20 +#define EXT_FLASH_SPI_PIN_SCK IOID_10 +#define EXT_FLASH_SPI_PIN_MOSI IOID_9 +#define EXT_FLASH_SPI_PIN_MISO IOID_8 +#define EXT_FLASH_SPI_PIN_CS IOID_20 #define EXT_FLASH_DEVICE_ID 0x14 #define EXT_FLASH_MID 0xC2 diff --git a/arch/platform/srf06-cc26xx/launchpad/cc1350/board.h b/arch/platform/srf06-cc26xx/launchpad/cc1350/board.h index 643d69e0b..b989311b4 100644 --- a/arch/platform/srf06-cc26xx/launchpad/cc1350/board.h +++ b/arch/platform/srf06-cc26xx/launchpad/cc1350/board.h @@ -111,15 +111,10 @@ */ #define EXT_FLASH_SPI_CONTROLLER SPI_CONTROLLER_SPI0 -#define BOARD_IOID_FLASH_SCK IOID_10 -#define BOARD_IOID_FLASH_MOSI IOID_9 -#define BOARD_IOID_FLASH_MISO IOID_8 -#define BOARD_IOID_FLASH_CS IOID_20 - -#define EXT_FLASH_SPI_PIN_SCK 10 -#define EXT_FLASH_SPI_PIN_MOSI 9 -#define EXT_FLASH_SPI_PIN_MISO 8 -#define EXT_FLASH_SPI_PIN_CS 20 +#define EXT_FLASH_SPI_PIN_SCK IOID_10 +#define EXT_FLASH_SPI_PIN_MOSI IOID_9 +#define EXT_FLASH_SPI_PIN_MISO IOID_8 +#define EXT_FLASH_SPI_PIN_CS IOID_20 #define EXT_FLASH_DEVICE_ID 0x14 #define EXT_FLASH_MID 0xC2 diff --git a/arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h b/arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h index 66ba6d78c..df5866eee 100644 --- a/arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h +++ b/arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h @@ -111,15 +111,10 @@ */ #define EXT_FLASH_SPI_CONTROLLER SPI_CONTROLLER_SPI0 -#define BOARD_IOID_FLASH_SCK IOID_10 -#define BOARD_IOID_FLASH_MOSI IOID_9 -#define BOARD_IOID_FLASH_MISO IOID_8 -#define BOARD_IOID_FLASH_CS IOID_20 - -#define EXT_FLASH_SPI_PIN_SCK 10 -#define EXT_FLASH_SPI_PIN_MOSI 9 -#define EXT_FLASH_SPI_PIN_MISO 8 -#define EXT_FLASH_SPI_PIN_CS 20 +#define EXT_FLASH_SPI_PIN_SCK IOID_10 +#define EXT_FLASH_SPI_PIN_MOSI IOID_9 +#define EXT_FLASH_SPI_PIN_MISO IOID_8 +#define EXT_FLASH_SPI_PIN_CS IOID_20 #define EXT_FLASH_DEVICE_ID 0x14 #define EXT_FLASH_MID 0xC2 diff --git a/arch/platform/srf06-cc26xx/launchpad/cc2650/board.h b/arch/platform/srf06-cc26xx/launchpad/cc2650/board.h index 822e776b8..047d4f920 100644 --- a/arch/platform/srf06-cc26xx/launchpad/cc2650/board.h +++ b/arch/platform/srf06-cc26xx/launchpad/cc2650/board.h @@ -111,15 +111,10 @@ */ #define EXT_FLASH_SPI_CONTROLLER SPI_CONTROLLER_SPI0 -#define BOARD_IOID_FLASH_SCK IOID_10 -#define BOARD_IOID_FLASH_MOSI IOID_9 -#define BOARD_IOID_FLASH_MISO IOID_8 -#define BOARD_IOID_FLASH_CS IOID_20 - -#define EXT_FLASH_SPI_PIN_SCK 10 -#define EXT_FLASH_SPI_PIN_MOSI 9 -#define EXT_FLASH_SPI_PIN_MISO 8 -#define EXT_FLASH_SPI_PIN_CS 20 +#define EXT_FLASH_SPI_PIN_SCK IOID_10 +#define EXT_FLASH_SPI_PIN_MOSI IOID_9 +#define EXT_FLASH_SPI_PIN_MISO IOID_8 +#define EXT_FLASH_SPI_PIN_CS IOID_20 #define EXT_FLASH_DEVICE_ID 0x14 #define EXT_FLASH_MID 0xC2 diff --git a/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h b/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h index 6fdab1295..c9999c219 100644 --- a/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h +++ b/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h @@ -137,15 +137,10 @@ */ #define EXT_FLASH_SPI_CONTROLLER SPI_CONTROLLER_SPI0 -#define BOARD_IOID_FLASH_SCK IOID_17 -#define BOARD_IOID_FLASH_MOSI IOID_19 -#define BOARD_IOID_FLASH_MISO IOID_18 -#define BOARD_IOID_FLASH_CS IOID_14 - -#define EXT_FLASH_SPI_PIN_SCK 17 -#define EXT_FLASH_SPI_PIN_MOSI 19 -#define EXT_FLASH_SPI_PIN_MISO 18 -#define EXT_FLASH_SPI_PIN_CS 14 +#define EXT_FLASH_SPI_PIN_SCK IOID_17 +#define EXT_FLASH_SPI_PIN_MOSI IOID_19 +#define EXT_FLASH_SPI_PIN_MISO IOID_18 +#define EXT_FLASH_SPI_PIN_CS IOID_14 #define EXT_FLASH_DEVICE_ID 0x14 #define EXT_FLASH_MID 0xC2 diff --git a/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h b/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h index dda3e46e5..4784815a4 100644 --- a/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h +++ b/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h @@ -139,15 +139,10 @@ */ #define EXT_FLASH_SPI_CONTROLLER SPI_CONTROLLER_SPI0 -#define BOARD_IOID_FLASH_SCK IOID_17 -#define BOARD_IOID_FLASH_MOSI IOID_19 -#define BOARD_IOID_FLASH_MISO IOID_18 -#define BOARD_IOID_FLASH_CS IOID_14 - -#define EXT_FLASH_SPI_PIN_SCK 17 -#define EXT_FLASH_SPI_PIN_MOSI 19 -#define EXT_FLASH_SPI_PIN_MISO 18 -#define EXT_FLASH_SPI_PIN_CS 14 +#define EXT_FLASH_SPI_PIN_SCK IOID_17 +#define EXT_FLASH_SPI_PIN_MOSI IOID_19 +#define EXT_FLASH_SPI_PIN_MISO IOID_18 +#define EXT_FLASH_SPI_PIN_CS IOID_14 #if SENSORTAG_CC2650_REV_1_2_0 #define EXT_FLASH_DEVICE_ID 0x12