diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2022-09-20 08:46:43 +0000 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2022-09-20 10:41:36 +0000 |
| commit | f37146de3239b6d27852cfbc2024e28816cf6d56 (patch) | |
| tree | 377b310935ba178fc8e46c03b701306401a079cc | |
| parent | e36205daf81efc1996495b1deaf84e6ad121049f (diff) | |
Revert "mb/prodrive/hermes: Add part numbers to SMBIOS"
This reverts commit d6695626631a86d9613ea7c34ff0e898fbfa443c.
Reason for revert: Was submitted out-of-order and with an unresolved
TODO in the commit message.
Change-Id: Id5a8770226afbfcdf63d451157e4586b6cdd5189
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67284
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/mainboard/prodrive/hermes/eeprom.h | 5 | ||||
| -rw-r--r-- | src/mainboard/prodrive/hermes/mainboard.c | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/mainboard/prodrive/hermes/eeprom.h b/src/mainboard/prodrive/hermes/eeprom.h index ac127806bf..2f7eac7253 100644 --- a/src/mainboard/prodrive/hermes/eeprom.h +++ b/src/mainboard/prodrive/hermes/eeprom.h @@ -86,10 +86,7 @@ struct __packed eeprom_layout { }; char system_serial_number[HERMES_SERIAL_NUMBER_LENGTH]; char board_serial_number[HERMES_SERIAL_NUMBER_LENGTH]; - uint8_t boot_order[0x200]; - char board_part_number[HERMES_SERIAL_NUMBER_LENGTH]; - char product_part_number[HERMES_SERIAL_NUMBER_LENGTH]; - uint8_t unused[0x680]; + uint8_t boot_order[0x8c0]; union { uint8_t raw_board_settings[0xf8]; struct eeprom_board_settings board_settings; diff --git a/src/mainboard/prodrive/hermes/mainboard.c b/src/mainboard/prodrive/hermes/mainboard.c index bf568abf54..2f0de61843 100644 --- a/src/mainboard/prodrive/hermes/mainboard.c +++ b/src/mainboard/prodrive/hermes/mainboard.c @@ -174,12 +174,6 @@ static void mainboard_final(struct device *dev) pmc_soc_set_afterg3_en(on); } -static void mainboard_smbios_strings(struct device *dev, struct smbios_type11 *t) -{ - t->count = smbios_add_string(t->eos, eeprom_read_serial(board_part_number, "N/A")); - t->count = smbios_add_string(t->eos, eeprom_read_serial(product_part_number, "N/A")); -} - #if CONFIG(HAVE_ACPI_TABLES) static void mainboard_acpi_fill_ssdt(const struct device *dev) { @@ -225,7 +219,6 @@ static void mainboard_enable(struct device *dev) mb_usb2_fp2_pwr_enable(1); dev->ops->final = mainboard_final; - dev->ops->get_smbios_strings = mainboard_smbios_strings; #if CONFIG(HAVE_ACPI_TABLES) dev->ops->acpi_fill_ssdt = mainboard_acpi_fill_ssdt; |