Merge tag 'u-boot-atmel-2019.04-a' of git://git.denx.de/u-boot-atmel

[oweals/u-boot.git] / cmd / cbfs.c

diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index 736f8c4527dfb9807a7edc7443676b6869a55585..c118a952ac20ae93dd8ca5512f94f92731a6ea58 100644 (file)
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -113,12 +112,21 @@ static int do_cbfs_ls(cmd_tbl_t *cmdtp, int flag, int argc,
                printf(" %8d", file_cbfs_size(file));
 
                switch (type) {
+               case CBFS_TYPE_BOOTBLOCK:
+                       type_name = "bootblock";
+                       break;
+               case CBFS_TYPE_CBFSHEADER:
+                       type_name = "cbfs header";
+                       break;
                case CBFS_TYPE_STAGE:
                        type_name = "stage";
                        break;
                case CBFS_TYPE_PAYLOAD:
                        type_name = "payload";
                        break;
+               case CBFS_TYPE_FIT:
+                       type_name = "fit";
+                       break;
                case CBFS_TYPE_OPTIONROM:
                        type_name = "option rom";
                        break;
@@ -137,10 +145,31 @@ static int do_cbfs_ls(cmd_tbl_t *cmdtp, int flag, int argc,
                case CBFS_TYPE_MICROCODE:
                        type_name = "microcode";
                        break;
-               case CBFS_COMPONENT_CMOS_DEFAULT:
+               case CBFS_TYPE_FSP:
+                       type_name = "fsp";
+                       break;
+               case CBFS_TYPE_MRC:
+                       type_name = "mrc";
+                       break;
+               case CBFS_TYPE_MMA:
+                       type_name = "mma";
+                       break;
+               case CBFS_TYPE_EFI:
+                       type_name = "efi";
+                       break;
+               case CBFS_TYPE_STRUCT:
+                       type_name = "struct";
+                       break;
+               case CBFS_TYPE_CMOS_DEFAULT:
                        type_name = "cmos default";
                        break;
-               case CBFS_COMPONENT_CMOS_LAYOUT:
+               case CBFS_TYPE_SPD:
+                       type_name = "spd";
+                       break;
+               case CBFS_TYPE_MRC_CACHE:
+                       type_name = "mrc cache";
+                       break;
+               case CBFS_TYPE_CMOS_LAYOUT:
                        type_name = "cmos layout";
                        break;
                case -1: