x86: fsp: Make hob command a sub-command to fsp

Introduce a new fsp command and make the existing hob command a
sub-command to fsp for future extension. Also move cmd_hob.c to
the dedicated fsp sub-directory in arch/x86/lib.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 4ac99560ab05c608078519b81671d5f8ea903601..fa9594439901226d5c571c3deabb1f6512a30aa1 100644 (file)
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -10,7 +10,6 @@ obj-y += bios_asm.o
 obj-y += bios_interrupts.o
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-y  += cmd_boot.o
-obj-$(CONFIG_HAVE_FSP) += cmd_hob.o
 obj-$(CONFIG_EFI) += efi/
 obj-y  += e820.o
 obj-y  += gcc.o

diff --git a/arch/x86/lib/cmd_hob.c b/arch/x86/lib/cmd_hob.c
deleted file mode 100644 (file)
index 4a29aee..0000000
--- a/arch/x86/lib/cmd_hob.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <command.h>
-#include <linux/compiler.h>
-#include <asm/fsp/fsp_support.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static char *hob_type[] = {
-       "reserved",
-       "Hand-off",
-       "Mem Alloc",
-       "Res Desc",
-       "GUID Ext",
-       "FV",
-       "CPU",
-       "Mem Pool",
-       "reserved",
-       "FV2",
-       "Load PEIM",
-       "Capsule",
-};
-
-int do_hob(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       const struct hob_header *hdr;
-       uint type;
-       char *desc;
-       int i = 0;
-
-       hdr = gd->arch.hob_list;
-
-       printf("HOB list address: 0x%08x\n\n", (unsigned int)hdr);
-
-       printf("#  | Address  | Type      | Len  | ");
-       printf("%42s\n", "GUID");
-       printf("---|----------|-----------|------|-");
-       printf("------------------------------------------\n");
-       while (!end_of_hob(hdr)) {
-               printf("%-2d | %08x | ", i, (unsigned int)hdr);
-               type = hdr->type;
-               if (type == HOB_TYPE_UNUSED)
-                       desc = "*Unused*";
-               else if (type == HOB_TYPE_EOH)
-                       desc = "*EOH*";
-               else if (type >= 0 && type <= ARRAY_SIZE(hob_type))
-                       desc = hob_type[type];
-               else
-                       desc = "*Invalid*";
-               printf("%-9s | %-4d | ", desc, hdr->len);
-
-               if (type == HOB_TYPE_MEM_ALLOC || type == HOB_TYPE_RES_DESC ||
-                   type == HOB_TYPE_GUID_EXT) {
-                       struct efi_guid *guid = (struct efi_guid *)(hdr + 1);
-                       int j;
-
-                       printf("%08x-%04x-%04x", guid->data1,
-                              guid->data2, guid->data3);
-                       for (j = 0; j < ARRAY_SIZE(guid->data4); j++)
-                               printf("-%02x", guid->data4[j]);
-               } else {
-                       printf("%42s", "Not Available");
-               }
-               printf("\n");
-               hdr = get_next_hob(hdr);
-               i++;
-       }
-
-       return 0;
-}
-
-U_BOOT_CMD(
-       hob,    1,      1,      do_hob,
-       "print Firmware Support Package (FSP) Hand-Off Block information",
-       ""
-);

diff --git a/arch/x86/lib/fsp/Makefile b/arch/x86/lib/fsp/Makefile
index 5b12c12d7a930863ef60567034c3f263b0affe68..3ea4880a30d1836ab91cccf190c7b0c7011bfd4d 100644 (file)
--- a/arch/x86/lib/fsp/Makefile
+++ b/arch/x86/lib/fsp/Makefile
@@ -4,6 +4,7 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
+obj-y += cmd_fsp.o
 obj-y += fsp_car.o
 obj-y += fsp_common.o
 obj-y += fsp_dram.o

diff --git a/arch/x86/lib/fsp/cmd_fsp.c b/arch/x86/lib/fsp/cmd_fsp.c
new file mode 100644 (file)
index 0000000..b0b1875
--- /dev/null
+++ b/arch/x86/lib/fsp/cmd_fsp.c
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2014-2015, Bin Meng <bmeng.cn@gmail.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <command.h>
+#include <asm/fsp/fsp_support.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static char *hob_type[] = {
+       "reserved",
+       "Hand-off",
+       "Mem Alloc",
+       "Res Desc",
+       "GUID Ext",
+       "FV",
+       "CPU",
+       "Mem Pool",
+       "reserved",
+       "FV2",
+       "Load PEIM",
+       "Capsule",
+};
+
+static int do_hob(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       const struct hob_header *hdr;
+       uint type;
+       char *desc;
+       int i = 0;
+
+       hdr = gd->arch.hob_list;
+
+       printf("HOB list address: 0x%08x\n\n", (unsigned int)hdr);
+
+       printf("#  | Address  | Type      | Len  | ");
+       printf("%42s\n", "GUID");
+       printf("---|----------|-----------|------|-");
+       printf("------------------------------------------\n");
+       while (!end_of_hob(hdr)) {
+               printf("%-2d | %08x | ", i, (unsigned int)hdr);
+               type = hdr->type;
+               if (type == HOB_TYPE_UNUSED)
+                       desc = "*Unused*";
+               else if (type == HOB_TYPE_EOH)
+                       desc = "*EOH*";
+               else if (type >= 0 && type <= ARRAY_SIZE(hob_type))
+                       desc = hob_type[type];
+               else
+                       desc = "*Invalid*";
+               printf("%-9s | %-4d | ", desc, hdr->len);
+
+               if (type == HOB_TYPE_MEM_ALLOC || type == HOB_TYPE_RES_DESC ||
+                   type == HOB_TYPE_GUID_EXT) {
+                       struct efi_guid *guid = (struct efi_guid *)(hdr + 1);
+                       int j;
+
+                       printf("%08x-%04x-%04x", guid->data1,
+                              guid->data2, guid->data3);
+                       for (j = 0; j < ARRAY_SIZE(guid->data4); j++)
+                               printf("-%02x", guid->data4[j]);
+               } else {
+                       printf("%42s", "Not Available");
+               }
+               printf("\n");
+               hdr = get_next_hob(hdr);
+               i++;
+       }
+
+       return 0;
+}
+
+static cmd_tbl_t fsp_commands[] = {
+       U_BOOT_CMD_MKENT(hob, 0, 1, do_hob, "", ""),
+};
+
+static int do_fsp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       cmd_tbl_t *fsp_cmd;
+       int ret;
+
+       if (argc < 2)
+               return CMD_RET_USAGE;
+       fsp_cmd = find_cmd_tbl(argv[1], fsp_commands, ARRAY_SIZE(fsp_commands));
+       argc -= 2;
+       argv += 2;
+       if (!fsp_cmd || argc > fsp_cmd->maxargs)
+               return CMD_RET_USAGE;
+
+       ret = fsp_cmd->cmd(fsp_cmd, flag, argc, argv);
+
+       return cmd_process_error(fsp_cmd, ret);
+}
+
+U_BOOT_CMD(
+       fsp,    2,      1,      do_fsp,
+       "Show Intel Firmware Support Package (FSP) related information",
+       "hob - Print FSP Hand-Off Block (HOB) information"
+);

diff --git a/doc/README.x86 b/doc/README.x86
index 18fed82c07cde15bd0d64e40427ad39e7599b32b..a9d0e0fbfef3c86cb9e3ce53921184276f09d04b 100644 (file)
--- a/doc/README.x86
+++ b/doc/README.x86
@@ -332,9 +332,8 @@ In keeping with the U-Boot philosophy of providing functions to check and
 adjust internal settings, there are several x86-specific commands that may be
 useful:
 
-hob  - Display information about Firmware Support Package (FSP) Hand-off
-        Block. This is only available on platforms which use FSP, mostly
-        Atom.
+fsp  - Display information about Intel Firmware Support Package (FSP).
+        This is only available on platforms which use FSP, mostly Atom.
 iod  - Display I/O memory
 iow  - Write I/O memory
 mtrr - List and set the Memory Type Range Registers (MTRR). These are used to