Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 4cdce9f5b455195357fd7b5e89205888fe3115b8

Authored by Bin Meng
1 parent 5ce378cfcf
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

arch/x86/lib/smbios.c
Diff comments   View file @ 4cdce9f
... ... @@ -105,8 +105,8 @@
105 105  
106 106 memset(t, 0, sizeof(struct smbios_type1));
107 107 fill_smbios_header(t, SMBIOS_SYSTEM_INFORMATION, len, handle);
108   - t->manufacturer = smbios_add_string(t->eos, CONFIG_SYS_VENDOR);
109   - t->product_name = smbios_add_string(t->eos, CONFIG_SYS_BOARD);
  108 + t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
  109 + t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME);
110 110  
111 111 len = t->length + smbios_string_table_len(t->eos);
112 112 *current += len;
... ... @@ -121,8 +121,8 @@
121 121  
122 122 memset(t, 0, sizeof(struct smbios_type2));
123 123 fill_smbios_header(t, SMBIOS_BOARD_INFORMATION, len, handle);
124   - t->manufacturer = smbios_add_string(t->eos, CONFIG_SYS_VENDOR);
125   - t->product_name = smbios_add_string(t->eos, CONFIG_SYS_BOARD);
  124 + t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
  125 + t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME);
126 126 t->feature_flags = SMBIOS_BOARD_FEATURE_HOSTING;
127 127 t->board_type = SMBIOS_BOARD_MOTHERBOARD;
128 128  
... ... @@ -139,7 +139,7 @@
139 139  
140 140 memset(t, 0, sizeof(struct smbios_type3));
141 141 fill_smbios_header(t, SMBIOS_SYSTEM_ENCLOSURE, len, handle);
142   - t->manufacturer = smbios_add_string(t->eos, CONFIG_SYS_VENDOR);
  142 + t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
143 143 t->chassis_type = SMBIOS_ENCLOSURE_DESKTOP;
144 144 t->bootup_state = SMBIOS_STATE_SAFE;
145 145 t->power_supply_state = SMBIOS_STATE_SAFE;