From 16936d864caf6c3c5890759374e8593d5c902dcf Mon Sep 17 00:00:00 2001
From: Ian Martin <ian@locicontrols.com>
Date: Wed, 16 Apr 2014 10:19:37 -0400
Subject: [PATCH] Rename FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PIN to
 FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN.

---
 platform/cc2538dk/contiki-conf.h | 4 ++--
 platform/cc2538dk/startup-gcc.c  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h
index 2188fa353..d86bd5e4d 100644
--- a/platform/cc2538dk/contiki-conf.h
+++ b/platform/cc2538dk/contiki-conf.h
@@ -49,8 +49,8 @@ typedef uint32_t rtimer_clock_t;
 #define FLASH_CCA_CONF_BOOTLDR_BACKDOOR	1 /**<Enable the boot loader backdoor */
 #endif
 
-#ifndef FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PIN
-#define FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PIN   3 /**< Pin PA_3 (Select button) activates the boot loader */
+#ifndef FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN
+#define FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN 3 /**< Pin PA_3 (Select button) activates the boot loader */
 #endif
 
 #ifndef FLASH_CCA_CONF_BOOTLDR_BACKDOOR_LEVEL
diff --git a/platform/cc2538dk/startup-gcc.c b/platform/cc2538dk/startup-gcc.c
index 0aaec8f5d..4a1a63149 100644
--- a/platform/cc2538dk/startup-gcc.c
+++ b/platform/cc2538dk/startup-gcc.c
@@ -71,13 +71,13 @@ void udma_err_isr(void);
     #error Invalid boot loader backdoor pin level. Please set FLASH_CCA_CONF_BOOTLDR_BACKDOOR_LEVEL to 0 (logic low) or 1 (logic high).
   #endif
 
-  #if ( (FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PIN < 0) || (FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PIN > 7) )
-    #error Invalid boot loader backdoor pin. Please set FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PIN between 0 and 7 (indicating PA0 - PA7).
+  #if ( (FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN < 0) || (FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN > 7) )
+    #error Invalid boot loader backdoor pin. Please set FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN between 0 and 7 (indicating PA0 - PA7).
   #endif
 
   #define FLASH_CCA_BOOTLDR_CFG ( FLASH_CCA_BOOTLDR_CFG_ENABLE \
     | (FLASH_CCA_CONF_BOOTLDR_BACKDOOR_LEVEL << FLASH_CCA_BOOTLDR_CFG_PORT_A_LEVEL_S) \
-    | (FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PIN << FLASH_CCA_BOOTLDR_CFG_PORT_A_PIN_S) )
+    | (FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN << FLASH_CCA_BOOTLDR_CFG_PORT_A_PIN_S) )
 #else
 #define FLASH_CCA_BOOTLDR_CFG FLASH_CCA_BOOTLDR_CFG_DISABLE
 #endif