diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2010-03-14 21:20:59 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-03-16 08:38:05 +0100 |
| commit | 409dbce54b57b85bd229174da86d77ca08508508 (patch) | |
| tree | 61aaddb4700595752b34e01db383074463336329 /hw/mips_malta.c | |
| parent | cb66ffcf9e298dc1bfc11682172ff9472bcd4495 (diff) | |
| download | focaccia-qemu-409dbce54b57b85bd229174da86d77ca08508508.tar.gz focaccia-qemu-409dbce54b57b85bd229174da86d77ca08508508.zip | |
load_elf: replace the address addend by a translation function
A few machines need to translate the ELF header addresses into physical addresses. Currently the only possibility is to add a value to the addresses. This patch replaces the addend argument by and a translation function and an opaque passed to the function. A NULL function does not translate the address. The patch also convert all machines that have an addend, simplify the PowerPC kernel loading and fix the MIPS kernel loading using this new feature. Other machines may benefit from this feature. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw/mips_malta.c')
| -rw-r--r-- | hw/mips_malta.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 2d02a10227..91498c262c 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -46,15 +46,7 @@ //#define DEBUG_BOARD_INIT -#ifdef TARGET_MIPS64 -#define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffULL) -#else -#define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffU) -#endif - -#define ENVP_ADDR (int32_t)0x80002000 -#define VIRT_TO_PHYS_ADDEND (-((int64_t)(int32_t)0x80000000)) - +#define ENVP_ADDR 0x80002000l #define ENVP_NB_ENTRIES 16 #define ENVP_ENTRY_SIZE 256 @@ -681,7 +673,7 @@ static void prom_set(uint32_t* prom_buf, int index, const char *string, ...) /* Kernel */ static int64_t load_kernel (void) { - int64_t kernel_entry, kernel_low, kernel_high; + int64_t kernel_entry, kernel_high; long initrd_size; ram_addr_t initrd_offset; int big_endian; @@ -695,9 +687,9 @@ static int64_t load_kernel (void) big_endian = 0; #endif - if (load_elf(loaderparams.kernel_filename, VIRT_TO_PHYS_ADDEND, - (uint64_t *)&kernel_entry, (uint64_t *)&kernel_low, - (uint64_t *)&kernel_high, big_endian, ELF_MACHINE, 1) < 0) { + if (load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys, NULL, + (uint64_t *)&kernel_entry, NULL, (uint64_t *)&kernel_high, + big_endian, ELF_MACHINE, 1) < 0) { fprintf(stderr, "qemu: could not load kernel '%s'\n", loaderparams.kernel_filename); exit(1); @@ -733,8 +725,8 @@ static int64_t load_kernel (void) prom_set(prom_buf, prom_index++, loaderparams.kernel_filename); if (initrd_size > 0) { - prom_set(prom_buf, prom_index++, "rd_start=0x" TARGET_FMT_lx " rd_size=%li %s", - PHYS_TO_VIRT(initrd_offset), initrd_size, + prom_set(prom_buf, prom_index++, "rd_start=0x%" PRIx64 " rd_size=%li %s", + cpu_mips_phys_to_kseg0(NULL, initrd_offset), initrd_size, loaderparams.kernel_cmdline); } else { prom_set(prom_buf, prom_index++, loaderparams.kernel_cmdline); @@ -747,7 +739,7 @@ static int64_t load_kernel (void) prom_set(prom_buf, prom_index++, NULL); rom_add_blob_fixed("prom", prom_buf, prom_size, - ENVP_ADDR + VIRT_TO_PHYS_ADDEND); + cpu_mips_kseg0_to_phys(NULL, ENVP_ADDR)); return kernel_entry; } |