michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sof: remove superfluous and duplicate code

Browse source 
1. SOF doesn't have to be built in .bin format
2. don't include soc.c and soc_mp.c twice in cmake
3. remove an unused mailbox.h header

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2020-11-03 12:32:24 +01:00 • committed by Anas Nashif
commit daab673426
4 changed files with 1 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

1
samples/audio/sof/prj.conf
View file

@ -2,6 +2,7 @@ CONFIG_SOF=y
CONFIG_SMP=n CONFIG_SMP=n
CONFIG_LOG=y CONFIG_LOG=y
CONFIG_MP_NUM_CPUS=1 CONFIG_MP_NUM_CPUS=1
CONFIG_BUILD_OUTPUT_BIN=n
# Requires heap_info() be implemented, but no Zephyr wrapper # Requires heap_info() be implemented, but no Zephyr wrapper
CONFIG_DEBUG_MEMORY_USAGE_SCAN=n CONFIG_DEBUG_MEMORY_USAGE_SCAN=n

2
soc/xtensa/intel_adsp/common/CMakeLists.txt
View file

@ -27,7 +27,5 @@ if(CONFIG_SOC_SERIES_INTEL_CAVS_V15 OR
CONFIG_SOC_SERIES_INTEL_CAVS_V18 OR CONFIG_SOC_SERIES_INTEL_CAVS_V18 OR
CONFIG_SOC_SERIES_INTEL_CAVS_V20 OR CONFIG_SOC_SERIES_INTEL_CAVS_V20 OR
CONFIG_SOC_SERIES_INTEL_CAVS_V25) CONFIG_SOC_SERIES_INTEL_CAVS_V25)
zephyr_library_sources(soc.c)
zephyr_library_sources(soc_mp.c)
include(bootloader.cmake) include(bootloader.cmake)
endif() endif()

2
soc/xtensa/intel_adsp/common/adsp.c
View file

@ -17,8 +17,6 @@ LOG_MODULE_REGISTER(sof);
#include <soc/shim.h> #include <soc/shim.h>
#include <adsp/io.h> #include <adsp/io.h>
#include <cavs/mailbox.h>
/* /*
* Sets up the host windows so that the host can see the memory * Sets up the host windows so that the host can see the memory
* content on the DSP SRAM. * content on the DSP SRAM.

62
soc/xtensa/intel_adsp/common/include/cavs/mailbox.h
View file

@ -1,62 +0,0 @@
/* SPDX-License-Identifier: Apache-2.0
*
* Copyright(c) 2019 Intel Corporation. All rights reserved.
*
* Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
* Keyon Jie <yang.jie@linux.intel.com>
*/
#ifndef __CAVS_MAILBOX_H__
#define __CAVS_MAILBOX_H__
#include <stddef.h>
#include <stdint.h>
/*
* The Window Region on HPSRAM for cAVS platforms is organised like this :-
* +--------------------------------------------------------------------------+
* | Offset | Region | Size |
* +---------------------+----------------+-----------------------------------+
* | SRAM_TRACE_BASE | Trace Buffer W3| SRAM_TRACE_SIZE |
* +---------------------+----------------+-----------------------------------+
* | SRAM_DEBUG_BASE | Debug data W2 | SRAM_DEBUG_SIZE |
* +---------------------+----------------+-----------------------------------+
* | SRAM_INBOX_BASE | Inbox W1 | SRAM_INBOX_SIZE |
* +---------------------+----------------+-----------------------------------+
* | SRAM_OUTBOX_BASE | Outbox W0 | SRAM_MAILBOX_SIZE |
* +---------------------+----------------+-----------------------------------+
* | SRAM_SW_REG_BASE | SW Registers W0| SRAM_SW_REG_SIZE |
* +---------------------+----------------+-----------------------------------+
*
* Note: For suecreek SRAM_SW_REG window does not exist - MAILBOX_SW_REG_BASE
* and MAILBOX_SW_REG_BASE are equal to 0
*/
/* window 3 - trace */
#define MAILBOX_TRACE_SIZE SRAM_TRACE_SIZE
#define MAILBOX_TRACE_BASE SRAM_TRACE_BASE
/* window 2 debug, exception and stream */
#define MAILBOX_DEBUG_SIZE SRAM_DEBUG_SIZE
#define MAILBOX_DEBUG_BASE SRAM_DEBUG_BASE
#define MAILBOX_EXCEPTION_SIZE SRAM_EXCEPT_SIZE
#define MAILBOX_EXCEPTION_BASE SRAM_EXCEPT_BASE
#define MAILBOX_EXCEPTION_OFFSET SRAM_DEBUG_SIZE
#define MAILBOX_STREAM_SIZE SRAM_STREAM_SIZE
#define MAILBOX_STREAM_BASE SRAM_STREAM_BASE
#define MAILBOX_STREAM_OFFSET (SRAM_DEBUG_SIZE + SRAM_EXCEPT_SIZE)
/* window 1 inbox/downlink and FW registers */
#define MAILBOX_HOSTBOX_SIZE SRAM_INBOX_SIZE
#define MAILBOX_HOSTBOX_BASE SRAM_INBOX_BASE
/* window 0 */
#define MAILBOX_DSPBOX_SIZE SRAM_OUTBOX_SIZE
#define MAILBOX_DSPBOX_BASE SRAM_OUTBOX_BASE
#define MAILBOX_SW_REG_SIZE SRAM_SW_REG_SIZE
#define MAILBOX_SW_REG_BASE SRAM_SW_REG_BASE
#endif /* __CAVS_MAILBOX_H__ */