Make Common code and add the new platform Vangogh.

scripts/xtensa-build-all.sh

@@ -9,7 +9,7 @@ set -e
 # They must have a toolchain available in the latest Docker image.
 DEFAULT_PLATFORMS=(
     imx8 imx8x imx8m imx8ulp
-    rn rmb
+    rn rmb vangogh
     mt8186 mt8195
 )
 
@@ -235,6 +235,13 @@ do
 			HOST="xtensa-rmb-elf"
 			XTENSA_TOOLS_VERSION="RI-2019.1-linux"
 			;;
+		vangogh)
+			PLATFORM="vangogh"
+			ARCH="xtensa"
+			XTENSA_CORE="ACP_5_0_001_PROD"
+			HOST="xtensa-vangogh-elf"
+			XTENSA_TOOLS_VERSION="RI-2019.1-linux"
+			;;
 		mt8186)
 			PLATFORM="mt8186"
 			XTENSA_CORE="hifi5_7stg_I64D128"

src/arch/xtensa/CMakeLists.txt

@@ -16,6 +16,8 @@ elseif(CONFIG_RENOIR)
 	set(platform_folder amd/renoir)
 elseif(CONFIG_REMBRANDT)
 	set(platform_folder amd/rembrandt)
+elseif(CONFIG_VANGOGH)
+	set(platform_folder amd/vangogh)
 elseif(CONFIG_MT8186)
         set(platform_folder mt8186)
 elseif(CONFIG_MT8188)
@@ -33,6 +35,10 @@ get_filename_component(_plf_ld_script ${platform_folder} NAME)
 set(platform_ld_script ${_plf_ld_script}.x)
 set(platform_rom_ld_script rom.x)
 
+if(CONFIG_AMD)
+	target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/src/platform/amd/common/include)
+endif()
+
 # includes
 
 # None of these should be included if Zephyr strict headers are used.
@@ -464,7 +470,7 @@ add_custom_target(
 # NXP
 set(UNSIGNED_RI imx8 imx8x imx8m imx8ulp)
 # AMD
-list(APPEND UNSIGNED_RI rn rmb)
+list(APPEND UNSIGNED_RI rn rmb vangogh)
 # MediaTek
 list(APPEND UNSIGNED_RI mt8186 mt8188 mt8195)
 

src/arch/xtensa/configs/vangogh_defconfig

@@ -0,0 +1,26 @@
+CONFIG_VANGOGH=y
+CONFIG_RIMAGE_SIGNING_SCHEMA="vangogh"
+CONFIG_TRACE_CHANNEL=7
+CONFIG_WRAP_ACTUAL_POSITION=y
+CONFIG_AMD_BT=n
+CONFIG_CORE_COUNT=1
+CONFIG_LP_MEMORY_BANKS=0
+CONFIG_HP_MEMORY_BANKS=20
+CONFIG_FORMAT_CONVERT_HIFI3=n
+CONFIG_LP_SRAM=n
+CONFIG_HAVE_AGENT=n
+CONFIG_COMP_SRC=n
+CONFIG_COMP_FIR=n
+CONFIG_COMP_IIR=n
+CONFIG_COMP_DCBLOCK=n
+CONFIG_COMP_TDFB=n
+CONFIG_COMP_TONE=n
+CONFIG_COMP_MIXER=n
+CONFIG_COMP_MUX=n
+CONFIG_COMP_SWITCH=n
+CONFIG_COMP_KPB=n
+CONFIG_COMP_SEL=n
+CONFIG_COMP_ASRC=n
+CONFIG_TRACE=y
+CONFIG_TRACEE=y
+CONFIG_TRACEV=y

src/drivers/CMakeLists.txt

@@ -8,7 +8,7 @@ if(CONFIG_INTEL)
 	add_subdirectory(intel)
 endif()
 
-if(CONFIG_RENOIR OR CONFIG_REMBRANDT)
+if(CONFIG_AMD)
 	add_subdirectory(amd)
 endif()
 

src/drivers/amd/CMakeLists.txt

@@ -1,7 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
-
+add_subdirectory(common)
 if(CONFIG_RENOIR)
 	add_subdirectory(renoir)
 elseif(CONFIG_REMBRANDT)
 	add_subdirectory(rembrandt)
+elseif(CONFIG_VANGOGH)
+	add_subdirectory(vangogh)
 endif()

src/drivers/amd/common/CMakeLists.txt

@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
+add_local_sources(sof
+	acp_dma.c
+	acp_bt_dai.c
+	acp_dmic_dai.c
+	ipc.c
+	timer.c
+	acp_sp_dma.c
+	acp_dmic_dma.c
+)

src/drivers/amd/rembrandt/acp_bt_dai.c → src/drivers/amd/common/acp_bt_dai.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
-//Copyright(c) 2022 AMD. All rights reserved.
+//Copyright(c) 2023 AMD. All rights reserved.
 //
 //Author:	Basavaraj Hiregoudar <basavaraj.hiregoudar@amd.com>
-//		Bala Kishore <balakishore.pati@amd.com>
+//		SaiSurya, Ch <saisurya.chakkaveeravenkatanaga@amd.com>
 
 #include <sof/audio/component.h>
 #include <sof/drivers/acp_dai_dma.h>
@@ -18,22 +18,22 @@
 #include <sof/lib/io.h>
 #include <platform/chip_offset_byte.h>
 
-/* 4abd71ba-8619-458a-b33f-160fc0cf809b */
-DECLARE_SOF_UUID("btdai", btdai_uuid, 0x4abd71ba, 0x8619, 0x458a,
-		  0xb3, 0x3f, 0x16, 0x0f, 0xc0, 0xcf, 0x80, 0x9b);
+/* 20865bfe-b833-4ff9-b22a-0482c3477497 */
+DECLARE_SOF_UUID("btdai", btdai_uuid, 0x20865bfe, 0xb833, 0x4ff9,
+		 0xb2, 0x2a, 0x04, 0x82, 0xc3, 0x47, 0x74, 0x97);
 
 DECLARE_TR_CTX(btdai_tr, SOF_UUID(btdai_uuid), LOG_LEVEL_INFO);
 
 static inline int btdai_set_config(struct dai *dai, struct ipc_config_dai *common_config,
 				   const void *spec_config)
 {
-	/* nothing to do on rembrandt */
+	/* nothing to do */
 	return 0;
 }
 
 static int btdai_trigger(struct dai *dai, int cmd, int direction)
 {
-	/* nothing to do on rembrandt */
+	/* nothing to do */
 	return 0;
 }