Felix Singer submitted this change.

View Change

Approvals: Felix Held: Looks good to me, approved build bot (Jenkins): Verified Felix Singer: Looks good to me, approved
src, util: Update toolchain.inc references to .mk

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: Ieaf7894f49a90f562b164924cc025e3eab5a3f7f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80129
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
---
M src/arch/arm/include/arch/memlayout.h
M src/arch/arm64/include/arch/memlayout.h
M src/include/rules.h
M util/lint/lint-stable-003-whitespace
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/arch/arm/include/arch/memlayout.h b/src/arch/arm/include/arch/memlayout.h
index 1395e82..408443f 100644
--- a/src/arch/arm/include/arch/memlayout.h
+++ b/src/arch/arm/include/arch/memlayout.h
@@ -20,7 +20,7 @@
/* ARM stacks need 8-byte alignment and stay in one place through ramstage. */
#define STACK(addr, size) \
REGION(stack, addr, size, 8) \
- _ = ASSERT(size >= 2K, "stack should be >= 2K, see toolchain.inc");
+ _ = ASSERT(size >= 2K, "stack should be >= 2K, see toolchain.mk");

#define DMA_COHERENT(addr, size) \
REGION(dma_coherent, addr, size, SUPERPAGE_SIZE) \
diff --git a/src/arch/arm64/include/arch/memlayout.h b/src/arch/arm64/include/arch/memlayout.h
index a04033d..69e4731 100644
--- a/src/arch/arm64/include/arch/memlayout.h
+++ b/src/arch/arm64/include/arch/memlayout.h
@@ -22,7 +22,7 @@
/* ARM64 stacks need 16-byte alignment. */
#define STACK(addr, size) \
REGION(stack, addr, size, 16) \
- _ = ASSERT(size >= 2K, "stack should be >= 2K, see toolchain.inc");
+ _ = ASSERT(size >= 2K, "stack should be >= 2K, see toolchain.mk");

#define BL31(addr, size) \
REGION(bl31, addr, size, 4K) \
diff --git a/src/include/rules.h b/src/include/rules.h
index 17ef198..04b0a82 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -156,7 +156,7 @@
#define ENV_STRING "UNKNOWN"
#endif

-/* Define helpers about the current architecture, based on toolchain.inc. */
+/* Define helpers about the current architecture, based on toolchain.mk. */

#if defined(__ARCH_arm__)
#define ENV_ARM 1
diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace
index 4dd0260..b4e50f0 100755
--- a/util/lint/lint-stable-003-whitespace
+++ b/util/lint/lint-stable-003-whitespace
@@ -12,7 +12,7 @@
. "${LINTDIR}/helper_functions.sh"

EXCLUDELIST='^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage|^util/goswid|__pycache__|COPYING|LICENSE|README|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$|\.gif$|\.ttf$|\.woff$|\.png$|\.eot$|\.vbt$|\.ico$|\.md$|\.apcb$'
-INCLUDELIST="src util payloads Makefile* toolchain.inc tests"
+INCLUDELIST="src util payloads Makefile* toolchain.mk tests"

# shellcheck disable=SC2086,SC2046
if uname | grep -qi "linux"; then

To view, visit change 80129. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ieaf7894f49a90f562b164924cc025e3eab5a3f7f
Gerrit-Change-Number: 80129
Gerrit-PatchSet: 5
Gerrit-Owner: Martin L Roth <gaumless@gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot@felixheld.de>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Gerrit-Reviewer: Julius Werner <jwerner@chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged