hw/mips: loongson3: Drop 'struct MemmapEntry'
PATCH 1/1 hw/mips: loongson3: Drop 'struct MemmapEntry'
From: Bin Meng <[email protected]>
There is already a MemMapEntry type defined in hwaddr.h. Let's drop the loongson3 defined struct MemmapEntry and use the existing one.
---
hw/mips/loongson3_bootp.h | 7 +------ hw/mips/loongson3_virt.c | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-)
hw/mips/loongson3_bootp.h +1 -6
@@ -228,12 +228,7 @@ enum { LOADER_PARAM, }; -struct MemmapEntry { -hwaddr base; -hwaddr size; -}; - -extern const struct MemmapEntry virt_memmap[]; +extern const MemMapEntry virt_memmap[];void init_loongson_params (struct loongson_params *lp,void *p,uint64_t cpu_freq,uint64_t ram_size);void init_reset_system (struct efi_reset_system_t *reset);
hw/mips/loongson3_virt.c +3 -3
@@ -72,7 +72,7 @@#define RTC_IRQ 1#define PCIE_IRQ_BASE 2 -const struct MemmapEntry virt_memmap[] = { +const MemMapEntry virt_memmap[] = { [VIRT_LOWMEM ] = {0x00000000 ,0x10000000 }, [VIRT_PM ] = {0x10080000 ,0x100 }, [VIRT_FW_CFG ] = {0x10080100 ,0x100 },
@@ -86,13 +86,13 @@ const struct MemmapEntry virt_memmap[] = { [VIRT_HIGHMEM] = { 0x80000000, 0x0 }, /* Variable */ }; -static const struct MemmapEntry loader_memmap[] = { +static const MemMapEntry loader_memmap[] = { [LOADER_KERNEL ] = {0x00000000 ,0x4000000 }, [LOADER_INITRD ] = {0x04000000 ,0x0 },/* Variable */ [LOADER_CMDLINE ] = {0x0ff00000 ,0x100000 }, }; -static const struct MemmapEntry loader_rommap[] = { +static const MemMapEntry loader_rommap[] = { [LOADER_BOOTROM ] = {0x1fc00000 ,0x1000 }, [LOADER_PARAM ] = {0x1fc01000 ,0x10000 }, };
Signature · 1 line
2.25.1
Quoted 4 lines · Bin Meng
From: Bin Meng <[email protected]>
There is already a MemMapEntry type defined in
hwaddr.h. Let's drop the loongson3 definedstruct MemmapEntryand use the existing one.
Not really... based on 0e324626306:
$ git grep MemmapEntry origin/master -- include $
What tree are you using?
Thanks,
Phil.
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Bin Meng
From: Bin Meng <[email protected]>
There is already a MemMapEntry type defined in
hwaddr.h. Let's drop the loongson3 definedstruct MemmapEntryand use the existing one.
Quoted 6 lines
Not really... based on
0e324626306:$ git grep MemmapEntry origin/master -- include $What tree are you using?
The latest origin/master
Use $ git grep MemmapEntry origin/master --
It's not defined in include.
Regards,
Bin
Quoted 10 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Bin Meng
From: Bin Meng <[email protected]>
There is already a MemMapEntry type defined in
hwaddr.h. Let's drop the loongson3 definedstruct MemmapEntryand use the existing one.Not really... based on
0e324626306:$ git grep MemmapEntry origin/master -- include $
OK I understood, you replaced MemmapEntry by MemMapEntry which is written slightly differently.
Thanks!
Philippe Mathieu-Daudé
AppliedQuoted 11 lines · Bin Meng
From: Bin Meng <[email protected]>
There is already a MemMapEntry type defined in
hwaddr.h. Let's drop the loongson3 definedstruct MemmapEntryand use the existing one.Signed-off-by Bin Meng <[email protected]>---
hw/mips/loongson3_bootp.h | 7 +------ hw/mips/loongson3_virt.c | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-)
Thanks, applied to mips-next.