From: Bin Meng Date: Thu, 12 Apr 2018 05:02:09 +0000 (-0700) Subject: vxworks: x86: Rename e820info to e820_info X-Git-Url: http://git.dujemihanovic.xyz/%22/img/sics.gif/%22/static/git-favicon.png?a=commitdiff_plain;h=fa5e91f778fe8aba1fa9a7d0d7f64abdf3080ac9;p=u-boot.git vxworks: x86: Rename e820info to e820_info This changes 'struct e820info' to 'struct e820_info' to conform with the coding style. Signed-off-by: Bin Meng Reviewed-by: Christian Gmeiner --- diff --git a/cmd/elf.c b/cmd/elf.c index 22d1918144..1017039c3e 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -210,7 +210,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int ptr = 0; #ifdef CONFIG_X86 ulong base; - struct e820info *info; + struct e820_info *info; struct e820entry *data; #endif @@ -341,9 +341,9 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) */ base = env_get_hex("vx_phys_mem_base", VXWORKS_PHYS_MEM_BASE); data = (struct e820entry *)(base + E820_DATA_OFFSET); - info = (struct e820info *)(base + E820_INFO_OFFSET); + info = (struct e820_info *)(base + E820_INFO_OFFSET); - memset(info, 0, sizeof(struct e820info)); + memset(info, 0, sizeof(struct e820_info)); info->sign = E820_SIGNATURE; info->entries = install_e820_map(E820MAX, data); info->addr = (info->entries - 1) * sizeof(struct e820entry) + diff --git a/include/vxworks.h b/include/vxworks.h index d912076322..4a83a34dfb 100644 --- a/include/vxworks.h +++ b/include/vxworks.h @@ -32,7 +32,7 @@ /* E820 info signatiure "SMAP" - System MAP */ #define E820_SIGNATURE 0x534d4150 -struct e820info { +struct e820_info { u32 sign; /* "SMAP" signature */ u32 x0; /* don't care, used by VxWorks */ u32 x1; /* don't care, used by VxWorks */