commit 84e77a3d5f56b5c3a475ab0c0cd10e18b0cd6344
author Edward O'Callaghan <quasisec@google.com> Wed Oct 28 03:08:07 2020
committer Commit Bot <commit-bot@chromium.org> Thu Oct 29 14:53:29 2020
tree b7cf565465646b772a7cb142386fa3a7a66fc842
parent c531fe7129a862e9b8a6ce8824ae884462686658

Makefile: Switch to internal dmi implementation

Align with upstreams selection of DMI implementation.

BUG=b:171014265
BRANCH=none
TEST=builds

Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Change-Id: If079e0d2faeeda9f4989b39368560c7ae44dcb93
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/2504535
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>

Makefile

diff --git a/Makefile b/Makefile
index ca6b4b4..8f6ab1e 100644
--- a/Makefile
+++ b/Makefile
@@ -667,6 +667,10 @@
 endif
 endif
 
+# Use internal DMI/SMBIOS decoder by default instead of relying on dmidecode.
+CONFIG_INTERNAL_DMI ?= yes
+
+###############################################################################
 # Programmer drivers and programmer support infrastructure.
 # Depending on the CONFIG_* variables set and verified above we set compiler flags and parameters below.
 
@@ -675,10 +679,14 @@
 
 ifeq ($(CONFIG_INTERNAL), yes)
 FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1'
-PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o dmi.o internal.o
-ifeq ($(ARCH),x86)
+PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o internal.o
+ifeq ($(ARCH), x86)
 PROGRAMMER_OBJS += it87spi.o it85spi.o sb600spi.o wbsio_spi.o mcp6x_spi.o wpce775x.o
-PROGRAMMER_OBJS += ichspi.o ich_descriptors.o amd_imc.o
+PROGRAMMER_OBJS += ich_descriptors.o amd_imc.o
+PROGRAMMER_OBJS += ichspi.o dmi.o
+ifeq ($(CONFIG_INTERNAL_DMI), yes)
+FEATURE_CFLAGS += -D'CONFIG_INTERNAL_DMI=1'
+endif
 else
 endif
 NEED_LIBPCI += CONFIG_INTERNAL