diff --git a/arch/arm/src/sama5/chip/sam_pwm.h b/arch/arm/src/sama5/chip/sam_pwm.h
index 3d4dc98a0bd..5e3c0982782 100644
--- a/arch/arm/src/sama5/chip/sam_pwm.h
+++ b/arch/arm/src/sama5/chip/sam_pwm.h
@@ -46,6 +46,9 @@
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
+
+#define SAM_PWM_NCHANNELS          4      /* Four channels numbered 0..3 */
+
 /* PWM Register Offsets *************************************************************/
 
 #define SAM_PWM_CLK_OFFSET         0x0000 /* PWM Clock Register */
diff --git a/configs/spark/src/up_composite.c b/configs/spark/src/up_composite.c
index 0c7a2ee9626..8cb3470571d 100644
--- a/configs/spark/src/up_composite.c
+++ b/configs/spark/src/up_composite.c
@@ -310,7 +310,7 @@ static int do_composite_archinitialize(void)
 
 int composite_archinitialize(void)
 {
-#if defined(CONFIG_NSH_ARCHINIT)
+#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_NSH_BUILTIN_APPS)
   return OK;
 #else
   return do_composite_archinitialize();