6 files changed, 37 insertions, 27 deletions

diff --git a/src/soc/amd/cezanne/psp_verstage/Makefile.inc b/src/soc/amd/cezanne/psp_verstage/Makefile.inc
index 3f924330b9ea..ea9353d44403 100644
--- a/src/soc/amd/cezanne/psp_verstage/Makefile.inc
+++ b/src/soc/amd/cezanne/psp_verstage/Makefile.inc
@@ -8,7 +8,7 @@ verstage-generic-ccopts += -I$(src)/soc/amd/common/psp_verstage/include
 subdirs-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += ../../common/psp_verstage
 
 verstage-y += svc.c
-verstage-y += stub.c
+verstage-y += chipset.c
 
 verstage-y += $(top)/src/vendorcode/amd/fsp/cezanne/bl_uapp/bl_uapp_startup.S
 verstage-y += $(top)/src/vendorcode/amd/fsp/cezanne/bl_uapp/bl_uapp_end.S
diff --git a/src/soc/amd/cezanne/psp_verstage/stub.c b/src/soc/amd/cezanne/psp_verstage/chipset.c
index b3ec7044b439..7f944ebcbcb0 100644
--- a/src/soc/amd/cezanne/psp_verstage/stub.c
+++ b/src/soc/amd/cezanne/psp_verstage/chipset.c
@@ -11,6 +11,21 @@
 #include <reset.h>
 #include <timer.h>
 
+uint32_t update_psp_bios_dir(uint32_t *psp_dir_offset, uint32_t *bios_dir_offset)
+{
+	return svc_update_psp_bios_dir(psp_dir_offset, bios_dir_offset);
+}
+
+uint32_t save_uapp_data(void *address, uint32_t size)
+{
+	return svc_save_uapp_data(address, size);
+}
+
+
+/* Functions below are stub functions for not-yet-implemented PSP features.
+ * These functions should be replaced with proper implementations later.
+ */
+
 uint32_t svc_write_postcode(uint32_t postcode)
 {
 	return 0;
diff --git a/src/soc/amd/cezanne/psp_verstage/svc.c b/src/soc/amd/cezanne/psp_verstage/svc.c
index 3d10c22663b8..70cb36983c08 100644
--- a/src/soc/amd/cezanne/psp_verstage/svc.c
+++ b/src/soc/amd/cezanne/psp_verstage/svc.c
@@ -82,11 +82,6 @@ uint32_t svc_unmap_spi_rom(void *spi_rom_addr)
 	return retval;
 }
 
-uint32_t update_psp_bios_dir(uint32_t *psp_dir_offset, uint32_t *bios_dir_offset)
-{
-	return svc_update_psp_bios_dir(psp_dir_offset, bios_dir_offset);
-}
-
 uint32_t svc_update_psp_bios_dir(uint32_t *psp_dir_offset,
 		uint32_t *bios_dir_offset)
 {
@@ -96,11 +91,6 @@ uint32_t svc_update_psp_bios_dir(uint32_t *psp_dir_offset,
 	return retval;
 }
 
-uint32_t save_uapp_data(void *address, uint32_t size)
-{
-	return svc_save_uapp_data(address, size);
-}
-
 uint32_t svc_save_uapp_data(void *address, uint32_t size)
 {
 	uint32_t retval = 0;
diff --git a/src/soc/amd/picasso/psp_verstage/Makefile.inc b/src/soc/amd/picasso/psp_verstage/Makefile.inc
index 32b594d2cbd9..41296c9b0c2f 100644
--- a/src/soc/amd/picasso/psp_verstage/Makefile.inc
+++ b/src/soc/amd/picasso/psp_verstage/Makefile.inc
@@ -4,6 +4,7 @@ verstage-generic-ccopts += -I$(src)/soc/amd/picasso/psp_verstage/include
 verstage-generic-ccopts += -I$(src)/vendorcode/amd/fsp/picasso/include
 
 verstage-y += svc.c
+verstage-y += chipset.c
 
 verstage-y += $(top)/src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_startup.S
 verstage-y += $(top)/src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_end.S
diff --git a/src/soc/amd/picasso/psp_verstage/chipset.c b/src/soc/amd/picasso/psp_verstage/chipset.c
new file mode 100644
index 000000000000..57a2ff39a22f
--- /dev/null
+++ b/src/soc/amd/picasso/psp_verstage/chipset.c
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <bl_uapp/bl_syscall_public.h>
+#include <psp_verstage.h>
+
+uint32_t update_psp_bios_dir(uint32_t *psp_dir_offset, uint32_t *bios_dir_offset)
+{
+	return svc_update_psp_bios_dir(psp_dir_offset, bios_dir_offset,
+				       DIR_OFFSET_SET);
+}
+
+uint32_t save_uapp_data(void *address, uint32_t size)
+{
+	return svc_save_uapp_data(UAPP_COPYBUF_CHROME_WORKBUF, address, size);
+}
+
+uint32_t get_max_workbuf_size(uint32_t *size)
+{
+	return svc_get_max_workbuf_size(size);
+}
diff --git a/src/soc/amd/picasso/psp_verstage/svc.c b/src/soc/amd/picasso/psp_verstage/svc.c
index 28e6bafa9590..d94ec769dad3 100644
--- a/src/soc/amd/picasso/psp_verstage/svc.c
+++ b/src/soc/amd/picasso/psp_verstage/svc.c
@@ -96,12 +96,6 @@ uint32_t svc_unmap_spi_rom(void *spi_rom_addr)
 	return retval;
 }
 
-uint32_t update_psp_bios_dir(uint32_t *psp_dir_offset, uint32_t *bios_dir_offset)
-{
-	return svc_update_psp_bios_dir(psp_dir_offset, bios_dir_offset,
-				       DIR_OFFSET_SET);
-}
-
 uint32_t svc_update_psp_bios_dir(uint32_t *psp_dir_offset,
 		uint32_t *bios_dir_offset, enum dir_offset_operation operation)
 {
@@ -112,11 +106,6 @@ uint32_t svc_update_psp_bios_dir(uint32_t *psp_dir_offset,
 	return retval;
 }
 
-uint32_t save_uapp_data(void *address, uint32_t size)
-{
-	return svc_save_uapp_data(UAPP_COPYBUF_CHROME_WORKBUF, address, size);
-}
-
 uint32_t svc_save_uapp_data(enum uapp_copybuf type, void *address,
 		uint32_t size)
 {
@@ -149,11 +138,6 @@ uint32_t svc_write_postcode(uint32_t postcode)
 	return retval;
 }
 
-uint32_t get_max_workbuf_size(uint32_t *size)
-{
-	return svc_get_max_workbuf_size(size);
-}
-
 uint32_t svc_get_max_workbuf_size(uint32_t *size)
 {
 	uint32_t retval = 0;