From e20bc464fbc14db65d1fb99474776147a18e7bda Mon Sep 17 00:00:00 2001 From: Kangheui Won Date: Tue, 6 Apr 2021 16:55:48 +1000 Subject: [PATCH] soc/amd: move psp_verstage to amd/common psp_verstage is not specific to picasso. There might be picasso-specific code but move everything into common as a first step. While developing psp_verstage for cezanne picasso-specific code will move back to picasso directory. BUG=b:182477057 BRANCH=none TEST=build psp_verstage on zork Signed-off-by: Kangheui Won Change-Id: Ifb1df0d82b972f28be2ffebd476c2553cbda9810 Reviewed-on: https://review.coreboot.org/c/coreboot/+/52306 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/soc/amd/common/psp_verstage/Makefile.inc | 24 +++++++++++++++++++ .../{picasso => common}/psp_verstage/delay.c | 0 .../{picasso => common}/psp_verstage/fch.c | 0 .../psp_verstage/include/arch/io.h | 0 .../psp_verstage/include/arch/smp/spinlock.h | 0 .../{picasso => common}/psp_verstage/pmutil.c | 0 .../{picasso => common}/psp_verstage/post.c | 0 .../{picasso => common}/psp_verstage/printk.c | 0 .../{picasso => common}/psp_verstage/psp.c | 0 .../psp_verstage/psp_verstage.c | 0 .../psp_verstage/psp_verstage.h | 0 .../{picasso => common}/psp_verstage/reset.c | 0 .../{picasso => common}/psp_verstage/svc.c | 0 .../{picasso => common}/psp_verstage/svc.h | 0 .../{picasso => common}/psp_verstage/timer.c | 0 .../psp_verstage/vboot_crypto.c | 0 src/soc/amd/picasso/Makefile.inc | 1 + src/soc/amd/picasso/psp_verstage/Makefile.inc | 20 ---------------- 18 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 src/soc/amd/common/psp_verstage/Makefile.inc rename src/soc/amd/{picasso => common}/psp_verstage/delay.c (100%) rename src/soc/amd/{picasso => common}/psp_verstage/fch.c (100%) rename src/soc/amd/{picasso => common}/psp_verstage/include/arch/io.h (100%) rename src/soc/amd/{picasso => common}/psp_verstage/include/arch/smp/spinlock.h (100%) rename src/soc/amd/{picasso => common}/psp_verstage/pmutil.c (100%) rename src/soc/amd/{picasso => common}/psp_verstage/post.c (100%) rename src/soc/amd/{picasso => common}/psp_verstage/printk.c (100%) rename src/soc/amd/{picasso => common}/psp_verstage/psp.c (100%) rename src/soc/amd/{picasso => common}/psp_verstage/psp_verstage.c (100%) rename src/soc/amd/{picasso => common}/psp_verstage/psp_verstage.h (100%) rename src/soc/amd/{picasso => common}/psp_verstage/reset.c (100%) rename src/soc/amd/{picasso => common}/psp_verstage/svc.c (100%) rename src/soc/amd/{picasso => common}/psp_verstage/svc.h (100%) rename src/soc/amd/{picasso => common}/psp_verstage/timer.c (100%) rename src/soc/amd/{picasso => common}/psp_verstage/vboot_crypto.c (100%) diff --git a/src/soc/amd/common/psp_verstage/Makefile.inc b/src/soc/amd/common/psp_verstage/Makefile.inc new file mode 100644 index 0000000000..40d9c45763 --- /dev/null +++ b/src/soc/amd/common/psp_verstage/Makefile.inc @@ -0,0 +1,24 @@ +# SPDX-License-Identifier: GPL-2.0-only + +verstage-generic-ccopts += -I$(src)/soc/amd/common/psp_verstage/include +verstage-generic-ccopts += -I$(src)/vendorcode/amd/fsp/picasso/include +verstage-generic-ccopts += -D__USER_SPACE__ +CPPFLAGS_common += -I$(VBOOT_SOURCE)/firmware/2lib/include/ + +# This size should match the size in the linker script. +CFLAGS_arm += -Wstack-usage=40960 + +verstage-y += delay.c +verstage-y += fch.c +verstage-y += pmutil.c +verstage-y += post.c +verstage-y += printk.c +verstage-y += psp_verstage.c +verstage-y += psp.c +verstage-y += reset.c +verstage-y += svc.c +verstage-y += timer.c +verstage-y += vboot_crypto.c + +$(obj)/psp_verstage.bin: $(objcbfs)/verstage.elf + $(OBJCOPY_verstage) -O binary $^ $@ diff --git a/src/soc/amd/picasso/psp_verstage/delay.c b/src/soc/amd/common/psp_verstage/delay.c similarity index 100% rename from src/soc/amd/picasso/psp_verstage/delay.c rename to src/soc/amd/common/psp_verstage/delay.c diff --git a/src/soc/amd/picasso/psp_verstage/fch.c b/src/soc/amd/common/psp_verstage/fch.c similarity index 100% rename from src/soc/amd/picasso/psp_verstage/fch.c rename to src/soc/amd/common/psp_verstage/fch.c diff --git a/src/soc/amd/picasso/psp_verstage/include/arch/io.h b/src/soc/amd/common/psp_verstage/include/arch/io.h similarity index 100% rename from src/soc/amd/picasso/psp_verstage/include/arch/io.h rename to src/soc/amd/common/psp_verstage/include/arch/io.h diff --git a/src/soc/amd/picasso/psp_verstage/include/arch/smp/spinlock.h b/src/soc/amd/common/psp_verstage/include/arch/smp/spinlock.h similarity index 100% rename from src/soc/amd/picasso/psp_verstage/include/arch/smp/spinlock.h rename to src/soc/amd/common/psp_verstage/include/arch/smp/spinlock.h diff --git a/src/soc/amd/picasso/psp_verstage/pmutil.c b/src/soc/amd/common/psp_verstage/pmutil.c similarity index 100% rename from src/soc/amd/picasso/psp_verstage/pmutil.c rename to src/soc/amd/common/psp_verstage/pmutil.c diff --git a/src/soc/amd/picasso/psp_verstage/post.c b/src/soc/amd/common/psp_verstage/post.c similarity index 100% rename from src/soc/amd/picasso/psp_verstage/post.c rename to src/soc/amd/common/psp_verstage/post.c diff --git a/src/soc/amd/picasso/psp_verstage/printk.c b/src/soc/amd/common/psp_verstage/printk.c similarity index 100% rename from src/soc/amd/picasso/psp_verstage/printk.c rename to src/soc/amd/common/psp_verstage/printk.c diff --git a/src/soc/amd/picasso/psp_verstage/psp.c b/src/soc/amd/common/psp_verstage/psp.c similarity index 100% rename from src/soc/amd/picasso/psp_verstage/psp.c rename to src/soc/amd/common/psp_verstage/psp.c diff --git a/src/soc/amd/picasso/psp_verstage/psp_verstage.c b/src/soc/amd/common/psp_verstage/psp_verstage.c similarity index 100% rename from src/soc/amd/picasso/psp_verstage/psp_verstage.c rename to src/soc/amd/common/psp_verstage/psp_verstage.c diff --git a/src/soc/amd/picasso/psp_verstage/psp_verstage.h b/src/soc/amd/common/psp_verstage/psp_verstage.h similarity index 100% rename from src/soc/amd/picasso/psp_verstage/psp_verstage.h rename to src/soc/amd/common/psp_verstage/psp_verstage.h diff --git a/src/soc/amd/picasso/psp_verstage/reset.c b/src/soc/amd/common/psp_verstage/reset.c similarity index 100% rename from src/soc/amd/picasso/psp_verstage/reset.c rename to src/soc/amd/common/psp_verstage/reset.c diff --git a/src/soc/amd/picasso/psp_verstage/svc.c b/src/soc/amd/common/psp_verstage/svc.c similarity index 100% rename from src/soc/amd/picasso/psp_verstage/svc.c rename to src/soc/amd/common/psp_verstage/svc.c diff --git a/src/soc/amd/picasso/psp_verstage/svc.h b/src/soc/amd/common/psp_verstage/svc.h similarity index 100% rename from src/soc/amd/picasso/psp_verstage/svc.h rename to src/soc/amd/common/psp_verstage/svc.h diff --git a/src/soc/amd/picasso/psp_verstage/timer.c b/src/soc/amd/common/psp_verstage/timer.c similarity index 100% rename from src/soc/amd/picasso/psp_verstage/timer.c rename to src/soc/amd/common/psp_verstage/timer.c diff --git a/src/soc/amd/picasso/psp_verstage/vboot_crypto.c b/src/soc/amd/common/psp_verstage/vboot_crypto.c similarity index 100% rename from src/soc/amd/picasso/psp_verstage/vboot_crypto.c rename to src/soc/amd/common/psp_verstage/vboot_crypto.c diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index b5a2934922..e8ee087b7b 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -7,6 +7,7 @@ subdirs-y += ../../../cpu/x86/cache subdirs-y += ../../../cpu/x86/mtrr subdirs-y += ../../../cpu/x86/pae subdirs-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += psp_verstage +subdirs-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += ../common/psp_verstage # Beware that all-y also adds the compilation unit to verstage on PSP all-y += config.c diff --git a/src/soc/amd/picasso/psp_verstage/Makefile.inc b/src/soc/amd/picasso/psp_verstage/Makefile.inc index 0986fd8750..e70360fa51 100644 --- a/src/soc/amd/picasso/psp_verstage/Makefile.inc +++ b/src/soc/amd/picasso/psp_verstage/Makefile.inc @@ -2,26 +2,6 @@ verstage-generic-ccopts += -I$(src)/soc/amd/picasso/psp_verstage/include verstage-generic-ccopts += -I$(src)/vendorcode/amd/fsp/picasso/include -verstage-generic-ccopts += -D__USER_SPACE__ -CPPFLAGS_common += -I$(VBOOT_SOURCE)/firmware/2lib/include/ - -# This size should match the size in the linker script. -CFLAGS_arm += -Wstack-usage=40960 - -verstage-y += delay.c -verstage-y += fch.c -verstage-y += pmutil.c -verstage-y += post.c -verstage-y += printk.c -verstage-y += psp_verstage.c -verstage-y += psp.c -verstage-y += reset.c -verstage-y += svc.c -verstage-y += timer.c -verstage-y += vboot_crypto.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 - -$(obj)/psp_verstage.bin: $(objcbfs)/verstage.elf - $(OBJCOPY_verstage) -O binary $^ $@