commit 5e5c1daae93c6ab978f8688153fa642365098e56
author Patrick Rudolph <patrick.rudolph@9elements.com> Tue Nov 30 13:56:07 2021 +0100
committer Felix Held <felix-coreboot@felixheld.de> Tue Jan 31 15:26:16 2023 +0000
tree 23d08a6158572a34cc863eea6c09a238f256670a
parent 6c88e6ee55ff9bf0ea994c9664421c746e561a9d

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>

src/console/init.c

diff --git a/src/console/init.c b/src/console/init.c
index dd7f8311..8918dcf 100644
--- a/src/console/init.c
+++ b/src/console/init.c
@@ -63,6 +63,6 @@
 	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());
 }

src/include/rules.h

diff --git a/src/include/rules.h b/src/include/rules.h
index de33a78..ae8118e 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