aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2021-11-30 13:56:07 +0100
committerFelix Held <felix-coreboot@felixheld.de>2023-01-31 15:26:16 +0000
commit5e5c1daae93c6ab978f8688153fa642365098e56 (patch)
tree23d08a6158572a34cc863eea6c09a238f256670a
parent6c88e6ee55ff9bf0ea994c9664421c746e561a9d (diff)
console: Print architecture
Useful to see which architecture x86_32 or x86_64 coreboot was built for. Change-Id: I34eec64ac32254c270dcbb97e20a7e6be0f478fc Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/59761 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Jakub Czapiga <jacz@semihalf.com>
-rw-r--r--src/console/init.c2
-rw-r--r--src/include/rules.h7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/console/init.c b/src/console/init.c
index dd7f8311f3..8918dcff6d 100644
--- a/src/console/init.c
+++ b/src/console/init.c
@@ -63,6 +63,6 @@ void console_init(void)
if (ENV_BOOTBLOCK && CONFIG(CONSOLE_CBMEM_PRINT_PRE_BOOTBLOCK_CONTENTS))
cbmem_dump_console();
- printk(BIOS_NOTICE, "\n\ncoreboot-%s%s %s " ENV_STRING " starting (log level: %i)...\n",
+ printk(BIOS_NOTICE, "\n\ncoreboot-%s%s %s " ENV_ARCH " " ENV_STRING " starting (log level: %i)...\n",
coreboot_version, coreboot_extra_version, coreboot_build, get_log_level());
}
diff --git a/src/include/rules.h b/src/include/rules.h
index de33a7876c..ae8118ebb4 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -164,9 +164,11 @@
#if __COREBOOT_ARM_ARCH__ == 4
#define ENV_ARMV4 1
#define ENV_ARMV7 0
+#define ENV_ARCH "armv4"
#elif __COREBOOT_ARM_ARCH__ == 7
#define ENV_ARMV4 0
#define ENV_ARMV7 1
+#define ENV_ARCH "armv7"
#if defined(__COREBOOT_ARM_V7_A__)
#define ENV_ARMV7_A 1
#define ENV_ARMV7_M 0
@@ -204,6 +206,7 @@
#define ENV_X86 0
#define ENV_X86_32 0
#define ENV_X86_64 0
+#define ENV_ARCH "aarch64"
#elif defined(__ARCH_riscv__)
#define ENV_ARM 0
@@ -215,6 +218,7 @@
#define ENV_X86 0
#define ENV_X86_32 0
#define ENV_X86_64 0
+#define ENV_ARCH "riscv"
#elif defined(__ARCH_x86_32__)
#define ENV_ARM 0
@@ -226,6 +230,7 @@
#define ENV_X86 1
#define ENV_X86_32 1
#define ENV_X86_64 0
+#define ENV_ARCH "x86_32"
#elif defined(__ARCH_x86_64__)
#define ENV_ARM 0
@@ -237,6 +242,7 @@
#define ENV_X86 1
#define ENV_X86_32 0
#define ENV_X86_64 1
+#define ENV_ARCH "x86_64"
#else
#define ENV_ARM 0
@@ -248,6 +254,7 @@
#define ENV_X86 0
#define ENV_X86_32 0
#define ENV_X86_64 0
+#define ENV_ARCH "unknown"
#endif