GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Patrick Rudolph 2021-11-30 13:56:07 +01:00 committed by Felix Held
parent 6c88e6ee55
commit 5e5c1daae9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/console/init.c
View File

@ -63,6 +63,6 @@ void console_init(void)
if (ENV_BOOTBLOCK && CONFIG(CONSOLE_CBMEM_PRINT_PRE_BOOTBLOCK_CONTENTS)) if (ENV_BOOTBLOCK && CONFIG(CONSOLE_CBMEM_PRINT_PRE_BOOTBLOCK_CONTENTS))
cbmem_dump_console(); 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()); coreboot_version, coreboot_extra_version, coreboot_build, get_log_level());
} }

7
src/include/rules.h
View File

@ -164,9 +164,11 @@
#if __COREBOOT_ARM_ARCH__ == 4 #if __COREBOOT_ARM_ARCH__ == 4
#define ENV_ARMV4 1 #define ENV_ARMV4 1
#define ENV_ARMV7 0 #define ENV_ARMV7 0
#define ENV_ARCH "armv4"
#elif __COREBOOT_ARM_ARCH__ == 7 #elif __COREBOOT_ARM_ARCH__ == 7
#define ENV_ARMV4 0 #define ENV_ARMV4 0
#define ENV_ARMV7 1 #define ENV_ARMV7 1
#define ENV_ARCH "armv7"
#if defined(__COREBOOT_ARM_V7_A__) #if defined(__COREBOOT_ARM_V7_A__)
#define ENV_ARMV7_A 1 #define ENV_ARMV7_A 1
#define ENV_ARMV7_M 0 #define ENV_ARMV7_M 0
@ -204,6 +206,7 @@
#define ENV_X86 0 #define ENV_X86 0
#define ENV_X86_32 0 #define ENV_X86_32 0
#define ENV_X86_64 0 #define ENV_X86_64 0
#define ENV_ARCH "aarch64"
#elif defined(__ARCH_riscv__) #elif defined(__ARCH_riscv__)
#define ENV_ARM 0 #define ENV_ARM 0
@ -215,6 +218,7 @@
#define ENV_X86 0 #define ENV_X86 0
#define ENV_X86_32 0 #define ENV_X86_32 0
#define ENV_X86_64 0 #define ENV_X86_64 0
#define ENV_ARCH "riscv"
#elif defined(__ARCH_x86_32__) #elif defined(__ARCH_x86_32__)
#define ENV_ARM 0 #define ENV_ARM 0
@ -226,6 +230,7 @@
#define ENV_X86 1 #define ENV_X86 1
#define ENV_X86_32 1 #define ENV_X86_32 1
#define ENV_X86_64 0 #define ENV_X86_64 0
#define ENV_ARCH "x86_32"
#elif defined(__ARCH_x86_64__) #elif defined(__ARCH_x86_64__)
#define ENV_ARM 0 #define ENV_ARM 0
@ -237,6 +242,7 @@
#define ENV_X86 1 #define ENV_X86 1
#define ENV_X86_32 0 #define ENV_X86_32 0
#define ENV_X86_64 1 #define ENV_X86_64 1
#define ENV_ARCH "x86_64"
#else #else
#define ENV_ARM 0 #define ENV_ARM 0
@ -248,6 +254,7 @@
#define ENV_X86 0 #define ENV_X86 0
#define ENV_X86_32 0 #define ENV_X86_32 0
#define ENV_X86_64 0 #define ENV_X86_64 0
#define ENV_ARCH "unknown"
#endif #endif