27 files changed, 17 insertions, 18 deletions
diff --git a/src/soc/amd/cezanne/psp_verstage/Makefile.mk b/src/soc/amd/cezanne/psp_verstage/Makefile.mk
index 2cb1345365..bb9cc4740d 100644
--- a/src/soc/amd/cezanne/psp_verstage/Makefile.mk
+++ b/src/soc/amd/cezanne/psp_verstage/Makefile.mk
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-verstage-generic-ccopts += -I$(src)/vendorcode/amd/fsp/cezanne/include
+verstage-generic-ccopts += -I$(src)/vendorcode/amd/psp_verstage/cezanne/include
 
 verstage-generic-ccopts += -I$(src)/soc/amd/common/psp_verstage/include
 
@@ -10,5 +10,5 @@ verstage-y += svc.c
 verstage-y += chipset.c
 verstage-y += uart.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
+verstage-y += $(top)/src/vendorcode/amd/psp_verstage/cezanne/bl_uapp/bl_uapp_startup.S
+verstage-y += $(top)/src/vendorcode/amd/psp_verstage/cezanne/bl_uapp/bl_uapp_end.S
diff --git a/src/soc/amd/glinda/psp_verstage/Makefile.mk b/src/soc/amd/glinda/psp_verstage/Makefile.mk
index 472ca2d3d2..f8ad7366c5 100644
--- a/src/soc/amd/glinda/psp_verstage/Makefile.mk
+++ b/src/soc/amd/glinda/psp_verstage/Makefile.mk
@@ -6,14 +6,14 @@ subdirs-y += ../../common/psp_verstage
 
 verstage-generic-ccopts += -I$(src)/soc/amd/glinda/psp_verstage/include
 verstage-generic-ccopts += -I$(src)/soc/amd/common/psp_verstage/include
-verstage-generic-ccopts += -Isrc/vendorcode/amd/fsp/glinda/include
-verstage-generic-ccopts += -Isrc/vendorcode/amd/fsp/common/include
+verstage-generic-ccopts += -Isrc/vendorcode/amd/psp_verstage/glinda/include
+verstage-generic-ccopts += -Isrc/vendorcode/amd/psp_verstage/common/include
 
 verstage-y += svc.c
 verstage-y += chipset.c
 verstage-y += uart.c
 
-verstage-y +=$(top)/src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_startup.S
-verstage-y += $(top)/src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_end.S
+verstage-y +=$(top)/src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_startup.S
+verstage-y += $(top)/src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_end.S
 
 endif
diff --git a/src/soc/amd/mendocino/psp_verstage/Makefile.mk b/src/soc/amd/mendocino/psp_verstage/Makefile.mk
index 19dd8a7225..347f26af6f 100644
--- a/src/soc/amd/mendocino/psp_verstage/Makefile.mk
+++ b/src/soc/amd/mendocino/psp_verstage/Makefile.mk
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-verstage-generic-ccopts += -I$(src)/vendorcode/amd/fsp/mendocino/include
+verstage-generic-ccopts += -I$(src)/vendorcode/amd/psp_verstage/mendocino/include
 
 verstage-generic-ccopts += -I$(src)/soc/amd/common/psp_verstage/include
 
@@ -10,5 +10,5 @@ verstage-y += svc.c
 verstage-y += chipset.c
 verstage-y += uart.c
 
-verstage-y += $(top)/src/vendorcode/amd/fsp/mendocino/bl_uapp/bl_uapp_startup.S
-verstage-y += $(top)/src/vendorcode/amd/fsp/mendocino/bl_uapp/bl_uapp_end.S
+verstage-y += $(top)/src/vendorcode/amd/psp_verstage/mendocino/bl_uapp/bl_uapp_startup.S
+verstage-y += $(top)/src/vendorcode/amd/psp_verstage/mendocino/bl_uapp/bl_uapp_end.S
diff --git a/src/soc/amd/phoenix/psp_verstage/Makefile.mk b/src/soc/amd/phoenix/psp_verstage/Makefile.mk
index 6a2eaced17..fc9f413bc7 100644
--- a/src/soc/amd/phoenix/psp_verstage/Makefile.mk
+++ b/src/soc/amd/phoenix/psp_verstage/Makefile.mk
@@ -3,12 +3,12 @@
 subdirs-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += ../../common/psp_verstage
 
 verstage-generic-ccopts += -I$(src)/soc/amd/common/psp_verstage/include
-verstage-generic-ccopts += -Isrc/vendorcode/amd/fsp/phoenix/include
-verstage-generic-ccopts += -Isrc/vendorcode/amd/fsp/common/include
+verstage-generic-ccopts += -Isrc/vendorcode/amd/psp_verstage/phoenix/include
+verstage-generic-ccopts += -Isrc/vendorcode/amd/psp_verstage/common/include
 
 verstage-y += svc.c
 verstage-y += chipset.c
 verstage-y += uart.c
 
-verstage-y +=$(top)/src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_startup.S
-verstage-y += $(top)/src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_end.S
+verstage-y +=$(top)/src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_startup.S
+verstage-y += $(top)/src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_end.S
diff --git a/src/soc/amd/picasso/Makefile.mk b/src/soc/amd/picasso/Makefile.mk
index ba58c9178b..7a21852837 100644
--- a/src/soc/amd/picasso/Makefile.mk
+++ b/src/soc/amd/picasso/Makefile.mk
@@ -41,7 +41,6 @@ smm-y += gpio.c
 CPPFLAGS_common += -I$(src)/soc/amd/picasso/include
 CPPFLAGS_common += -I$(src)/soc/amd/picasso/acpi
 CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/picasso
-CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/picasso/include
 CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/common
 
 # 0x40 accounts for the cbfs_file struct + filename + metadata structs, aligned to 64 bytes
diff --git a/src/soc/amd/picasso/psp_verstage/Makefile.mk b/src/soc/amd/picasso/psp_verstage/Makefile.mk
index bf1a69448d..77ceb0caca 100644
--- a/src/soc/amd/picasso/psp_verstage/Makefile.mk
+++ b/src/soc/amd/picasso/psp_verstage/Makefile.mk
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-verstage-generic-ccopts += -I$(src)/vendorcode/amd/fsp/picasso/include
+verstage-generic-ccopts += -I$(src)/vendorcode/amd/psp_verstage/picasso/include
 
 verstage-y += svc.c
 verstage-y += chipset.c
 verstage-y += uart.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
+verstage-y += $(top)/src/vendorcode/amd/psp_verstage/picasso/bl_uapp/bl_uapp_startup.S
+verstage-y += $(top)/src/vendorcode/amd/psp_verstage/picasso/bl_uapp/bl_uapp_end.S
diff --git a/src/vendorcode/amd/fsp/cezanne/bl_uapp/bl_uapp_end.S b/src/vendorcode/amd/psp_verstage/cezanne/bl_uapp/bl_uapp_end.S
index db6556cb0a..db6556cb0a 100644
--- a/src/vendorcode/amd/fsp/cezanne/bl_uapp/bl_uapp_end.S
+++ b/src/vendorcode/amd/psp_verstage/cezanne/bl_uapp/bl_uapp_end.S
diff --git a/src/vendorcode/amd/fsp/cezanne/bl_uapp/bl_uapp_header.inc b/src/vendorcode/amd/psp_verstage/cezanne/bl_uapp/bl_uapp_header.inc
index 35c906a445..35c906a445 100644
--- a/src/vendorcode/amd/fsp/cezanne/bl_uapp/bl_uapp_header.inc
+++ b/src/vendorcode/amd/psp_verstage/cezanne/bl_uapp/bl_uapp_header.inc
diff --git a/src/vendorcode/amd/fsp/cezanne/bl_uapp/bl_uapp_startup.S b/src/vendorcode/amd/psp_verstage/cezanne/bl_uapp/bl_uapp_startup.S
index f5f1e18e6c..f5f1e18e6c 100644
--- a/src/vendorcode/amd/fsp/cezanne/bl_uapp/bl_uapp_startup.S
+++ b/src/vendorcode/amd/psp_verstage/cezanne/bl_uapp/bl_uapp_startup.S
diff --git a/src/vendorcode/amd/fsp/cezanne/include/bl_uapp/bl_errorcodes_public.h b/src/vendorcode/amd/psp_verstage/cezanne/include/bl_uapp/bl_errorcodes_public.h
index 4fa9a3371f..4fa9a3371f 100644
--- a/src/vendorcode/amd/fsp/cezanne/include/bl_uapp/bl_errorcodes_public.h
+++ b/src/vendorcode/amd/psp_verstage/cezanne/include/bl_uapp/bl_errorcodes_public.h
diff --git a/src/vendorcode/amd/fsp/cezanne/include/bl_uapp/bl_syscall_public.h b/src/vendorcode/amd/psp_verstage/cezanne/include/bl_uapp/bl_syscall_public.h
index d88bfe1801..d88bfe1801 100644
--- a/src/vendorcode/amd/fsp/cezanne/include/bl_uapp/bl_syscall_public.h
+++ b/src/vendorcode/amd/psp_verstage/cezanne/include/bl_uapp/bl_syscall_public.h
diff --git a/src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_end.S b/src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_end.S
index db6556cb0a..db6556cb0a 100644
--- a/src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_end.S
+++ b/src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_end.S
diff --git a/src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_header.inc b/src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_header.inc
index bb90f67817..bb90f67817 100644
--- a/src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_header.inc
+++ b/src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_header.inc
diff --git a/src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_startup.S b/src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_startup.S
index f5f1e18e6c..f5f1e18e6c 100644
--- a/src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_startup.S
+++ b/src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_startup.S
diff --git a/src/vendorcode/amd/fsp/common/include/bl_uapp/bl_errorcodes_public.h b/src/vendorcode/amd/psp_verstage/common/include/bl_uapp/bl_errorcodes_public.h
index 4fa9a3371f..4fa9a3371f 100644
--- a/src/vendorcode/amd/fsp/common/include/bl_uapp/bl_errorcodes_public.h
+++ b/src/vendorcode/amd/psp_verstage/common/include/bl_uapp/bl_errorcodes_public.h
diff --git a/src/vendorcode/amd/fsp/glinda/include/bl_uapp/bl_syscall_public.h b/src/vendorcode/amd/psp_verstage/glinda/include/bl_uapp/bl_syscall_public.h
index 0516e6315d..0516e6315d 100644
--- a/src/vendorcode/amd/fsp/glinda/include/bl_uapp/bl_syscall_public.h
+++ b/src/vendorcode/amd/psp_verstage/glinda/include/bl_uapp/bl_syscall_public.h
diff --git a/src/vendorcode/amd/fsp/mendocino/bl_uapp/bl_uapp_end.S b/src/vendorcode/amd/psp_verstage/mendocino/bl_uapp/bl_uapp_end.S
index db6556cb0a..db6556cb0a 100644
--- a/src/vendorcode/amd/fsp/mendocino/bl_uapp/bl_uapp_end.S
+++ b/src/vendorcode/amd/psp_verstage/mendocino/bl_uapp/bl_uapp_end.S
diff --git a/src/vendorcode/amd/fsp/mendocino/bl_uapp/bl_uapp_header.inc b/src/vendorcode/amd/psp_verstage/mendocino/bl_uapp/bl_uapp_header.inc
index bb90f67817..bb90f67817 100644
--- a/src/vendorcode/amd/fsp/mendocino/bl_uapp/bl_uapp_header.inc
+++ b/src/vendorcode/amd/psp_verstage/mendocino/bl_uapp/bl_uapp_header.inc
diff --git a/src/vendorcode/amd/fsp/mendocino/bl_uapp/bl_uapp_startup.S b/src/vendorcode/amd/psp_verstage/mendocino/bl_uapp/bl_uapp_startup.S
index f5f1e18e6c..f5f1e18e6c 100644
--- a/src/vendorcode/amd/fsp/mendocino/bl_uapp/bl_uapp_startup.S
+++ b/src/vendorcode/amd/psp_verstage/mendocino/bl_uapp/bl_uapp_startup.S
diff --git a/src/vendorcode/amd/fsp/mendocino/include/bl_uapp/bl_errorcodes_public.h b/src/vendorcode/amd/psp_verstage/mendocino/include/bl_uapp/bl_errorcodes_public.h
index 4fa9a3371f..4fa9a3371f 100644
--- a/src/vendorcode/amd/fsp/mendocino/include/bl_uapp/bl_errorcodes_public.h
+++ b/src/vendorcode/amd/psp_verstage/mendocino/include/bl_uapp/bl_errorcodes_public.h
diff --git a/src/vendorcode/amd/fsp/mendocino/include/bl_uapp/bl_syscall_public.h b/src/vendorcode/amd/psp_verstage/mendocino/include/bl_uapp/bl_syscall_public.h
index d09f39cec1..d09f39cec1 100644
--- a/src/vendorcode/amd/fsp/mendocino/include/bl_uapp/bl_syscall_public.h
+++ b/src/vendorcode/amd/psp_verstage/mendocino/include/bl_uapp/bl_syscall_public.h
diff --git a/src/vendorcode/amd/fsp/phoenix/include/bl_uapp/bl_syscall_public.h b/src/vendorcode/amd/psp_verstage/phoenix/include/bl_uapp/bl_syscall_public.h
index b3e41404e8..b3e41404e8 100644
--- a/src/vendorcode/amd/fsp/phoenix/include/bl_uapp/bl_syscall_public.h
+++ b/src/vendorcode/amd/psp_verstage/phoenix/include/bl_uapp/bl_syscall_public.h
diff --git a/src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_end.S b/src/vendorcode/amd/psp_verstage/picasso/bl_uapp/bl_uapp_end.S
index db6556cb0a..db6556cb0a 100644
--- a/src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_end.S
+++ b/src/vendorcode/amd/psp_verstage/picasso/bl_uapp/bl_uapp_end.S
diff --git a/src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_header.inc b/src/vendorcode/amd/psp_verstage/picasso/bl_uapp/bl_uapp_header.inc
index e2a16667a4..e2a16667a4 100644
--- a/src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_header.inc
+++ b/src/vendorcode/amd/psp_verstage/picasso/bl_uapp/bl_uapp_header.inc
diff --git a/src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_startup.S b/src/vendorcode/amd/psp_verstage/picasso/bl_uapp/bl_uapp_startup.S
index 15340d58ae..15340d58ae 100644
--- a/src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_startup.S
+++ b/src/vendorcode/amd/psp_verstage/picasso/bl_uapp/bl_uapp_startup.S
diff --git a/src/vendorcode/amd/fsp/picasso/include/bl_uapp/bl_errorcodes_public.h b/src/vendorcode/amd/psp_verstage/picasso/include/bl_uapp/bl_errorcodes_public.h
index 1d5e86ffb1..1d5e86ffb1 100644
--- a/src/vendorcode/amd/fsp/picasso/include/bl_uapp/bl_errorcodes_public.h
+++ b/src/vendorcode/amd/psp_verstage/picasso/include/bl_uapp/bl_errorcodes_public.h
diff --git a/src/vendorcode/amd/fsp/picasso/include/bl_uapp/bl_syscall_public.h b/src/vendorcode/amd/psp_verstage/picasso/include/bl_uapp/bl_syscall_public.h
index 0c168a93b2..0c168a93b2 100644
--- a/src/vendorcode/amd/fsp/picasso/include/bl_uapp/bl_syscall_public.h
+++ b/src/vendorcode/amd/psp_verstage/picasso/include/bl_uapp/bl_syscall_public.h