Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

smart-amp-test: remove obsolete build options #9773

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+62 −238
Open

smart-amp-test: remove obsolete build options #9773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lmdk/cmake/ldscripts/data_linker_script.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SECTIONS {
_data_end = ABSOLUTE(.);
} >HPSRAM_seg : data_phdr

.rodata : ALIGN(4096) {
.rodata : {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

? Thhis seems very odd in a PR to remove smart-ampt-test

_rodata_start = ABSOLUTE(.);
*(.gnu.linkonce.r.*)
*(.rodata)
Expand Down
25 changes: 0 additions & 25 deletions lmdk/libraries/smart_amp_test/CMakeLists.txt
View file
Open in desktop

This file was deleted.

79 changes: 0 additions & 79 deletions lmdk/libraries/smart_amp_test/smart_amp_test.toml
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions lmdk/modules/smart_amp_test/CMakeLists.txt
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/include/ipc4/base-config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@

#ifndef __SOF_IPC4_BASE_CONFIG_H__
#define __SOF_IPC4_BASE_CONFIG_H__
#ifndef __SOF_MODULE_SERVICE_BUILD__

#include <sof/compiler_attributes.h>
#endif
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This too, is this removing more?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kv2019i no, all those changes were brought in with the PR, that enabled modular smart-amp-test 694aa9e

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lyakh But smart-ampt-test was an example, wouldn't these changed be needed by other LMDK modules? OTOH, the CI tests seem to pass (there's at least the mixer module), so maybe these were needed just for smart-amp-test and not LMDK support in general. Just not so easy to make this conclusion from the diff.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kv2019i that's also my understanding, that since these changes were introduced with the smart-amp-test and reverting them doesn't break QB tests, don't think they were needed for other LMDK examples, i.e. for the down-mixer

#include <module/ipc4/base-config.h>

struct sof_ipc_stream_params;
Expand Down
16 changes: 2 additions & 14 deletions src/include/sof/samples/audio/smart_amp_test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
#ifndef __SOF_AUDIO_SMART_AMP_H__
#define __SOF_AUDIO_SMART_AMP_H__

#ifndef __SOF_MODULE_SERVICE_BUILD__
#include <sof/audio/component.h>
#include <sof/audio/data_blob.h>
#endif

#if CONFIG_IPC_MAJOR_4
#include <ipc4/base-config.h>
Expand All @@ -21,20 +19,10 @@

#define SMART_AMP_MAX_STREAM_CHAN 8

/* Max channels for all intel platforms are 8 */
#define MAX_CHANNELS 8

/** IPC blob types */
#define SOF_SMART_AMP_CONFIG 0
#define SOF_SMART_AMP_MODEL 1

#ifdef __SOF_MODULE_SERVICE_BUILD__
#define LOG_ERR(...)
#define LOG_WRN(...)
#define LOG_DBG(...)
#define LOG_INF(...)
#endif

struct smart_amp_model_data {
uint32_t data_size;
void *data;
Expand Down Expand Up @@ -95,8 +83,8 @@ struct smart_amp_model_data {
struct sof_smart_amp_config {
uint32_t size;
uint32_t feedback_channels;
int8_t source_ch_map[MAX_CHANNELS];
int8_t feedback_ch_map[MAX_CHANNELS];
int8_t source_ch_map[PLATFORM_MAX_CHANNELS];
int8_t feedback_ch_map[PLATFORM_MAX_CHANNELS];
};

#if CONFIG_IPC_MAJOR_4
Expand Down
Loading
Loading