Attention is currently required from: Fred Reitberger, Jason Glenesk, Matt DeVillier.
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80220?usp=email )
Change subject: soc/amd/common/include/acpi: add missing device/device.h include
......................................................................
soc/amd/common/include/acpi: add missing device/device.h include
The southbridge_write_acpi_tables function uses a struct device type
parameter, but device/device.h that provides the definition wasn't
included.
Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de>
Change-Id: I5245fa132ec9b84bbc483a31788bcd6fac0736e1
---
M src/soc/amd/common/block/include/amdblocks/acpi.h
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/80220/1
diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h
index 84e3e0c..f02dbe2 100644
--- a/src/soc/amd/common/block/include/amdblocks/acpi.h
+++ b/src/soc/amd/common/block/include/amdblocks/acpi.h
@@ -5,6 +5,7 @@
#include <acpi/acpi.h>
#include <amdblocks/gpio.h>
+#include <device/device.h>
#include <types.h>
/* ACPI MMIO registers 0xfed80800 */
--
To view, visit https://review.coreboot.org/c/coreboot/+/80220?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I5245fa132ec9b84bbc483a31788bcd6fac0736e1
Gerrit-Change-Number: 80220
Gerrit-PatchSet: 1
Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com>
Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com>
Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com>
Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com>
Gerrit-MessageType: newchange
Attention is currently required from: Fred Reitberger, Jason Glenesk, Matt DeVillier.
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80219?usp=email )
Change subject: soc/amd/common/fsp: use expected types for add_agesa_fsp_acpi_table
......................................................................
soc/amd/common/fsp: use expected types for add_agesa_fsp_acpi_table
add_agesa_fsp_acpi_table should use the same type for the 'current'
parameter and return value as the calling soc_acpi_write_tables does.
Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de>
Change-Id: Ie9f770b1d847ea28e4dbd96298a723d794b91a02
---
M src/soc/amd/common/block/include/amdblocks/acpi.h
M src/soc/amd/common/fsp/fsp-acpi.c
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/80219/1
diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h
index a195371..84e3e0c 100644
--- a/src/soc/amd/common/block/include/amdblocks/acpi.h
+++ b/src/soc/amd/common/block/include/amdblocks/acpi.h
@@ -52,8 +52,8 @@
unsigned long southbridge_write_acpi_tables(const struct device *device, unsigned long current,
struct acpi_rsdp *rsdp);
-uintptr_t add_agesa_fsp_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp,
- uintptr_t current);
+unsigned long add_agesa_fsp_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp,
+ unsigned long current);
void acpi_log_events(const struct chipset_power_state *ps);
unsigned long acpi_add_ivrs_table(unsigned long current, acpi_rsdp_t *rsdp);
diff --git a/src/soc/amd/common/fsp/fsp-acpi.c b/src/soc/amd/common/fsp/fsp-acpi.c
index 8ddf7d4..6c65b3e 100644
--- a/src/soc/amd/common/fsp/fsp-acpi.c
+++ b/src/soc/amd/common/fsp/fsp-acpi.c
@@ -15,8 +15,8 @@
uint16_t hob_payload[0xffc8]; /* maximum payload size */
} __packed;
-uintptr_t add_agesa_fsp_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp,
- uintptr_t current)
+unsigned long add_agesa_fsp_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp,
+ unsigned long current)
{
const struct amd_fsp_acpi_hob_info *data;
void *table = (void *)current;
--
To view, visit https://review.coreboot.org/c/coreboot/+/80219?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ie9f770b1d847ea28e4dbd96298a723d794b91a02
Gerrit-Change-Number: 80219
Gerrit-PatchSet: 1
Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com>
Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com>
Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com>
Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com>
Gerrit-MessageType: newchange
Attention is currently required from: Arthur Heymans, Christian Walter, Felix Held, Jincheng Li, Johnny Lin, Patrick Rudolph, Shuo Liu, Tim Chu.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80210?usp=email )
Change subject: device: Add a helper function to add a downstream bus
......................................................................
Patch Set 3: Code-Review+1
--
To view, visit https://review.coreboot.org/c/coreboot/+/80210?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ic898189b92997b93304fcbf47c73e2bb5ec09023
Gerrit-Change-Number: 80210
Gerrit-PatchSet: 3
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Jincheng Li <jincheng.li(a)intel.com>
Gerrit-Reviewer: Johnny Lin <Johnny_Lin(a)wiwynn.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Shuo Liu <shuo.liu(a)intel.com>
Gerrit-Reviewer: Tim Chu <Tim.Chu(a)quantatw.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Lean Sheng Tan <sheng.tan(a)9elements.com>
Gerrit-Attention: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Attention: Johnny Lin <Johnny_Lin(a)wiwynn.com>
Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Attention: Shuo Liu <shuo.liu(a)intel.com>
Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Attention: Jincheng Li <jincheng.li(a)intel.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Attention: Tim Chu <Tim.Chu(a)quantatw.com>
Gerrit-Comment-Date: Fri, 26 Jan 2024 14:42:58 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Cliff Huang, David Ruth, Lance Zhao, Paul Menzel, Subrata Banik, Subrata Banik, Tim Wawrzynczak.
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80170?usp=email )
Change subject: Add MTCL function to ACPI SSDT tables
......................................................................
Patch Set 8: Code-Review+1
(2 comments)
File src/drivers/wifi/generic/mtcl.c:
https://review.coreboot.org/c/coreboot/+/80170/comment/d04e70f2_0d47f494 :
PS8, Line 52: cbfs_map(WIFI_MTCL_CBFS_DEFAULT_FILENAME, &mtcl_bin_len);
Why not use this pointer instead of having the caller provide a buffer (which may be too small btw). You'd have to unmap later after ACPI generation, but can skip the copying.
File src/include/mtcl.h:
https://review.coreboot.org/c/coreboot/+/80170/comment/18f0665c_3d82997b :
PS8, Line 21: __packed
Not necessary as all entries are u8?
--
To view, visit https://review.coreboot.org/c/coreboot/+/80170?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I9b5e7312a44e114270e664b983626faa6cfee350
Gerrit-Change-Number: 80170
Gerrit-PatchSet: 8
Gerrit-Owner: David Ruth <druth(a)chromium.org>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Cliff Huang <cliff.huang(a)intel.com>
Gerrit-Reviewer: Lance Zhao <lance.zhao(a)gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-CC: Subrata Banik <subi.banik(a)gmail.com>
Gerrit-Attention: Lance Zhao <lance.zhao(a)gmail.com>
Gerrit-Attention: Subrata Banik <subi.banik(a)gmail.com>
Gerrit-Attention: Cliff Huang <cliff.huang(a)intel.com>
Gerrit-Attention: David Ruth <druth(a)chromium.org>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com>
Gerrit-Comment-Date: Fri, 26 Jan 2024 14:36:22 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Cliff Huang, David Ruth, Lance Zhao, Paul Menzel, Subrata Banik, Subrata Banik, Tim Wawrzynczak.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80170?usp=email )
Change subject: Add MTCL function to ACPI SSDT tables
......................................................................
Patch Set 8: Code-Review+1
(5 comments)
Patchset:
PS6:
> My answer applied to the data that is being stored in coreboot. […]
First of all, don't worry about this comment. I'm merely curious. If you think
it's taking too much of your time, please ignore it.
The reason I ask is because I looked into the kernel driver and know too much
already: There are three things coming together when the driver gets loaded:
1. driver code itself, obviously,
2. the information queried from ACPI, which your patch adds,
3. a firmware binary, I assume that gets loaded into the wifi chip.
So there are three places where this country list could be stored, all
available at the same time. But somebody picked ACPI for it and that
usually has a reason. Thought you might know it.
ACPI usually describes hardware, not countries. So this would only make
sense if the country list is actually derived from some hardware setting
(e.g. straps or registers configured by coreboot). Do you happen to know
if the CBFS files you're going to add are specific to the board design or
is it just "the file Mediatek provides us"?
File src/acpi/acpigen.c:
https://review.coreboot.org/c/coreboot/+/80170/comment/2723e204_b1ad1812 :
PS8, Line 1940: * Generate ACPI AML code for MTCL method.
Looking around, it seems there really are only standardized things
in this file. If MTCL means what I think, in particular MT = Mediatek,
it might be better to move it or maybe write a more generalized version,
e.g.
```
void acpigen_write_buffer_as_int_package(const char *name, uint8_t *, size_t)
```
Don't know if this would be useful for any other use-case, though. It
looks much like somebody confused `Buffer()` and `Package()` and now
Mediatek is stuck with it.
https://review.coreboot.org/c/coreboot/+/80170/comment/770e28a2_89458e92 :
PS8, Line 1953: * }
You could achieve the same with
```
Name (MTCL, Package()
{
// data
}
```
i.e. without a method. In ACPI it's all just objects that evaluate to
something. And that something has to be of the correct type. But what
the actual object (named or method) is, doesn't really matter.
File src/drivers/wifi/generic/acpi.c:
https://review.coreboot.org/c/coreboot/+/80170/comment/027f36d8_3dba4596 :
PS6, Line 592: uint8_t mtcl_package[sizeof(struct wifi_mtcl)];
> Addressing the organization of the code (and updated the commit message to hopefully make what I'm t […]
Thanks for moving. I think everything is in a good place now.
File src/vendorcode/google/chromeos/mtcl.c:
https://review.coreboot.org/c/coreboot/+/80170/comment/98597b9d_cb864cac :
PS6, Line 59: if (mtcl_bin_len != sizeof(struct wifi_mtcl)) {
> and keep them localized to this file.
You didn't, though. There's a `struct wifi_mtcl` at the calling site, even
if it's just for a `sizeof()`. And that can make readers stumble. Upstream
code is more often read than changed.
I don't want to bikeshed this, though. It just looked odd that both sites
knew the struct but it wasn't used in the signature, hence I asked.
--
To view, visit https://review.coreboot.org/c/coreboot/+/80170?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I9b5e7312a44e114270e664b983626faa6cfee350
Gerrit-Change-Number: 80170
Gerrit-PatchSet: 8
Gerrit-Owner: David Ruth <druth(a)chromium.org>
Gerrit-Reviewer: Cliff Huang <cliff.huang(a)intel.com>
Gerrit-Reviewer: Lance Zhao <lance.zhao(a)gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-CC: Subrata Banik <subi.banik(a)gmail.com>
Gerrit-Attention: Lance Zhao <lance.zhao(a)gmail.com>
Gerrit-Attention: Subrata Banik <subi.banik(a)gmail.com>
Gerrit-Attention: Cliff Huang <cliff.huang(a)intel.com>
Gerrit-Attention: David Ruth <druth(a)chromium.org>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com>
Gerrit-Comment-Date: Fri, 26 Jan 2024 14:15:54 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de>
Comment-In-Reply-To: David Ruth <druth(a)chromium.org>
Gerrit-MessageType: comment
Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80216?usp=email )
Change subject: util/ifdtool: Refactor GPR0 Unlock Implemetation
......................................................................
util/ifdtool: Refactor GPR0 Unlock Implemetation
This patch refactors GPR0 unlock function to add few important
logic as below
1. Perform GPR0 unlock if GPR0 is locked.
2. While unlocking dump the GPRD PCH strap details
3. Additionally, print the GPR start and end range if GPR0
protection is enabled.
TEST=Able to test GPR0 protection on google/rex and google/yahiko.
Exp 1: Trying to unlock GPR0 protection for a locked image
> ifdtool -p mtl -g image.bin -O image.bin_unlock
File image.bin is 33554432 bytes
Value at GPRD offset (64) is 0x83220004
--------- GPR0 Protected Range --------------
Start address = 0x00004000
End address = 0x00322fff
Writing new image to image.bin_unlock
Exp 2: Trying to unlock GPR0 protection for a unlocked image
> ifdtool -p mtl -g image.bin_unlock -O image.bin_unlock
File image.bin_unlock is 33554432 bytes
GPR0 protection is already disabled
Change-Id: Id35ebdefe83182ad7a3e735bdd2998baa0ec3ed7
Signed-off-by: Subrata Banik <subratabanik(a)google.com>
---
M util/ifdtool/ifdtool.c
1 file changed, 19 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/80216/1
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 191b321..07cc268 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -1577,10 +1577,28 @@
fprintf(stderr, "Disabling GPR0 not supported on this platform\n");
exit(EXIT_FAILURE);
}
+ /* If bit 31 is set then GPR0 protection is enable */
+ bool gpr0_status = fpsba->pchstrp[gpr0_offset] & 0x80000000;
+ if (!gpr0_status) {
+ printf("GPR0 protection is already disabled\n");
+ return;
+ }
+ printf("Value at GPRD offset (%d) is 0x%08x\n", gpr0_offset, fpsba->pchstrp[gpr0_offset]);
+ printf("--------- GPR0 Protected Range --------------\n");
+ /*
+ * Start Address: bit 0-15 of the GPRD represents the protected region start address,
+ * where bit 0-11 of the start address are assumed to be zero.
+ */
+ printf("Start address = 0x%08x\n", (fpsba->pchstrp[gpr0_offset] & 0xffff) << 12);
+ /*
+ * End Address: bit 16-30 of the GPRD represents the protected region end address,
+ * where bit 0-11 of the end address are assumed to be 0xfff.
+ */
+ printf("End address = 0x%08x\n",
+ ((fpsba->pchstrp[gpr0_offset] >> 16) & 0x7fff) << 12 | 0xfff);
/* 0 means GPR0 protection is disabled */
fpsba->pchstrp[gpr0_offset] = 0;
-
write_image(filename, image, size);
}
--
To view, visit https://review.coreboot.org/c/coreboot/+/80216?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Id35ebdefe83182ad7a3e735bdd2998baa0ec3ed7
Gerrit-Change-Number: 80216
Gerrit-PatchSet: 1
Gerrit-Owner: Subrata Banik <subratabanik(a)google.com>
Gerrit-MessageType: newchange
Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80128?usp=email )
Change subject: Documentation: Update Makefile .inc references to .mk
......................................................................
Documentation: Update Makefile .inc references to .mk
Signed-off-by: Martin Roth <gaumless(a)gmail.com>
Change-Id: I464170e60a22f39225044c6794d091455d931e9c
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80128
Reviewed-by: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Felix Held <felix-coreboot(a)felixheld.de>
---
M Documentation/getting_started/build_system.md
M Documentation/getting_started/kconfig.md
M Documentation/sbom/sbom.md
M Documentation/technotes/2020-03-unit-testing-coreboot.md
M Documentation/tutorial/part3.md
5 files changed, 13 insertions(+), 13 deletions(-)
Approvals:
Felix Singer: Looks good to me, approved
build bot (Jenkins): Verified
Felix Held: Looks good to me, approved
diff --git a/Documentation/getting_started/build_system.md b/Documentation/getting_started/build_system.md
index 4013bc6..35ed187 100644
--- a/Documentation/getting_started/build_system.md
+++ b/Documentation/getting_started/build_system.md
@@ -7,10 +7,10 @@
The overhead of learning this new syntax is (hopefully) offset by its lower
complexity.
-The build system is defined in the toplevel `Makefile` and `toolchain.inc`
+The build system is defined in the toplevel `Makefile` and `toolchain.mk`
and is supposed to be generic (and is in fact used with a number of other
projects). Project specific configuration should reside in files called
-`Makefile.inc`.
+`Makefile.mk`.
In general, the build system provides a number of "classes" that describe
various parts of the build. These cover the various build targets in coreboot
@@ -36,7 +36,7 @@
### subdirs
`subdirs` contains subdirectories (relative to the current directory) that
should also be handled by the build system. The build system expects these
-directories to contain a file called `Makefile.inc`.
+directories to contain a file called `Makefile.mk`.
Subdirectories are not read at the point where the `subdirs` statement
resides but later, after the current directory is handled (and potentially
@@ -66,7 +66,7 @@
You can use the `add_intermediate` helper to add new post-processing steps for
the final `coreboot.rom` image. For example you can add new files to CBFS by
-adding something like this to `site-local/Makefile.inc`
+adding something like this to `site-local/Makefile.mk`
```
$(call add_intermediate, add_mrc_data)
@@ -100,4 +100,4 @@
all files.
vboot provides its own implementation of `regions-for-file` that can be used
-as reference in `src/vboot/Makefile.inc`.
+as reference in `src/vboot/Makefile.mk`.
diff --git a/Documentation/getting_started/kconfig.md b/Documentation/getting_started/kconfig.md
index d40a4cc..ddd3276 100644
--- a/Documentation/getting_started/kconfig.md
+++ b/Documentation/getting_started/kconfig.md
@@ -963,7 +963,7 @@
for all of its symbols.
The coreboot makefile forces the config.h file to be included into all coreboot
-C files. This is done in Makefile.inc on the compiler command line using the
+C files. This is done in Makefile.mk on the compiler command line using the
“-include $(obj)/config.h” command line option.
Example of various symbol types in the config.h file:
diff --git a/Documentation/sbom/sbom.md b/Documentation/sbom/sbom.md
index c4984f9..654fe55 100644
--- a/Documentation/sbom/sbom.md
+++ b/Documentation/sbom/sbom.md
@@ -114,7 +114,7 @@
as part of your software's build process. For example in form of a
Makefile target.
-2. Change src/sbom/Makefile.inc (in order to know where to find the
+2. Change src/sbom/Makefile.mk (in order to know where to find the
CoSWID/SWID/uSWID file) as well as the Makefile in coreboot which
builds said software. For example for GRUB2 that could mean to add a
Makefile target in payloads/external/GRUB2/Makefile.
diff --git a/Documentation/technotes/2020-03-unit-testing-coreboot.md b/Documentation/technotes/2020-03-unit-testing-coreboot.md
index a4d283f..d95b1a0 100644
--- a/Documentation/technotes/2020-03-unit-testing-coreboot.md
+++ b/Documentation/technotes/2020-03-unit-testing-coreboot.md
@@ -247,13 +247,13 @@
│ ├── include
│ │ ├── mocks <- mock headers, which replace original headers
│ │
-│ ├── Makefile.inc <- top Makefile for unit tests subsystem
+│ ├── Makefile.mk <- top Makefile for unit tests subsystem
│ ├── lib
-│ │ ├── Makefile.inc
+│ │ ├── Makefile.mk
│ │ ├── string-test.c <- test code for src/lib/string.c
│ │ │
│ ├── device
-│ │ ├── Makefile.inc
+│ │ ├── Makefile.mk
│ ├── i2c-test.c
│
├── build
diff --git a/Documentation/tutorial/part3.md b/Documentation/tutorial/part3.md
index 39d6ed5..ec49637 100644
--- a/Documentation/tutorial/part3.md
+++ b/Documentation/tutorial/part3.md
@@ -96,8 +96,8 @@
be registered with the coreboot unit testing infrastructure.
```
-Every directory under `tests/` should contain a Makefile.inc, similar to
-what can be seen under the `src/`. Register a new test in Makefile.inc,
+Every directory under `tests/` should contain a Makefile.mk, similar to
+what can be seen under the `src/`. Register a new test in Makefile.mk,
by __appending__ test name to the `tests-y` variable.
```eval_rst
@@ -285,7 +285,7 @@
coreboot unit test infrastructure supports overriding of functions at
link time. This is as simple as adding a `name_of_function` to be
-mocked into <test_name>-mocks variable in Makefile.inc. The result is
+mocked into <test_name>-mocks variable in Makefile.mk. The result is
that the test's implementation of that function is called instead of
coreboot's.
--
To view, visit https://review.coreboot.org/c/coreboot/+/80128?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I464170e60a22f39225044c6794d091455d931e9c
Gerrit-Change-Number: 80128
Gerrit-PatchSet: 5
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: merged