From: Bin Meng Date: Sat, 22 Dec 2018 09:55:50 +0000 (-0800) Subject: fs: cbfs: Make all CBFS_TYPE_xxx macros consistent X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=14fdf91ebfce7b8dd98177e873a7245f1bc21125;p=u-boot.git 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 Reviewed-by: Simon Glass --- diff --git a/cmd/cbfs.c b/cmd/cbfs.c index ece790e56e..4d3e0062df 100644 --- 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_COMPONENT_CMOS_DEFAULT: + case CBFS_TYPE_CMOS_DEFAULT: type_name = "cmos default"; break; - case CBFS_COMPONENT_CMOS_LAYOUT: + case CBFS_TYPE_CMOS_LAYOUT: type_name = "cmos layout"; break; case -1: diff --git a/include/cbfs.h b/include/cbfs.h index 1b88ec04ae..dd4b574869 100644 --- 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_COMPONENT_CMOS_DEFAULT = 0xaa, - CBFS_COMPONENT_CMOS_LAYOUT = 0x01aa + CBFS_TYPE_CMOS_DEFAULT = 0xaa, + CBFS_TYPE_CMOS_LAYOUT = 0x01aa }; struct cbfs_header {