Merge branch '2021-01-29-assorted-fixes'

- Assorted test fixes
- Assorted minor FAT fixes
- Assorted Kconfig dependency fixes
- MediaTek, vexpress_aemv8a improvements
- Other assorted minor fixes

1 files changed, 21 insertions, 16 deletions

diff --git a/cmd/riscv/sbi.c b/cmd/riscv/sbi.c
index e66fc8e41d..2c905f1f8f 100644
--- a/cmd/riscv/sbi.c
+++ b/cmd/riscv/sbi.c
@@ -9,11 +9,25 @@
 #include <command.h>
 #include <asm/sbi.h>
 
+struct sbi_imp {
+	const long id;
+	const char *name;
+};
+
 struct sbi_ext {
 	const u32 id;
 	const char *name;
 };
 
+static struct sbi_imp implementations[] = {
+	{ 0, "Berkeley Boot Loader (BBL)" },
+	{ 1, "OpenSBI" },
+	{ 2, "Xvisor" },
+	{ 3, "KVM" },
+	{ 4, "RustSBI" },
+	{ 5, "Diosix" },
+};
+
 static struct sbi_ext extensions[] = {
 	{ 0x00000000, "sbi_set_timer" },
 	{ 0x00000001, "sbi_console_putchar" },
@@ -42,23 +56,14 @@ static int do_sbi(struct cmd_tbl *cmdtp, int flag, int argc,
 		printf("SBI %ld.%ld\n", ret >> 24, ret & 0xffffff);
 	ret = sbi_get_impl_id();
 	if (ret >= 0) {
-		switch (ret) {
-		case 0:
-			printf("Berkeley Boot Loader (BBL)\n");
-			break;
-		case 1:
-			printf("OpenSBI\n");
-			break;
-		case 2:
-			printf("Xvisor\n");
-			break;
-		case 3:
-			printf("KVM\n");
-			break;
-		default:
-			printf("Unknown implementation\n");
-			break;
+		for (i = 0; i < ARRAY_SIZE(implementations); ++i) {
+			if (ret == implementations[i].id) {
+				printf("%s\n", implementations[i].name);
+				break;
+			}
 		}
+		if (i == ARRAY_SIZE(implementations))
+			printf("Unknown implementation ID %ld\n", ret);
 	}
 	printf("Extensions:\n");
 	for (i = 0; i < ARRAY_SIZE(extensions); ++i) {