summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2016-05-22 01:45:38 -0700
committerBin Meng <bmeng.cn@gmail.com>2016-05-23 15:27:42 +0800
commit4cdce9f5b455195357fd7b5e89205888fe3115b8 (patch)
tree0e522cbb0fbab3289c3d0de6a98b571ea7e124c9 /arch/x86
parent5ce378cfcfc88284bd90cf8c02e473945aec9d35 (diff)
downloadblackbird-obmc-uboot-4cdce9f5b455195357fd7b5e89205888fe3115b8.tar.gz
blackbird-obmc-uboot-4cdce9f5b455195357fd7b5e89205888fe3115b8.zip
x86: Switch to use SMBIOS Kconfig options when writing SMBIOS tables
Make use of the newly added Kconfig options of board manufacturer and product name to write SMBIOS tables. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/lib/smbios.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/lib/smbios.c b/arch/x86/lib/smbios.c
index 441fca99f1..9f3055020b 100644
--- a/arch/x86/lib/smbios.c
+++ b/arch/x86/lib/smbios.c
@@ -105,8 +105,8 @@ static int smbios_write_type1(u32 *current, int handle)
memset(t, 0, sizeof(struct smbios_type1));
fill_smbios_header(t, SMBIOS_SYSTEM_INFORMATION, len, handle);
- t->manufacturer = smbios_add_string(t->eos, CONFIG_SYS_VENDOR);
- t->product_name = smbios_add_string(t->eos, CONFIG_SYS_BOARD);
+ t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
+ t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME);
len = t->length + smbios_string_table_len(t->eos);
*current += len;
@@ -121,8 +121,8 @@ static int smbios_write_type2(u32 *current, int handle)
memset(t, 0, sizeof(struct smbios_type2));
fill_smbios_header(t, SMBIOS_BOARD_INFORMATION, len, handle);
- t->manufacturer = smbios_add_string(t->eos, CONFIG_SYS_VENDOR);
- t->product_name = smbios_add_string(t->eos, CONFIG_SYS_BOARD);
+ t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
+ t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME);
t->feature_flags = SMBIOS_BOARD_FEATURE_HOSTING;
t->board_type = SMBIOS_BOARD_MOTHERBOARD;
@@ -139,7 +139,7 @@ static int smbios_write_type3(u32 *current, int handle)
memset(t, 0, sizeof(struct smbios_type3));
fill_smbios_header(t, SMBIOS_SYSTEM_ENCLOSURE, len, handle);
- t->manufacturer = smbios_add_string(t->eos, CONFIG_SYS_VENDOR);
+ t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
t->chassis_type = SMBIOS_ENCLOSURE_DESKTOP;
t->bootup_state = SMBIOS_STATE_SAFE;
t->power_supply_state = SMBIOS_STATE_SAFE;
OpenPOWER on IntegriCloud