| Message ID | 1523509343-18123-5-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | fa5e91f778fe8aba1fa9a7d0d7f64abdf3080ac9 |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | bootvx: Various enhancements to booting VxWorks x86 kernels | expand |
2018-04-12 7:02 GMT+02:00 Bin Meng <bmeng.cn@gmail.com>: > This changes 'struct e820info' to 'struct e820_info' to conform > with the coding style. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com> > --- > > Changes in v2: None > > cmd/elf.c | 6 +++--- > include/vxworks.h | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/cmd/elf.c b/cmd/elf.c > index 4638d79..0717feb 100644 > --- a/cmd/elf.c > +++ b/cmd/elf.c > @@ -209,7 +209,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 > > @@ -340,9 +340,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 d912076..4a83a34 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 */ > -- > 2.7.4 >
On Thu, Apr 12, 2018 at 3:26 PM, Christian Gmeiner <christian.gmeiner@gmail.com> wrote: > 2018-04-12 7:02 GMT+02:00 Bin Meng <bmeng.cn@gmail.com>: >> This changes 'struct e820info' to 'struct e820_info' to conform >> with the coding style. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com> > applied to u-boot-x86, thanks!
diff --git a/cmd/elf.c b/cmd/elf.c index 4638d79..0717feb 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -209,7 +209,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 @@ -340,9 +340,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 d912076..4a83a34 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 */
This changes 'struct e820info' to 'struct e820_info' to conform with the coding style. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- Changes in v2: None cmd/elf.c | 6 +++--- include/vxworks.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)