diff --git a/Kconfig b/Kconfig
index 159a67fc3..df0098aa4 100644
--- a/Kconfig
+++ b/Kconfig
@@ -4,44 +4,6 @@ mainmenu "SOF $(PROJECTVERSION) Configuration"
 
 comment "Compiler: $(CC_VERSION_TEXT)"
 
-menu "CAVS"
-	depends on CAVS
-
-config HP_MEMORY_BANKS
-	int "HP memory banks count"
-	default 8
-	help
-	  Available memory banks count for High Performance memory
-	  Lowering available banks could result in lower power consumption
-	  Too low count should result in unresponsive/crashing image due to not
-	  enough space for FW base image
-	  Banks are 64kb in size.
-
-config LP_MEMORY_BANKS
-	int "LP memory banks count"
-	default 0
-	help
-	  Available memory banks count for Low Power memory.
-	  It can be used to turn ON/OFF LPSRAM bank/s.
-	  Firmware will turn on only as many banks as are defined here.
-
-config LP_SRAM
-	bool
-	default LP_MEMORY_BANKS > 0
-	help
-	  Indicates that platform uses LPSRAM.
-
-config CAVS_LPS
-	bool "Intel cAVS Low Power Sequencer for Power Management"
-	depends on CAVS
-	default n
-	help
-	  Select this to enable Intel cAVS Low Power Sequencer.
-	  This option is required to support S0ix/D0ix mode
-	  on cAVS platforms.
-
-endmenu
-
 config WAITI_DELAY
 	bool
 	default n
diff --git a/src/platform/Kconfig b/src/platform/Kconfig
index 34717b1a5..940610717 100644
--- a/src/platform/Kconfig
+++ b/src/platform/Kconfig
@@ -261,6 +261,41 @@ config CONFIG_CHERRYTRAIL_EXTRA_DW_DMA
 	  Select if you need support for all 3 DMACs versus the default 2 used
 	  in baytrail.
 
+config HP_MEMORY_BANKS
+	int "HP memory banks count"
+	depends on CAVS
+	default 8
+	help
+	  Available memory banks count for High Performance memory
+	  Lowering available banks could result in lower power consumption
+	  Too low count should result in unresponsive/crashing image due to not
+	  enough space for FW base image
+	  Banks are 64kb in size.
+
+config LP_MEMORY_BANKS
+	int "LP memory banks count"
+	depends on CAVS
+	default 0
+	help
+	  Available memory banks count for Low Power memory.
+	  It can be used to turn ON/OFF LPSRAM bank/s.
+	  Firmware will turn on only as many banks as are defined here.
+
+config LP_SRAM
+	bool
+	default LP_MEMORY_BANKS > 0
+	help
+	  Indicates that platform uses LPSRAM.
+
+config CAVS_LPS
+	bool "Intel cAVS Low Power Sequencer for Power Management"
+	depends on CAVS
+	default n
+	help
+	  Select this to enable Intel cAVS Low Power Sequencer.
+	  This option is required to support S0ix/D0ix mode
+	  on cAVS platforms.
+
 config CAVS_LPRO
 	bool "Enable low power ring oscillator as the default clock"
 	default n