Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86

- Add a new SMBIOS parser and enable it when booting from coreboot
- Fix up various driver names to avoid dtoc warnings
- Fully enable ACPI support on Google Chromebook Coral
- Add a way to set SMBIOS properties using the devicetree
- Update existing boards to use devicetree for SMBIOS using a new
  default sysinfo driver

4 files changed, 64 insertions, 60 deletions

diff --git a/test/dm/Makefile b/test/dm/Makefile
index 57e13ad533..46e076ed09 100644
--- a/test/dm/Makefile
+++ b/test/dm/Makefile
@@ -21,7 +21,6 @@ obj-$(CONFIG_ACPIGEN) += acpigen.o
 obj-$(CONFIG_ACPIGEN) += acpi_dp.o
 obj-$(CONFIG_SOUND) += audio.o
 obj-$(CONFIG_BLK) += blk.o
-obj-$(CONFIG_BOARD) += board.o
 obj-$(CONFIG_BUTTON) += button.o
 obj-$(CONFIG_DM_BOOTCOUNT) += bootcount.o
 obj-$(CONFIG_CLK) += clk.o clk_ccf.o
@@ -78,6 +77,7 @@ obj-$(CONFIG_DM_SERIAL) += serial.o
 obj-$(CONFIG_CPU) += cpu.o
 obj-$(CONFIG_SOC_DEVICE) += soc.o
 obj-$(CONFIG_SOUND) += sound.o
+obj-$(CONFIG_SYSINFO) += sysinfo.o
 obj-$(CONFIG_TEE) += tee.o
 obj-$(CONFIG_VIRTIO_SANDBOX) += virtio.o
 obj-$(CONFIG_DMA) += dma.o
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index 1f252a8d45..f5eddac10d 100644
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -477,6 +477,7 @@ static int dm_test_acpi_fill_ssdt(struct unit_test_state *uts)
 	buf = malloc(BUF_SIZE);
 	ut_assertnonnull(buf);
 
+	acpi_reset_items();
 	ctx.current = buf;
 	buf[4] = 'z';	/* sentinel */
 	ut_assertok(acpi_fill_ssdt(&ctx));
@@ -507,6 +508,7 @@ static int dm_test_acpi_inject_dsdt(struct unit_test_state *uts)
 	buf = malloc(BUF_SIZE);
 	ut_assertnonnull(buf);
 
+	acpi_reset_items();
 	ctx.current = buf;
 	buf[4] = 'z';	/* sentinel */
 	ut_assertok(acpi_inject_dsdt(&ctx));
@@ -537,6 +539,7 @@ static int dm_test_acpi_cmd_items(struct unit_test_state *uts)
 	buf = malloc(BUF_SIZE);
 	ut_assertnonnull(buf);
 
+	acpi_reset_items();
 	ctx.current = buf;
 	ut_assertok(acpi_fill_ssdt(&ctx));
 	console_record_reset();
@@ -545,6 +548,7 @@ static int dm_test_acpi_cmd_items(struct unit_test_state *uts)
 	ut_assert_nextline("dev 'acpi-test2', type 1, size 2");
 	ut_assert_console_end();
 
+	acpi_reset_items();
 	ctx.current = buf;
 	ut_assertok(acpi_inject_dsdt(&ctx));
 	console_record_reset();
diff --git a/test/dm/board.c b/test/dm/board.c
deleted file mode 100644
index f3e7f63f25..0000000000
--- a/test/dm/board.c
+++ /dev/null
@@ -1,59 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2018
- * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc
- */
-
-#include <common.h>
-#include <dm.h>
-#include <log.h>
-#include <dm/test.h>
-#include <board.h>
-#include <test/test.h>
-#include <test/ut.h>
-
-#include "../../drivers/board/sandbox.h"
-
-static int dm_test_board(struct unit_test_state *uts)
-{
-	struct udevice *board;
-	bool called_detect;
-	char str[64];
-	int i;
-
-	board_get(&board);
-	ut_assert(board);
-
-	board_get_bool(board, BOOL_CALLED_DETECT, &called_detect);
-	ut_assert(!called_detect);
-
-	board_detect(board);
-
-	board_get_bool(board, BOOL_CALLED_DETECT, &called_detect);
-	ut_assert(called_detect);
-
-	board_get_str(board, STR_VACATIONSPOT, sizeof(str), str);
-	ut_assertok(strcmp(str, "R'lyeh"));
-
-	board_get_int(board, INT_TEST1, &i);
-	ut_asserteq(0, i);
-
-	board_get_int(board, INT_TEST2, &i);
-	ut_asserteq(100, i);
-
-	board_get_str(board, STR_VACATIONSPOT, sizeof(str), str);
-	ut_assertok(strcmp(str, "Carcosa"));
-
-	board_get_int(board, INT_TEST1, &i);
-	ut_asserteq(1, i);
-
-	board_get_int(board, INT_TEST2, &i);
-	ut_asserteq(99, i);
-
-	board_get_str(board, STR_VACATIONSPOT, sizeof(str), str);
-	ut_assertok(strcmp(str, "Yuggoth"));
-
-	return 0;
-}
-
-DM_TEST(dm_test_board, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
diff --git a/test/dm/sysinfo.c b/test/dm/sysinfo.c
new file mode 100644
index 0000000000..4aaa9e85bc
--- /dev/null
+++ b/test/dm/sysinfo.c
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2018
+ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <log.h>
+#include <dm/test.h>
+#include <sysinfo.h>
+#include <test/test.h>
+#include <test/ut.h>
+
+#include "../../drivers/sysinfo/sandbox.h"
+
+static int dm_test_sysinfo(struct unit_test_state *uts)
+{
+	struct udevice *sysinfo;
+	bool called_detect;
+	char str[64];
+	int i;
+
+	ut_assertok(sysinfo_get(&sysinfo));
+	ut_assert(sysinfo);
+
+	sysinfo_get_bool(sysinfo, BOOL_CALLED_DETECT, &called_detect);
+	ut_assert(!called_detect);
+
+	sysinfo_detect(sysinfo);
+
+	sysinfo_get_bool(sysinfo, BOOL_CALLED_DETECT, &called_detect);
+	ut_assert(called_detect);
+
+	sysinfo_get_str(sysinfo, STR_VACATIONSPOT, sizeof(str), str);
+	ut_assertok(strcmp(str, "R'lyeh"));
+
+	sysinfo_get_int(sysinfo, INT_TEST1, &i);
+	ut_asserteq(0, i);
+
+	sysinfo_get_int(sysinfo, INT_TEST2, &i);
+	ut_asserteq(100, i);
+
+	sysinfo_get_str(sysinfo, STR_VACATIONSPOT, sizeof(str), str);
+	ut_assertok(strcmp(str, "Carcosa"));
+
+	sysinfo_get_int(sysinfo, INT_TEST1, &i);
+	ut_asserteq(1, i);
+
+	sysinfo_get_int(sysinfo, INT_TEST2, &i);
+	ut_asserteq(99, i);
+
+	sysinfo_get_str(sysinfo, STR_VACATIONSPOT, sizeof(str), str);
+	ut_assertok(strcmp(str, "Yuggoth"));
+
+	return 0;
+}
+
+DM_TEST(dm_test_sysinfo, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);