zephyr: init: create a zephyr entry point in SOF.

lrgirdwo · lgirdwood · commit cf8e35f860a7 · 2020-07-24T21:57:49.000+01:00
Zephyr already uses main() and has already performed a lot of init prior
to entering SOF. Make sure no HW init is repeated.

Signed-off-by: Liam Girdwood &lt;liam.r.girdwood@linux.intel.com&gt;
diff --git a/src/init/init.c b/src/init/init.c
@@ -71,6 +71,7 @@ int master_core_init(int argc, char *argv[], struct sof *sof)
 	sof->argc = argc;
 	sof->argv = argv;
 
+#ifndef __ZEPHYR__
 	/* init architecture */
 	trace_point(TRACE_BOOT_ARCH);
 	err = arch_init();
@@ -83,6 +84,7 @@ int master_core_init(int argc, char *argv[], struct sof *sof)
 	init_heap(sof);
 
 	interrupt_init(sof);
+#endif /* __ZEPHYR__ */
 
 #if CONFIG_TRACE
 	trace_point(TRACE_BOOT_SYS_TRACES);
@@ -112,7 +114,11 @@ int master_core_init(int argc, char *argv[], struct sof *sof)
 	return err;
 }
 
+#ifdef __ZEPHYR__
+int sof_main(int argc, char *argv[])
+#else
 int main(int argc, char *argv[])
+#endif
 {
 	int err;
 
@@ -123,7 +129,9 @@ int main(int argc, char *argv[])
 	else
 		err = slave_core_init(&sof);
 
+#ifndef __ZEPHYR__
 	/* should never get here */
 	panic(SOF_IPC_PANIC_TASK);
+#endif
 	return err;
 }
diff --git a/src/platform/intel/cavs/platform.c b/src/platform/intel/cavs/platform.c
@@ -391,9 +391,11 @@ int platform_init(struct sof *sof)
 	platform_memory_windows_init(MEM_WND_INIT_CLEAR);
 #endif
 
+#ifndef __ZEPHYR__
 	/* init timers, clocks and schedulers */
 	trace_point(TRACE_BOOT_PLATFORM_TIMER);
 	platform_timer_start(sof->platform_timer);
+#endif
 
 	trace_point(TRACE_BOOT_PLATFORM_CLOCK);
 	platform_clock_init(sof);
@@ -511,6 +513,7 @@ int platform_init(struct sof *sof)
 	if (ret < 0)
 		return ret;
 
+#ifndef __ZEPHYR__
 #if CONFIG_DW_SPI
 	/* initialize the SPI slave */
 	trace_point(TRACE_BOOT_PLATFORM_SPI);
@@ -535,10 +538,11 @@ int platform_init(struct sof *sof)
 
 	/* show heap status */
 	heap_trace_all(1);
-
+#endif /* __ZEPHYR__ */
 	return 0;
 }
 
+#ifndef __ZEPHYR__
 void platform_wait_for_interrupt(int level)
 {
 #if CONFIG_CAVS_USE_LPRO_IN_WAITI
@@ -553,3 +557,4 @@ void platform_wait_for_interrupt(int level)
 	arch_wait_for_interrupt(level);
 #endif
 }
+#endif
