Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47982 )
Change subject: soc/amd: move bootblock inside main SoC directories ......................................................................
soc/amd: move bootblock inside main SoC directories
There's no need to have the bootblock in its own sub-directory, so move it to each SoC's main directory.
Change-Id: I78a9ce1cd0d790250a66c82bb1d8aa6c3b4f7162 Signed-off-by: Felix Held felix-coreboot@felixheld.de --- M src/soc/amd/picasso/Makefile.inc R src/soc/amd/picasso/bootblock.c M src/soc/amd/stoneyridge/Makefile.inc R src/soc/amd/stoneyridge/bootblock.c 4 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/47982/1
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index f010c7b..b5e409b 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -11,7 +11,7 @@ subdirs-y += ../../../cpu/x86/smm subdirs-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += psp_verstage
-bootblock-y += bootblock/bootblock.c +bootblock-y += bootblock.c bootblock-y += aoac.c bootblock-y += southbridge.c bootblock-y += i2c.c diff --git a/src/soc/amd/picasso/bootblock/bootblock.c b/src/soc/amd/picasso/bootblock.c similarity index 100% rename from src/soc/amd/picasso/bootblock/bootblock.c rename to src/soc/amd/picasso/bootblock.c diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc index 311ea68..8cdf6cc 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -12,7 +12,7 @@
bootblock-$(CONFIG_STONEYRIDGE_UART) += uart.c bootblock-y += BiosCallOuts.c -bootblock-y += bootblock/bootblock.c +bootblock-y += bootblock.c bootblock-y += gpio.c bootblock-y += i2c.c bootblock-y += enable_usbdebug.c diff --git a/src/soc/amd/stoneyridge/bootblock/bootblock.c b/src/soc/amd/stoneyridge/bootblock.c similarity index 100% rename from src/soc/amd/stoneyridge/bootblock/bootblock.c rename to src/soc/amd/stoneyridge/bootblock.c