aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Gmeiner <christian.gmeiner@gmail.com>2020-11-03 15:34:52 +0100
committerBin Meng <bmeng.cn@gmail.com>2020-11-05 14:58:45 +0800
commit43a218b65366e225297a20442b49d07129765f73 (patch)
tree5198252221b79b0fd5dfa224d8e26072d7fa9bbf
parent415eab0655a8bdfa07464e2b3f9724a198afc81f (diff)
downloadu-boot-43a218b65366e225297a20442b49d07129765f73.tar.gz
coreboot: make use of smbios parser
If u-boot gets used as coreboot payload it might be nice to get vendor, model and bios version from smbios. I am not sure about the output of all the read information. With qemu target for coreboot this could look this: CBFS: Found @ offset 14f40 size 3b188 Checking segment from ROM address 0xffc15178 Checking segment from ROM address 0xffc15194 Loading segment from ROM address 0xffc15178 code (compression=1) New segment dstaddr 0x01110000 memsize 0x889ef srcaddr 0xffc151b0 filesize 0x3b150 Loading Segment: addr: 0x01110000 memsz: 0x00000000000889ef filesz: 0x000000000003b150 using LZMA Loading segment from ROM address 0xffc15194 Entry Point 0x01110000 BS: BS_PAYLOAD_LOAD run times (exec / console): 77 / 1 ms Jumping to boot code at 0x01110000(0x07fa7000) U-Boot 2020.10-00536-g5dcf7cc590-dirty (Oct 07 2020 - 14:21:51 +0200) CPU: x86_64, vendor AMD, device 663h DRAM: 127.1 MiB MMC: Video: No video mode configured in coreboot! Video: No video mode configured in coreboot! Vendor: QEMU Model: Standard PC (i440FX + PIIX, 1996) Bios Version: 4.12-3152-g326a499f6f-dirty Net: e1000: 52:54:00:12:34:56 eth0: e1000#0 No working controllers found Finalizing coreboot Hit any key to stop autoboot: 0 Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
-rw-r--r--board/coreboot/coreboot/coreboot.c45
-rw-r--r--configs/coreboot_defconfig1
2 files changed, 46 insertions, 0 deletions
diff --git a/board/coreboot/coreboot/coreboot.c b/board/coreboot/coreboot/coreboot.c
index b791b82ef4..55aeced542 100644
--- a/board/coreboot/coreboot/coreboot.c
+++ b/board/coreboot/coreboot/coreboot.c
@@ -4,7 +4,9 @@
*/
#include <common.h>
+#include <asm/arch/sysinfo.h>
#include <init.h>
+#include <smbios.h>
int board_early_init_r(void)
{
@@ -16,3 +18,46 @@ int board_early_init_r(void)
return 0;
}
+
+#ifdef CONFIG_SMBIOS_PARSER
+int show_board_info(void)
+{
+ const struct smbios_entry *smbios = smbios_entry(lib_sysinfo.smbios_start, lib_sysinfo.smbios_size);
+
+ if (!smbios)
+ goto fallback;
+
+ const struct smbios_header *bios = smbios_header(smbios, SMBIOS_BIOS_INFORMATION);
+ const struct smbios_header *system = smbios_header(smbios, SMBIOS_SYSTEM_INFORMATION);
+ const struct smbios_type0 *t0 = (struct smbios_type0 *)bios;
+ const struct smbios_type1 *t1 = (struct smbios_type1 *)system;
+
+ if (!t0 || !t1)
+ goto fallback;
+
+ const char *bios_ver = smbios_string(bios, t0->bios_ver);
+ const char *model = smbios_string(system, t1->product_name);
+ const char *manufacturer = smbios_string(system, t1->manufacturer);
+
+ if (!model || !manufacturer || !bios_ver)
+ goto fallback;
+
+ printf("Vendor: %s\n", manufacturer);
+ printf("Model: %s\n", model);
+ printf("BIOS Version: %s\n", bios_ver);
+
+ return 0;
+
+fallback:
+#ifdef CONFIG_OF_CONTROL
+ DECLARE_GLOBAL_DATA_PTR;
+
+ model = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
+
+ if (model)
+ printf("Model: %s\n", model);
+#endif
+
+ return checkboard();
+}
+#endif
diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig
index 3249b2fb2f..501a20e790 100644
--- a/configs/coreboot_defconfig
+++ b/configs/coreboot_defconfig
@@ -43,3 +43,4 @@ CONFIG_SOUND=y
CONFIG_SOUND_I8254=y
CONFIG_CONSOLE_SCROLL_LINES=5
# CONFIG_GZIP is not set
+CONFIG_SMBIOS_PARSER=y