diff --git a/arch/arm/src/stm32/stm32f10xxx_rtc.c b/arch/arm/src/stm32/stm32f10xxx_rtc.c
index a0e616f0462..0b01ecd6909 100644
--- a/arch/arm/src/stm32/stm32f10xxx_rtc.c
+++ b/arch/arm/src/stm32/stm32f10xxx_rtc.c
@@ -602,7 +602,7 @@ int up_rtc_settime(FAR const struct timespec *tp)
  ************************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
-int up_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback);
+int up_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback)
 {
   struct rtc_regvals_s regvals;
   irqstate_t flags;
diff --git a/arch/mips/src/pic32mx/pic32mx-config.h b/arch/mips/src/pic32mx/pic32mx-config.h
index f2ccd89b0a9..419cd5250be 100644
--- a/arch/mips/src/pic32mx/pic32mx-config.h
+++ b/arch/mips/src/pic32mx/pic32mx-config.h
@@ -775,6 +775,25 @@
 #  error "Unknown board POSC mode"
 #endif
 
+#undef CONFIG_PIC32MX_FNOSC
+#if defined(BOARD_FNOSC_FRC)
+#  define CONFIG_PIC32MX_FNOSC DEVCFG1_FNOSC_FRC
+#elif defined(BOARD_FNOSC_FRCPLL)
+#  define CONFIG_PIC32MX_FNOSC DEVCFG1_FNOSC_FRCPLL
+#elif defined(BOARD_FNOSC_POSC)
+#  define CONFIG_PIC32MX_FNOSC DEVCFG1_FNOSC_POSC
+#elif defined(BOARD_FNOSC_POSCPLL)
+#  define CONFIG_PIC32MX_FNOSC DEVCFG1_FNOSC_POSCPLL
+#elif defined(BOARD_FNOSC_SOSC)
+#  define CONFIG_PIC32MX_FNOSC DEVCFG1_FNOSC_SOSC
+#elif defined(BOARD_FNOSC_LPRC)
+#  define CONFIG_PIC32MX_FNOSC DEVCFG1_FNOSC_LPRC
+#elif defined(BOARD_FNOSC_FRCDIV)
+#  define CONFIG_PIC32MX_FNOSC DEVCFG1_FNOSC_FRCDIV
+#else
+#  error "Unknown board FNOSC selection"
+#endif
+
 #undef CONFIG_PIC32MX_FCKSM
 #if defined(BOARD_POSC_SWITCH)
 #  if defined(BOARD_POSC_FSCM) 
diff --git a/arch/mips/src/pic32mx/pic32mx-head.S b/arch/mips/src/pic32mx/pic32mx-head.S
index 2a6ef39a848..3e9cfeb4680 100644
--- a/arch/mips/src/pic32mx/pic32mx-head.S
+++ b/arch/mips/src/pic32mx/pic32mx-head.S
@@ -617,7 +617,7 @@ devconfig2:
 			DEVCFG2_UNUSED
 
 devconfig1:
-	.long	DEVCFG1_FNOSC_POSCPLL   | CONFIG_PIC32MX_FSOSCEN | \
+	.long	CONFIG_PIC32MX_FNOSC    | CONFIG_PIC32MX_FSOSCEN | \
 			CONFIG_PIC32MX_IESO     | CONFIG_PIC32MX_POSCMOD | \
 			CONFIG_PIC32MX_PBDIV    | CONFIG_PIC32MX_FCKSM   | \
 			CONFIG_PIC32MX_WDENABLE | DEVCFG1_UNUSED
diff --git a/arch/mips/src/pic32mx/pic32mx-lowinit.c b/arch/mips/src/pic32mx/pic32mx-lowinit.c
index 9cf77fb50b7..d6bc6a81200 100644
--- a/arch/mips/src/pic32mx/pic32mx-lowinit.c
+++ b/arch/mips/src/pic32mx/pic32mx-lowinit.c
@@ -63,7 +63,7 @@
 
 /* Make sure that the selected clock parameters are sane */
 
-#define CALC_SYSCLOCK  (((BOARD_POSC_FREQ / BOARD_PLL_IDIV) * BOARD_PLL_MULT) / BOARD_PLL_ODIV)
+#define CALC_SYSCLOCK  (((BOARD_PLL_INPUT / BOARD_PLL_IDIV) * BOARD_PLL_MULT) / BOARD_PLL_ODIV)
 #if CALC_SYSCLOCK != BOARD_CPU_CLOCK
 #  error "Bad BOARD_CPU_CLOCK calculcation in board.h"
 #endif