Merge branch '2020-10-23-misc-changes'

Highlights:
- Fix a problem with the bootm overlap tests
- Remove duplicated code in fatwrite
- Cleanup our current "misc" command code and add a new one for misc
  class devices.
- Various GPIO fixes

2 files changed, 72 insertions, 0 deletions

diff --git a/test/lib/Makefile b/test/lib/Makefile
index 22236f85875..15cd512506b 100644
--- a/test/lib/Makefile
+++ b/test/lib/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_EFI_LOADER) += efi_device_path.o
 obj-$(CONFIG_EFI_SECURE_BOOT) += efi_image_region.o
 obj-y += hexdump.o
 obj-y += lmb.o
+obj-y += test_print.o
 obj-$(CONFIG_SSCANF) += sscanf.o
 obj-y += string.o
 obj-$(CONFIG_ERRNO_STR) += test_errno_str.o
diff --git a/test/lib/test_print.c b/test/lib/test_print.c
new file mode 100644
index 00000000000..1d497d00413
--- /dev/null
+++ b/test/lib/test_print.c
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Tests for print functions
+ *
+ * Copyright 2020, Heinrich Schuchadt <[email protected]>
+ */
+
+#include <common.h>
+#include <command.h>
+#include <display_options.h>
+#include <test/lib.h>
+#include <test/test.h>
+#include <test/ut.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static int test_print_freq(struct unit_test_state *uts,
+			   uint64_t freq, char *expected)
+{
+	console_record_reset_enable();
+	print_freq(freq, ";\n");
+	gd->flags &= ~GD_FLG_RECORD;
+	console_record_readline(uts->actual_str, sizeof(uts->actual_str));
+	ut_asserteq_str(expected, uts->actual_str);
+	ut_assertok(ut_check_console_end(uts));
+	return 0;
+}
+
+static int lib_test_print_freq(struct unit_test_state *uts)
+{
+	ut_assertok(test_print_freq(uts, 321, "321 Hz;"));
+	ut_assertok(test_print_freq(uts, 4321, "4.32 kHz;"));
+	ut_assertok(test_print_freq(uts, 54321, "54.32 kHz;"));
+	ut_assertok(test_print_freq(uts, 654321, "654.32 kHz;"));
+	ut_assertok(test_print_freq(uts, 7654321, "7.66 MHz;"));
+	ut_assertok(test_print_freq(uts, 87654321, "87.66 MHz;"));
+	ut_assertok(test_print_freq(uts, 987654321, "987.66 MHz;"));
+	ut_assertok(test_print_freq(uts, 1987654321, "1.99 GHz;"));
+	ut_assertok(test_print_freq(uts, 54321987654321, "54321.99 GHz;"));
+	return 0;
+}
+
+LIB_TEST(lib_test_print_freq, 0);
+
+static int test_print_size(struct unit_test_state *uts,
+			   uint64_t freq, char *expected)
+{
+	console_record_reset_enable();
+	print_size(freq, ";\n");
+	gd->flags &= ~GD_FLG_RECORD;
+	console_record_readline(uts->actual_str, sizeof(uts->actual_str));
+	ut_asserteq_str(expected, uts->actual_str);
+	ut_assertok(ut_check_console_end(uts));
+	return 0;
+}
+
+static int lib_test_print_size(struct unit_test_state *uts)
+{
+	ut_assertok(test_print_size(uts, 321, "321 Bytes;"));
+	ut_assertok(test_print_size(uts, 4321, "4.2 KiB;"));
+	ut_assertok(test_print_size(uts, 54321, "53 KiB;"));
+	ut_assertok(test_print_size(uts, 654321, "639 KiB;"));
+	ut_assertok(test_print_size(uts, 7654321, "7.3 MiB;"));
+	ut_assertok(test_print_size(uts, 87654321, "83.6 MiB;"));
+	ut_assertok(test_print_size(uts, 987654321, "941.9 MiB;"));
+	ut_assertok(test_print_size(uts, 1987654321, "1.9 GiB;"));
+	ut_assertok(test_print_size(uts, 54321987654321, "49.4 TiB;"));
+	return 0;
+}
+
+LIB_TEST(lib_test_print_size, 0);