Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 13:43:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

smbios: smbios.h should not import ofnode.h

Browse source 
The smbios.h include does not use any definitions from ofnode.h.
So don't include it.

As DECLARE_GLOBAL_DATA_PTR is no longer defined via dm/of.h we need to
add it to efi_smbios.c.

Add now missing includes to smbios-parser.c.

Remove a superfluous check comparing the sizes of the SMBIOS 2.1 and SMBIOS
3.0 anchors.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Heinrich Schuchardt 2024-01-03 09:07:20 +01:00
parent 1b6228f28d
commit efe441a0a3
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/smbios.h
View file

@ -8,7 +8,7 @@
#ifndef _SMBIOS_H_ #ifndef _SMBIOS_H_
#define _SMBIOS_H_ #define _SMBIOS_H_
#include <dm/ofnode.h> #include <linux/types.h>
/* SMBIOS spec version implemented */ /* SMBIOS spec version implemented */
#define SMBIOS_MAJOR_VER 3 #define SMBIOS_MAJOR_VER 3
@ -80,10 +80,6 @@ struct __packed smbios3_entry {
u64 struct_table_address; u64 struct_table_address;
}; };
/* These two structures should use the same amount of 16-byte-aligned space */
static_assert(ALIGN(16, sizeof(struct smbios_entry)) ==
ALIGN(16, sizeof(struct smbios3_entry)));
/* BIOS characteristics */ /* BIOS characteristics */
#define BIOS_CHARACTERISTICS_PCI_SUPPORTED (1 << 7) #define BIOS_CHARACTERISTICS_PCI_SUPPORTED (1 << 7)
#define BIOS_CHARACTERISTICS_UPGRADEABLE (1 << 11) #define BIOS_CHARACTERISTICS_UPGRADEABLE (1 << 11)

3
lib/efi_loader/efi_smbios.c
View file

@ -13,6 +13,9 @@
#include <mapmem.h> #include <mapmem.h>
#include <smbios.h> #include <smbios.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <asm/global_data.h>
DECLARE_GLOBAL_DATA_PTR;
const efi_guid_t smbios3_guid = SMBIOS3_TABLE_GUID; const efi_guid_t smbios3_guid = SMBIOS3_TABLE_GUID;

3
lib/smbios-parser.c
View file

@ -5,8 +5,11 @@
#define LOG_CATEGORY LOGC_BOOT #define LOG_CATEGORY LOGC_BOOT
#include <errno.h>
#include <smbios.h> #include <smbios.h>
#include <string.h>
#include <tables_csum.h> #include <tables_csum.h>
#include <linux/kernel.h>
const struct smbios_entry *smbios_entry(u64 address, u32 size) const struct smbios_entry *smbios_entry(u64 address, u32 size)
{ {