mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/mips: loongson3: Drop 'struct MemmapEntry'

Browse Source 
There is already a MemMapEntry type defined in hwaddr.h. Let's drop
the loongson3 defined `struct MemmapEntry` and use the existing one.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210122122404.11970-1-bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Bin Meng 2021-01-22 20:24:04 +08:00 committed by Philippe Mathieu-Daudé
parent a528b8c4c6
commit ac9b0117d5
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/mips/loongson3_bootp.h
View File

@ -228,12 +228,7 @@ enum {
LOADER_PARAM, LOADER_PARAM,
}; };
struct MemmapEntry { extern const MemMapEntry virt_memmap[];
hwaddr base;
hwaddr size;
};
extern const struct MemmapEntry virt_memmap[];
void init_loongson_params(struct loongson_params *lp, void *p, void init_loongson_params(struct loongson_params *lp, void *p,
uint64_t cpu_freq, uint64_t ram_size); uint64_t cpu_freq, uint64_t ram_size);
void init_reset_system(struct efi_reset_system_t *reset); void init_reset_system(struct efi_reset_system_t *reset);

6
hw/mips/loongson3_virt.c
View File

@ -72,7 +72,7 @@
#define RTC_IRQ 1 #define RTC_IRQ 1
#define PCIE_IRQ_BASE 2 #define PCIE_IRQ_BASE 2
const struct MemmapEntry virt_memmap[] = { const MemMapEntry virt_memmap[] = {
[VIRT_LOWMEM] = { 0x00000000, 0x10000000 }, [VIRT_LOWMEM] = { 0x00000000, 0x10000000 },
[VIRT_PM] = { 0x10080000, 0x100 }, [VIRT_PM] = { 0x10080000, 0x100 },
[VIRT_FW_CFG] = { 0x10080100, 0x100 }, [VIRT_FW_CFG] = { 0x10080100, 0x100 },
@ -86,13 +86,13 @@ const struct MemmapEntry virt_memmap[] = {
[VIRT_HIGHMEM] = { 0x80000000, 0x0 }, /* Variable */ [VIRT_HIGHMEM] = { 0x80000000, 0x0 }, /* Variable */
}; };
static const struct MemmapEntry loader_memmap[] = { static const MemMapEntry loader_memmap[] = {
[LOADER_KERNEL] = { 0x00000000, 0x4000000 }, [LOADER_KERNEL] = { 0x00000000, 0x4000000 },
[LOADER_INITRD] = { 0x04000000, 0x0 }, /* Variable */ [LOADER_INITRD] = { 0x04000000, 0x0 }, /* Variable */
[LOADER_CMDLINE] = { 0x0ff00000, 0x100000 }, [LOADER_CMDLINE] = { 0x0ff00000, 0x100000 },
}; };
static const struct MemmapEntry loader_rommap[] = { static const MemMapEntry loader_rommap[] = {
[LOADER_BOOTROM] = { 0x1fc00000, 0x1000 }, [LOADER_BOOTROM] = { 0x1fc00000, 0x1000 },
[LOADER_PARAM] = { 0x1fc01000, 0x10000 }, [LOADER_PARAM] = { 0x1fc01000, 0x10000 },
}; };