Commit eb5f222b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/xtensa/tags/20141103-xtensa' into staging 



Xtensa fixes and improvements 2014-11-03:
- build fixes for cores w/o windowed registers and with profiling
  interrupts;
- fix uImage load address for MMUv2 cores;
- add script for automatic core import from xtensa configuration overlay.

# gpg: Signature made Sun 02 Nov 2014 22:04:44 GMT using RSA key ID F83FA044
# gpg: Good signature from "Max Filippov <max.filippov@cogentembedded.com>"
# gpg:                 aka "Max Filippov <jcmvbkbc@gmail.com>"

* remotes/xtensa/tags/20141103-xtensa:
  MAINTAINERS: update xtensa boards
  target-xtensa: fix build for cores w/o windowed registers
  target-xtensa: add core importing script
  hw/xtensa/xtfpga: treat uImage load address as virtual
  hw/core/loader: implement address translation in uimage loader
  target-xtensa: avoid duplicate timer interrupt delivery
  target-xtensa: tests: pre-process tests linker script
  target-xtensa: add definition for XTHAL_INTTYPE_PROFILING

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7135781f 437a8c11

MAINTAINERS

+4 −3
Original line number Diff line number Diff line
@@ -583,12 +583,13 @@ Xtensa Machines 
sim

M: Max Filippov <jcmvbkbc@gmail.com>

S: Maintained

F: hw/xtensa/xtensa_sim.c

F: hw/xtensa/sim.c



Avnet LX60

XTFPGA (LX60, LX200, ML605, KC705)

M: Max Filippov <jcmvbkbc@gmail.com>

S: Maintained

F: hw/xtensa/xtensa_lx60.c

F: hw/xtensa/xtfpga.c

F: hw/net/opencores_eth.c



Devices

-------

hw/arm/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) 
    entry = elf_entry;

    if (kernel_size < 0) {

        kernel_size = load_uimage(info->kernel_filename, &entry, NULL,

                                  &is_linux);

                                  &is_linux, NULL, NULL);

    }

    /* On aarch64, it's the bootloader's job to uncompress the kernel. */

    if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64) && kernel_size < 0) {

hw/core/loader.c

+13 −4
Original line number Diff line number Diff line
@@ -477,7 +477,9 @@ static ssize_t gunzip(void *dst, size_t dstlen, uint8_t *src, 


/* Load a U-Boot image.  */

static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr,

                            int *is_linux, uint8_t image_type)

                            int *is_linux, uint8_t image_type,

                            uint64_t (*translate_fn)(void *, uint64_t),

                            void *translate_opaque)

{

    int fd;

    int size;
@@ -511,6 +513,9 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, 
    switch (hdr->ih_type) {

    case IH_TYPE_KERNEL:

        address = hdr->ih_load;

        if (translate_fn) {

            address = translate_fn(translate_opaque, address);

        }

        if (loadaddr) {

            *loadaddr = hdr->ih_load;

        }
@@ -587,15 +592,19 @@ out: 
}



int load_uimage(const char *filename, hwaddr *ep, hwaddr *loadaddr,

                int *is_linux)

                int *is_linux,

                uint64_t (*translate_fn)(void *, uint64_t),

                void *translate_opaque)

{

    return load_uboot_image(filename, ep, loadaddr, is_linux, IH_TYPE_KERNEL);

    return load_uboot_image(filename, ep, loadaddr, is_linux, IH_TYPE_KERNEL,

                            translate_fn, translate_opaque);

}



/* Load a ramdisk.  */

int load_ramdisk(const char *filename, hwaddr addr, uint64_t max_sz)

{

    return load_uboot_image(filename, NULL, &addr, NULL, IH_TYPE_RAMDISK);

    return load_uboot_image(filename, NULL, &addr, NULL, IH_TYPE_RAMDISK,

                            NULL, NULL);

}



/* This simply prevents g_malloc in the function below from allocating

hw/m68k/an5206.c

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ static void an5206_init(MachineState *machine) 
                           NULL, NULL, 1, ELF_MACHINE, 0);

    entry = elf_entry;

    if (kernel_size < 0) {

        kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL);

        kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL,

                                  NULL, NULL);

    }

    if (kernel_size < 0) {

        kernel_size = load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR,

hw/m68k/dummy_m68k.c

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ static void dummy_m68k_init(MachineState *machine) 
                               NULL, NULL, 1, ELF_MACHINE, 0);

        entry = elf_entry;

        if (kernel_size < 0) {

            kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL);

            kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL,

                                      NULL, NULL);

        }

        if (kernel_size < 0) {

            kernel_size = load_image_targphys(kernel_filename,