diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2022-12-15 22:12:29 +0200 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2023-05-05 13:56:34 +0000 |
commit | b78e4620375cc5668db668d900340fd89271c330 (patch) | |
tree | b951932efcd181807e749640af9ef546f68ea020 /src/arch/x86 | |
parent | f574c3305a0db9ba85c257222e03a08455476091 (diff) |
Convert literal uses of CONFIG_MAINBOARD_{VENDOR,PART_NUMBER}
Only expand these strings in lib/identity.o.
Change-Id: I8732bbeff8cf8a757bf32fdb615b1d0f97584585
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74907
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/arch/x86')
-rw-r--r-- | src/arch/x86/mpspec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/arch/x86/mpspec.c b/src/arch/x86/mpspec.c index cbf67438c4..64712c7800 100644 --- a/src/arch/x86/mpspec.c +++ b/src/arch/x86/mpspec.c @@ -9,6 +9,7 @@ #include <device/device.h> #include <device/path.h> #include <device/pci_ids.h> +#include <identity.h> #include <stdint.h> #include <string.h> @@ -33,16 +34,16 @@ void mptable_init(struct mp_config_table *mc) mc->mpe_checksum = 0; mc->reserved = 0; - strncpy(mc->mpc_oem, CONFIG_MAINBOARD_VENDOR, 8); - strncpy(mc->mpc_productid, CONFIG_MAINBOARD_PART_NUMBER, 12); + strncpy(mc->mpc_oem, mainboard_vendor, 8); + strncpy(mc->mpc_productid, mainboard_part_number, 12); /* * The oem/productid fields are exactly 8/12 bytes long. If the resp. * entry is shorter, the remaining bytes are filled with spaces. */ - for (i = MIN(strlen(CONFIG_MAINBOARD_VENDOR), 8); i < 8; i++) + for (i = MIN(strlen(mainboard_vendor), 8); i < 8; i++) mc->mpc_oem[i] = ' '; - for (i = MIN(strlen(CONFIG_MAINBOARD_PART_NUMBER), 12); i < 12; i++) + for (i = MIN(strlen(mainboard_part_number), 12); i < 12; i++) mc->mpc_productid[i] = ' '; } |