SOF: cAVS 1.5 needs reset-vector.S in the main image

APL ADSP doesn't boot with reset-vector.S in the bootloader, move it over to the main application binary. Signed-off-by: Guennadi Liakhovetski <[email protected]>
zephyrproject-rtos · Feb 1, 2021 · 2a2e868 · 2a2e868
1 parent 66d1b3c
commit 2a2e868
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/boards/xtensa/intel_adsp_cavs18/intel_adsp_cavs18_defconfig b/boards/xtensa/intel_adsp_cavs18/intel_adsp_cavs18_defconfig
@@ -9,6 +9,7 @@ CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n
 
 CONFIG_XTENSA_RESET_VECTOR=y
+CONFIG_RESET_VECTOR_IN_BOOTLOADER=y
 
 CONFIG_XTENSA_USE_CORE_CRT1=y
 

diff --git a/boards/xtensa/intel_adsp_cavs20/intel_adsp_cavs20_defconfig b/boards/xtensa/intel_adsp_cavs20/intel_adsp_cavs20_defconfig
@@ -9,6 +9,7 @@ CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n
 
 CONFIG_XTENSA_RESET_VECTOR=y
+CONFIG_RESET_VECTOR_IN_BOOTLOADER=y
 
 CONFIG_XTENSA_USE_CORE_CRT1=y
 

diff --git a/boards/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_defconfig b/boards/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_defconfig
@@ -9,6 +9,7 @@ CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n
 
 CONFIG_XTENSA_RESET_VECTOR=y
+CONFIG_RESET_VECTOR_IN_BOOTLOADER=y
 
 CONFIG_XTENSA_USE_CORE_CRT1=y
 

diff --git a/samples/audio/sof/prj.conf b/samples/audio/sof/prj.conf
@@ -3,7 +3,6 @@ CONFIG_SMP=n
 CONFIG_LOG=y
 CONFIG_MP_NUM_CPUS=1
 CONFIG_BUILD_OUTPUT_BIN=n
-CONFIG_RESET_VECTOR_IN_BOOTLOADER=y
 
 # Requires heap_info() be implemented, but no Zephyr wrapper
 CONFIG_DEBUG_MEMORY_USAGE_SCAN=n