diff --git a/configs/tm4c1294-launchpad/src/tm4c_appinit.c b/configs/tm4c1294-launchpad/src/tm4c_appinit.c
index 2245ac31e9..747c1f20df 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_appinit.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_appinit.c
@@ -43,6 +43,8 @@
 
 #include "tm4c1294-launchpad.h"
 
+#ifdef CONFIG_LIB_BOARDCTL
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -84,3 +86,27 @@ int board_app_initialize(uintptr_t arg)
   return OK;
 #endif
 }
+
+/****************************************************************************
+ * Name: board_pwm_setup
+ *
+ * Description:
+ *   No implementation for now, it's called by PWM tool via boardctl().
+ *   See include/nuttx/board.h
+ *
+ * Input Parameters:
+ *   None.
+ *
+ * Returned Value:
+ *   Zero on Success.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_BOARDCTL_PWMTEST
+int board_pwm_setup(void)
+{
+  return OK;
+}
+#endif /* CONFIG_BOARDCTL_PWMTEST */
+
+#endif /* CONFIG_LIB_BOARDCTL */
diff --git a/configs/tm4c1294-launchpad/src/tm4c_bringup.c b/configs/tm4c1294-launchpad/src/tm4c_bringup.c
index ee1a37e998..0cd3e2f229 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_bringup.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_bringup.c
@@ -43,7 +43,6 @@
 #include <stdint.h>
 #include <debug.h>
 
-#include <nuttx/board.h>
 #include <nuttx/i2c/i2c_master.h>
 #include <arch/board/board.h>
 
@@ -51,9 +50,6 @@
 #include "tiva_pwm.h"
 #include "tm4c1294-launchpad.h"
 
-#define PWM_PATH_FMT        "/dev/pwm%d"
-#define PWM_PATH_FMTLEN     (10)
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -66,6 +62,9 @@
 #  define HAVE_PWM
 #endif
 
+#define PWM_PATH_FMT        "/dev/pwm%d"
+#define PWM_PATH_FMTLEN     (10)
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -262,26 +261,3 @@ int tm4c_bringup(void)
 
   return OK;
 }
-
-/****************************************************************************
- * Name: board_pwm_setup
- *
- * Description:
- *   No implementation for now, it's called by PWM tool via boardctl().
- *   See include/nuttx/board.h
- *
- * Input Parameters:
- *   None.
- *
- * Returned Value:
- *   Zero on Success.
- *
- ****************************************************************************/
-
-#ifdef CONFIG_BOARDCTL_PWMTEST
-int board_pwm_setup(void)
-{
-  return OK;
-}
-#endif
-
diff --git a/drivers/spi/spi_transfer.c b/drivers/spi/spi_transfer.c
index 088be5f1c8..c21cd30a4c 100644
--- a/drivers/spi/spi_transfer.c
+++ b/drivers/spi/spi_transfer.c
@@ -73,7 +73,8 @@
  *
  * Description:
  *   This is a helper function that can be used to encapsulate and manage
- *   a sequence of SPI transfers.
+ *   a sequence of SPI transfers.  The SPI bus will be locked and the
+ *   SPI device selected for the duration of the transfers.
  *
  * Input Parameters:
  *   spi - An instance of the SPI device to use for the transfer
diff --git a/include/nuttx/spi/spi_transfer.h b/include/nuttx/spi/spi_transfer.h
index d4738ba6f5..303dc61e5d 100644
--- a/include/nuttx/spi/spi_transfer.h
+++ b/include/nuttx/spi/spi_transfer.h
@@ -132,7 +132,8 @@ struct spi_sequence_s
  *
  * Description:
  *   This is a helper function that can be used to encapsulate and manage
- *   a sequence of SPI transfers.
+ *   a sequence of SPI transfers.  The SPI bus will be locked and the
+ *   SPI device selected for the duration of the transfers.
  *
  * Input Parameters:
  *   spi - An instance of the SPI device to use for the transfer