reset: xtos: Introduce HAVE_RESET_VECTOR_ROM config option

Apollolake+/i.MX have reset vector in ROM. So far we have used platform config symbols to tell which platforms have the reset vector in ROM. Anyhow, things are starting to get ugly here with more platforms to come so we add an internal config symbol which will be set by each each platform when needed. Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
iganakov · May 30, 2019 · 009cd7c · 009cd7c
1 parent 92fc706
commit 009cd7c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/Kconfig b/Kconfig
@@ -40,6 +40,13 @@ config BOOT_LOADER
 	bool
 	default n
 
+config HAVE_RESET_VECTOR_ROM
+	bool
+	default n
+	help
+	  Select if your platform has the reset vector
+	  in ROM.
+
 config IRQ_MAP
 	bool
 	default n

diff --git a/src/arch/xtensa/up/xtos/reset-vector.S b/src/arch/xtensa/up/xtos/reset-vector.S
@@ -83,11 +83,7 @@ _ResetVector:
 #endif
 #endif
 
-/* Apollolake+ have reset vector in ROM */
-#if defined(CONFIG_BAYTRAIL) || defined(CONFIG_CHERRYTRAIL) \
-	|| defined (CONFIG_HASWELL) || defined(CONFIG_BROADWELL) \
-	|| defined(CONFIG_SKYLAKE) || defined(CONFIG_KABYLAKE) \
-	|| defined(CONFIG_IMX8)
+#if defined(CONFIG_HAVE_RESET_VECTOR_ROM)
 	j	_ResetHandler
 #else
 

diff --git a/src/platform/Kconfig b/src/platform/Kconfig
@@ -13,6 +13,7 @@ config BAYTRAIL
 	select DMA_SUSPEND_DRAIN
 	select DMA_FIFO_PARTITION
 	select DW_DMA
+	select HAVE_RESET_VECTOR_ROM
 	help
 	  Select if your target platform is Baytrail-compatible
 
@@ -25,6 +26,7 @@ config CHERRYTRAIL
 	select DMA_SUSPEND_DRAIN
 	select DMA_FIFO_PARTITION
 	select DW_DMA
+	select HAVE_RESET_VECTOR_ROM
 	help
 	  Select if your target platform is Cherrytrail-compatible
 
@@ -34,6 +36,7 @@ config HASWELL
 	select TASK_HAVE_PRIORITY_LOW
 	select DMA_AGGREGATED_IRQ
 	select DW_DMA
+	select HAVE_RESET_VECTOR_ROM
 	help
 	  Select if your target platform is Haswell-compatible
 
@@ -43,6 +46,7 @@ config BROADWELL
 	select TASK_HAVE_PRIORITY_LOW
 	select DMA_AGGREGATED_IRQ
 	select DW_DMA
+	select HAVE_RESET_VECTOR_ROM
 	help
 	  Select if your target platform is Broadwell-compatible
 
@@ -124,6 +128,7 @@ config LIBRARY
 
 config IMX8
 	bool "Build for NXP i.MX8"
+	select HAVE_RESET_VECTOR_ROM
 	help
 	  Select if your target platform is imx8-compatible