diff options
| author | Stefano Babic <sbabic@denx.de> | 2016-06-18 10:24:54 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-06-18 10:25:13 +0200 |
| commit | dc557e9a1fe00ca9d884bd88feef5bebf23fede4 (patch) | |
| tree | ec09fdf8f7c4c44e30f4b38b7459a2cbbb71d094 /arch/x86/lib/smbios.c | |
| parent | d2ba7a6adcef6e6f8c4418c7b0caf9d7ab98a6d4 (diff) | |
| parent | 6b3943f1b04be60f147ee540fbd72c4c7ea89f80 (diff) | |
| download | u-boot-dc557e9a1fe00ca9d884bd88feef5bebf23fede4.tar.gz u-boot-dc557e9a1fe00ca9d884bd88feef5bebf23fede4.tar.xz u-boot-dc557e9a1fe00ca9d884bd88feef5bebf23fede4.zip | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/x86/lib/smbios.c')
| -rw-r--r-- | arch/x86/lib/smbios.c | 10 |
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; |