Felix Held submitted this change.
vc/amd: move verstage on PSP files to new psp_verstage folder
Move the verstage on PSP files in vendorcode from the fsp subdirectory
to a new psp_verstage subdirectory, since those files aren't specific to
the case of the FSP being used for the silicon initialization.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ic47f8b18bc515600add7838f4c7afcb4fff7c004
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80209
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-by: Varshit Pandya <pandyavarshit@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
---
M src/soc/amd/cezanne/psp_verstage/Makefile.mk
M src/soc/amd/glinda/psp_verstage/Makefile.mk
M src/soc/amd/mendocino/psp_verstage/Makefile.mk
M src/soc/amd/phoenix/psp_verstage/Makefile.mk
M src/soc/amd/picasso/Makefile.mk
M src/soc/amd/picasso/psp_verstage/Makefile.mk
R src/vendorcode/amd/psp_verstage/cezanne/bl_uapp/bl_uapp_end.S
R src/vendorcode/amd/psp_verstage/cezanne/bl_uapp/bl_uapp_header.inc
R src/vendorcode/amd/psp_verstage/cezanne/bl_uapp/bl_uapp_startup.S
R src/vendorcode/amd/psp_verstage/cezanne/include/bl_uapp/bl_errorcodes_public.h
R src/vendorcode/amd/psp_verstage/cezanne/include/bl_uapp/bl_syscall_public.h
R src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_end.S
R src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_header.inc
R src/vendorcode/amd/psp_verstage/common/bl_uapp/bl_uapp_startup.S
R src/vendorcode/amd/psp_verstage/common/include/bl_uapp/bl_errorcodes_public.h
R src/vendorcode/amd/psp_verstage/glinda/include/bl_uapp/bl_syscall_public.h
R src/vendorcode/amd/psp_verstage/mendocino/bl_uapp/bl_uapp_end.S
R src/vendorcode/amd/psp_verstage/mendocino/bl_uapp/bl_uapp_header.inc
R src/vendorcode/amd/psp_verstage/mendocino/bl_uapp/bl_uapp_startup.S
R src/vendorcode/amd/psp_verstage/mendocino/include/bl_uapp/bl_errorcodes_public.h
R src/vendorcode/amd/psp_verstage/mendocino/include/bl_uapp/bl_syscall_public.h
R src/vendorcode/amd/psp_verstage/phoenix/include/bl_uapp/bl_syscall_public.h
R src/vendorcode/amd/psp_verstage/picasso/bl_uapp/bl_uapp_end.S
R src/vendorcode/amd/psp_verstage/picasso/bl_uapp/bl_uapp_header.inc
R src/vendorcode/amd/psp_verstage/picasso/bl_uapp/bl_uapp_startup.S
R src/vendorcode/amd/psp_verstage/picasso/include/bl_uapp/bl_errorcodes_public.h
R src/vendorcode/amd/psp_verstage/picasso/include/bl_uapp/bl_syscall_public.h
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 2cb1345..bb9cc47 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 += 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 472ca2d..f8ad736 100644
--- a/src/soc/amd/glinda/psp_verstage/Makefile.mk
+++ b/src/soc/amd/glinda/psp_verstage/Makefile.mk
@@ -6,14 +6,14 @@
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 19dd8a7..347f26a 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 += 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 6a2eace..fc9f413 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 ba58c91..7a21852 100644
--- a/src/soc/amd/picasso/Makefile.mk
+++ b/src/soc/amd/picasso/Makefile.mk
@@ -41,7 +41,6 @@
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 bf1a694..77ceb0c 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
similarity index 100%
rename from src/vendorcode/amd/fsp/cezanne/bl_uapp/bl_uapp_end.S
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/cezanne/bl_uapp/bl_uapp_header.inc
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/cezanne/bl_uapp/bl_uapp_startup.S
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/cezanne/include/bl_uapp/bl_errorcodes_public.h
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/cezanne/include/bl_uapp/bl_syscall_public.h
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_end.S
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_header.inc
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/common/bl_uapp/bl_uapp_startup.S
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/common/include/bl_uapp/bl_errorcodes_public.h
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/glinda/include/bl_uapp/bl_syscall_public.h
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/mendocino/bl_uapp/bl_uapp_end.S
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/mendocino/bl_uapp/bl_uapp_header.inc
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/mendocino/bl_uapp/bl_uapp_startup.S
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/mendocino/include/bl_uapp/bl_errorcodes_public.h
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/mendocino/include/bl_uapp/bl_syscall_public.h
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/phoenix/include/bl_uapp/bl_syscall_public.h
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_end.S
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_header.inc
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_startup.S
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/picasso/include/bl_uapp/bl_errorcodes_public.h
rename to 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
similarity index 100%
rename from src/vendorcode/amd/fsp/picasso/include/bl_uapp/bl_syscall_public.h
rename to src/vendorcode/amd/psp_verstage/picasso/include/bl_uapp/bl_syscall_public.h
To view, visit change 80209. To unsubscribe, or for help writing mail filters, visit settings.