fs: cbfs: Make all CBFS_TYPE_xxx macros consistent

At present there are 2 macros that are named as CBFS_COMPONENT_xxx.
Change them to CBFS_TYPE_xxx for consistency.

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

diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index ece790e56e4fab531a7e377f99c8144a0525b398..4d3e0062df4a8cb7f428c23e95a0a9c6efc2f9a2 100644 (file)
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -136,10 +136,10 @@ static int do_cbfs_ls(cmd_tbl_t *cmdtp, int flag, int argc,
                case CBFS_TYPE_MICROCODE:
                        type_name = "microcode";
                        break;
                case CBFS_TYPE_MICROCODE:
                        type_name = "microcode";
                        break;

-               case CBFS_COMPONENT_CMOS_DEFAULT:
+               case CBFS_TYPE_CMOS_DEFAULT:

                        type_name = "cmos default";
                        break;
                        type_name = "cmos default";
                        break;

-               case CBFS_COMPONENT_CMOS_LAYOUT:
+               case CBFS_TYPE_CMOS_LAYOUT:

                        type_name = "cmos layout";
                        break;
                case -1:
                        type_name = "cmos layout";
                        break;
                case -1:

diff --git a/include/cbfs.h b/include/cbfs.h
index 1b88ec04ae52a2736d5aec42743e5e7a3b1fff01..dd4b574869ed4f000f976d2a1da3d84cc98f9116 100644 (file)
--- a/include/cbfs.h
+++ b/include/cbfs.h
@@ -26,8 +26,8 @@ enum cbfs_filetype {
        CBFS_TYPE_VSA = 0x51,
        CBFS_TYPE_MBI = 0x52,
        CBFS_TYPE_MICROCODE = 0x53,
        CBFS_TYPE_VSA = 0x51,
        CBFS_TYPE_MBI = 0x52,
        CBFS_TYPE_MICROCODE = 0x53,

-       CBFS_COMPONENT_CMOS_DEFAULT = 0xaa,
-       CBFS_COMPONENT_CMOS_LAYOUT = 0x01aa
+       CBFS_TYPE_CMOS_DEFAULT = 0xaa,
+       CBFS_TYPE_CMOS_LAYOUT = 0x01aa

 };
 
 struct cbfs_header {
 };
 
 struct cbfs_header {