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/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/cmd_hob.c b/arch/x86/lib/fsp/cmd_fsp.c
similarity index 65%
rename from arch/x86/lib/cmd_hob.c
rename to arch/x86/lib/fsp/cmd_fsp.c
index 4a29aeed3bde8a8eca50743dff04e8a37d9c4c67..b0b18758b0d87e60b79fa4bbb0397ac29605a60d 100644 (file)
--- a/arch/x86/lib/cmd_hob.c
+++ b/arch/x86/lib/fsp/cmd_fsp.c
@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
+ * Copyright (C) 2014-2015, 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;
@@ -26,7 +25,7 @@ static char *hob_type[] = {
        "Capsule",
 };
 
-int do_hob(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_hob(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        const struct hob_header *hdr;
        uint type;
@@ -74,8 +73,30 @@ int do_hob(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        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(
-       hob,    1,      1,      do_hob,
-       "print Firmware Support Package (FSP) Hand-Off Block information",
-       ""
+       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