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
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47982 )
Change subject: soc/amd: move bootblock inside main SoC directories ......................................................................
Patch Set 1: Code-Review+1
I'm ok with this if it's what you want, but having the bootblock directory is pretty standard. While it might not be required, having the bootblock directory is pretty expected. Is there actually a reason to get rid of the bootblock directory?
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47982 )
Change subject: soc/amd: move bootblock inside main SoC directories ......................................................................
Patch Set 1:
Patch Set 1: Code-Review+1
I'm ok with this if it's what you want, but having the bootblock directory is pretty standard. While it might not be required, having the bootblock directory is pretty expected. Is there actually a reason to get rid of the bootblock directory?
I find that having a separate directory for only one file just adds clutter and no value and for example all chipsets in northbridge/intel have their bootblock directly in the main directory.
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47982 )
Change subject: soc/amd: move bootblock inside main SoC directories ......................................................................
Patch Set 1:
Patch Set 1:
Patch Set 1: Code-Review+1
I'm ok with this if it's what you want, but having the bootblock directory is pretty standard. While it might not be required, having the bootblock directory is pretty expected. Is there actually a reason to get rid of the bootblock directory?
I find that having a separate directory for only one file just adds clutter and no value and for example all chipsets in northbridge/intel have their bootblock directly in the main directory.
Also the other stages don't have separate directories, so this is a bit more consistent
Hello build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/47982
to look at the new patch set (#2).
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 to avoid clutter. This makes soc/amd more consistent with the coreboot code base in src/northbridge, src/southbridge and src/soc with the exception of src/soc/intel.
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/2
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47982 )
Change subject: soc/amd: move bootblock inside main SoC directories ......................................................................
Patch Set 1: Code-Review+2
I'm OK with it unless Martin's comment changed your mind. It looks like coreboot's soc directories are inconsistent. Some have bootblock/bootblock.c while others skip the extra directory. This is true even for Intel devices.
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47982 )
Change subject: soc/amd: move bootblock inside main SoC directories ......................................................................
Patch Set 2: Code-Review+2
Felix Held has submitted this change. ( 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 to avoid clutter. This makes soc/amd more consistent with the coreboot code base in src/northbridge, src/southbridge and src/soc with the exception of src/soc/intel.
Change-Id: I78a9ce1cd0d790250a66c82bb1d8aa6c3b4f7162 Signed-off-by: Felix Held felix-coreboot@felixheld.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/47982 Reviewed-by: Marshall Dawson marshalldawson3rd@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- 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(-)
Approvals: build bot (Jenkins): Verified Marshall Dawson: Looks good to me, approved
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
-
Felix Held (Code Review) -
Marshall Dawson (Code Review)
-
Martin Roth (Code Review)