From 84eb61c32c4ca3f01e17cb4a4e9287821646f5cb Mon Sep 17 00:00:00 2001 From: Felix Held Date: Mon, 23 Nov 2020 16:54:05 +0100 Subject: [PATCH] soc/amd: move assembly part of non-CAR bootblock to common directory There will be more files added to the common non-CAR Makefile.inc, so use an ifeq statement there. Change-Id: I1f71954d27fbf10725387a0e95bc57f5040024cc Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/47880 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/soc/amd/common/block/cpu/Makefile.inc | 1 + src/soc/amd/common/block/cpu/noncar/Makefile.inc | 1 + .../amd/{picasso/bootblock => common/block/cpu/noncar}/pre_c.S | 0 src/soc/amd/picasso/Makefile.inc | 1 - 4 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 src/soc/amd/common/block/cpu/noncar/Makefile.inc rename src/soc/amd/{picasso/bootblock => common/block/cpu/noncar}/pre_c.S (100%) diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.inc index df2ccfaa2e..6298f3b746 100644 --- a/src/soc/amd/common/block/cpu/Makefile.inc +++ b/src/soc/amd/common/block/cpu/Makefile.inc @@ -1 +1,2 @@ subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car +subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK_NONCAR) += noncar diff --git a/src/soc/amd/common/block/cpu/noncar/Makefile.inc b/src/soc/amd/common/block/cpu/noncar/Makefile.inc new file mode 100644 index 0000000000..d6b8b52711 --- /dev/null +++ b/src/soc/amd/common/block/cpu/noncar/Makefile.inc @@ -0,0 +1 @@ +bootblock-y += pre_c.S diff --git a/src/soc/amd/picasso/bootblock/pre_c.S b/src/soc/amd/common/block/cpu/noncar/pre_c.S similarity index 100% rename from src/soc/amd/picasso/bootblock/pre_c.S rename to src/soc/amd/common/block/cpu/noncar/pre_c.S diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 6ec4cd1151..5f4ab9bddb 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -11,7 +11,6 @@ subdirs-y += ../../../cpu/x86/pae subdirs-y += ../../../cpu/x86/smm subdirs-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += psp_verstage -bootblock-y += bootblock/pre_c.S bootblock-y += bootblock/bootblock.c bootblock-y += aoac.c bootblock-y += southbridge.c