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/mainboard | |
| parent | f574c3305a0db9ba85c257222e03a08455476091 (diff) | |
| download | coreboot-b78e4620375cc5668db668d900340fd89271c330.tar.gz coreboot-b78e4620375cc5668db668d900340fd89271c330.tar.bz2 coreboot-b78e4620375cc5668db668d900340fd89271c330.zip | |
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/mainboard')
| -rw-r--r-- | src/mainboard/emulation/qemu-i440fx/northbridge.c | 7 | ||||
| -rw-r--r-- | src/mainboard/google/kukui/mainboard.c | 3 | ||||
| -rw-r--r-- | src/mainboard/msi/ms7d25/mainboard.c | 3 | ||||
| -rw-r--r-- | src/mainboard/pcengines/apu2/mainboard.c | 3 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c index 56693c35787d..5d24c5ba7f20 100644 --- a/src/mainboard/emulation/qemu-i440fx/northbridge.c +++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c @@ -1,14 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <arch/io.h> +#include <arch/ioapic.h> #include <console/console.h> #include <cpu/cpu.h> #include <cpu/x86/lapic_def.h> #include <cpu/x86/mp.h> -#include <arch/io.h> #include <device/pci_def.h> #include <device/pci_ops.h> -#include <arch/ioapic.h> #include <device/device.h> +#include <identity.h> #include <stdlib.h> #include <smbios.h> #include <types.h> @@ -191,7 +192,7 @@ static int qemu_get_smbios_data17(int handle, int parent_handle, unsigned long * t->type_detail = MEMORY_TYPE_DETAIL_SYNCHRONOUS; t->speed = 200; t->clock_speed = 200; - t->manufacturer = smbios_add_string(t->eos, CONFIG_MAINBOARD_VENDOR); + t->manufacturer = smbios_add_string(t->eos, mainboard_vendor); const int len = smbios_full_table_len(&t->header, t->eos); *current += len; diff --git a/src/mainboard/google/kukui/mainboard.c b/src/mainboard/google/kukui/mainboard.c index e1c50f4a375f..69047fa4a22a 100644 --- a/src/mainboard/google/kukui/mainboard.c +++ b/src/mainboard/google/kukui/mainboard.c @@ -11,6 +11,7 @@ #include <edid.h> #include <framebuffer_info.h> #include <gpio.h> +#include <identity.h> #include <soc/bl31.h> #include <soc/ddp.h> #include <soc/dsi.h> @@ -65,7 +66,7 @@ static void configure_ec(void) struct panel_description __weak *get_panel_description(int panel_id) { printk(BIOS_ERR, "%s: ERROR: No panels defined for board: %s.\n", - __func__, CONFIG_MAINBOARD_PART_NUMBER); + __func__, mainboard_part_number); return NULL; } diff --git a/src/mainboard/msi/ms7d25/mainboard.c b/src/mainboard/msi/ms7d25/mainboard.c index 539f897e7a79..ee781d585620 100644 --- a/src/mainboard/msi/ms7d25/mainboard.c +++ b/src/mainboard/msi/ms7d25/mainboard.c @@ -2,6 +2,7 @@ #include <acpi/acpi.h> #include <device/device.h> +#include <identity.h> #include <soc/pci_devs.h> #include <soc/ramstage.h> #include <smbios.h> @@ -49,7 +50,7 @@ const char *smbios_mainboard_product_name(void) return "PRO Z690-A (MS-7D25)"; } - return CONFIG_MAINBOARD_PART_NUMBER; + return mainboard_part_number; } /* Only baseboard serial number is populated */ diff --git a/src/mainboard/pcengines/apu2/mainboard.c b/src/mainboard/pcengines/apu2/mainboard.c index 9371ee92909c..ab9156f082c2 100644 --- a/src/mainboard/pcengines/apu2/mainboard.c +++ b/src/mainboard/pcengines/apu2/mainboard.c @@ -7,6 +7,7 @@ #include <device/device.h> #include <device/pci_def.h> #include <gpio.h> +#include <identity.h> #include <southbridge/amd/pi/hudson/hudson.h> #include <southbridge/amd/pi/hudson/pci_devs.h> #include <southbridge/amd/pi/hudson/amd_pci_int_defs.h> @@ -226,7 +227,7 @@ static int mainboard_smbios_data(struct device *dev, int *handle, static void mainboard_enable(struct device *dev) { /* Maintain this text unchanged for manufacture process. */ - printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); + printk(BIOS_INFO, "Mainboard %s Enable.\n", mainboard_part_number); config_gpio_mux(); |