diff --git a/boards/hifive1/Kconfig b/boards/hifive1/Kconfig
index 61d12abc0d..1486f45a3c 100644
--- a/boards/hifive1/Kconfig
+++ b/boards/hifive1/Kconfig
@@ -38,32 +38,28 @@ config USE_CLOCK_HFROSC
     bool "Direct High frequency internal oscillator (HFROSC)"
 endchoice
 
-if USE_CLOCK_HFXOSC_PLL
+# the configuration macros must always be defined for clock.c to compile
 config CLOCK_PLL_F
-    int "F: REFR multiply factor"
+    int "F: REFR multiply factor" if USE_CLOCK_HFXOSC_PLL
     default 39
 
 config CLOCK_PLL_Q
-    int "Q: VCO divide factor"
+    int "Q: VCO divide factor" if USE_CLOCK_HFXOSC_PLL
     default 1
-endif
 
 config CLOCK_DESIRED_FREQUENCY
-    int "Desired clock frequency"
+    int "Desired clock frequency" if USE_CLOCK_HFROSC_PLL
     default 320000000
     range 1000000 320000000
-    depends on USE_CLOCK_HFROSC_PLL
 
-if USE_CLOCK_HFROSC
 config CLOCK_HFROSC_TRIM
-    int "TRIM: input frequency multiplier"
+    int "TRIM: input frequency multiplier" if USE_CLOCK_HFROSC
     default 6
     range 0 31
 
 config CLOCK_HFROSC_DIV
-    int "DIV: output frequency divider"
+    int "DIV: output frequency divider" if USE_CLOCK_HFROSC
     default 1
     range 0 63
-endif
 
 endmenu
diff --git a/boards/hifive1b/Kconfig b/boards/hifive1b/Kconfig
index 5bd1931b70..5fb7b5cc2f 100644
--- a/boards/hifive1b/Kconfig
+++ b/boards/hifive1b/Kconfig
@@ -40,32 +40,29 @@ config USE_CLOCK_HFROSC
     bool "Direct High frequency internal oscillator (HFROSC)"
 endchoice
 
-if USE_CLOCK_HFXOSC_PLL
+# the configuration macros must always be defined for clock.c to compile
 config CLOCK_PLL_F
-    int "F: REFR multiply factor"
+    int "F: REFR multiply factor" if USE_CLOCK_HFXOSC_PLL
     default 39
 
 config CLOCK_PLL_Q
-    int "Q: VCO divide factor"
+    int "Q: VCO divide factor" if USE_CLOCK_HFXOSC_PLL
     default 1
-endif
 
 config CLOCK_DESIRED_FREQUENCY
-    int "Desired clock frequency"
+    int
+    prompt "Desired clock frequency" if USE_CLOCK_HFROSC_PLL
     default 320000000
     range 1000000 320000000
-    depends on USE_CLOCK_HFROSC_PLL
 
-if USE_CLOCK_HFROSC
 config CLOCK_HFROSC_TRIM
-    int "TRIM: input frequency multiplier"
+    int "TRIM: input frequency multiplier" if USE_CLOCK_HFROSC
     default 6
     range 0 31
 
 config CLOCK_HFROSC_DIV
-    int "DIV: output frequency divider"
+    int "DIV: output frequency divider" if USE_CLOCK_HFROSC
     default 1
     range 0 63
-endif
 
 endmenu