OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

app: zephyr: remove overlays and adapt script 

Remove overlays as they are the same board configurations available in
app/.
Keep common overlays and change script to reflect those changes.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2022-07-12 22:27:43 -04:00 committed by Liam Girdwood
parent a0c9907dbd
commit afd28fb087
14 changed files with 7 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/boards/intel_adsp_ace15_mtpm.conf
View File

@ -1,9 +0,0 @@
CONFIG_INTEL_DMIC=y
CONFIG_INTEL_SSP=y
CONFIG_INTEL_ALH=y
CONFIG_LP_MEMORY_BANKS=1
CONFIG_RIMAGE_SIGNING_SCHEMA="mtl"
CONFIG_IPC_MAJOR_4=y
CONFIG_COMP_SRC=n
CONFIG_INTEL_ADSP_TIMER=n
CONFIG_FORMAT_CONVERT_HIFI3=n

0
overlays/common/debug_overlay.conf → app/debug_overlay.conf
View File

0
overlays/tgl-h/ipc4_overlay.conf → app/overlays/tgl-h/ipc4_overlay.conf
View File

0
overlays/tgl/ipc4_overlay.conf → app/overlays/tgl/ipc4_overlay.conf
View File

7
overlays/apl/overlay.conf
View File

@ -1,7 +0,0 @@
CONFIG_APOLLOLAKE=y
CONFIG_INTEL_DMIC=y
CONFIG_INTEL_SSP=y
CONFIG_LP_MEMORY_BANKS=2
CONFIG_HP_MEMORY_BANKS=8
CONFIG_PERFORMANCE_COUNTERS=y
CONFIG_COMP_SRC_TINY=y

7
overlays/cnl/overlay.conf
View File

@ -1,7 +0,0 @@
CONFIG_CANNONLAKE=y
CONFIG_INTEL_DMIC=y
CONFIG_INTEL_SSP=y
CONFIG_INTEL_ALH=y
CONFIG_LP_MEMORY_BANKS=1
CONFIG_HP_MEMORY_BANKS=47
CONFIG_PERFORMANCE_COUNTERS=y

6
overlays/icl/overlay.conf
View File

@ -1,6 +0,0 @@
CONFIG_ICELAKE=y
CONFIG_INTEL_DMIC=y
CONFIG_INTEL_SSP=y
CONFIG_INTEL_ALH=y
CONFIG_LP_MEMORY_BANKS=1
CONFIG_HP_MEMORY_BANKS=47

4
overlays/imx8/overlay.conf
View File

@ -1,4 +0,0 @@
CONFIG_IMX8=y
CONFIG_HAVE_AGENT=n
CONFIG_FORMAT_CONVERT_HIFI3=n
CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n

4
overlays/imx8m/overlay.conf
View File

@ -1,4 +0,0 @@
CONFIG_IMX8M=y
CONFIG_HAVE_AGENT=n
CONFIG_FORMAT_CONVERT_HIFI3=n
CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n

4
overlays/imx8x/overlay.conf
View File

@ -1,4 +0,0 @@
CONFIG_IMX8X=y
CONFIG_HAVE_AGENT=n
CONFIG_FORMAT_CONVERT_HIFI3=n
CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n

5
overlays/jsl/overlay.conf
View File

@ -1,5 +0,0 @@
CONFIG_ICELAKE=y
CONFIG_INTEL_DMIC=y
CONFIG_INTEL_SSP=y
CONFIG_LP_MEMORY_BANKS=1
CONFIG_HP_MEMORY_BANKS=16

7
overlays/tgl-h/overlay.conf
View File

@ -1,7 +0,0 @@
CONFIG_TIGERLAKE=y
CONFIG_INTEL_DMIC=y
CONFIG_INTEL_SSP=y
CONFIG_INTEL_ALH=y
CONFIG_LP_MEMORY_BANKS=1
CONFIG_HP_MEMORY_BANKS=30
CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-h"

7
overlays/tgl/overlay.conf
View File

@ -1,7 +0,0 @@
CONFIG_TIGERLAKE=y
CONFIG_INTEL_DMIC=y
CONFIG_INTEL_SSP=y
CONFIG_INTEL_ALH=y
CONFIG_LP_MEMORY_BANKS=1
CONFIG_HP_MEMORY_BANKS=30
CONFIG_RIMAGE_SIGNING_SCHEMA="tgl"

17
scripts/xtensa-build-zephyr.py
View File

@ -483,7 +483,7 @@ def build_platforms():
build_cmd = ["west"]
build_cmd += ["-v"] * args.verbose
build_cmd += ["build", "--build-dir", platform_build_dir_name]
source_dir = pathlib.Path(west_top, "zephyr", "samples", "subsys", "audio", "sof")
source_dir = pathlib.Path(SOF_TOP, "app")
build_cmd += ["--board", PLAT_CONFIG, str(source_dir)]
build_cmd.append('--')
@ -491,23 +491,20 @@ def build_platforms():
build_cmd += args.cmake_args
overlays = [str(item.resolve(True)) for item in args.overlay]
# You may override default overlay.conf file name using CONFIG_OVERLAY in your platform
# dictionary
overlay_filename = platform_dict.get("CONFIG_OVERLAY", "overlay.conf")
overlays.append(str(pathlib.Path(SOF_TOP, "overlays", platform, overlay_filename)))
# The '-d' option is a shortcut for '-o path_to_debug_overlay', we are good
# if both are provided, because it's no harm to merge the same overlay twice.
if args.debug:
overlays.append(str(pathlib.Path(SOF_TOP, "overlays", "common", "debug_overlay.conf")))
overlays.append(str(pathlib.Path(SOF_TOP, "app", "debug_overlay.conf")))
# The '-i IPC4' is a shortcut for '-o path_to_ipc4_overlay', we are good if both
# are provided, because it's no harm to merge the same overlay twice.
if args.ipc == "IPC4":
overlays.append(str(pathlib.Path(SOF_TOP, "overlays", platform, platform_dict["IPC4_CONFIG_OVERLAY"])))
overlays.append(str(pathlib.Path(SOF_TOP, "app", "overlays", platform,
platform_dict["IPC4_CONFIG_OVERLAY"])))
overlays = ";".join(overlays)
build_cmd.append(f"-DOVERLAY_CONFIG={overlays}")
if overlays:
overlays = ";".join(overlays)
build_cmd.append(f"-DOVERLAY_CONFIG={overlays}")
# Build
execute_command(build_cmd, cwd=west_top)