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

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



xtensa fixes for 3.1:

- fix register counting logic for linux-user gdbserver;
- provide default memory sizes for XTFPGA boards;
- add missing xtensa patterns to MAINTAINTERS.

# gpg: Signature made Sun 25 Nov 2018 23:07:54 GMT
# gpg:                using RSA key 51F9CC91F83FA044
# gpg: Good signature from "Max Filippov <filippov@cadence.com>"
# gpg:                 aka "Max Filippov <max.filippov@cogentembedded.com>"
# gpg:                 aka "Max Filippov <jcmvbkbc@gmail.com>"
# Primary key fingerprint: 2B67 854B 98E5 327D CDEB  17D8 51F9 CC91 F83F A044

* remotes/xtensa/tags/20181125-xtensa:
  MAINTAINERS: add missing xtensa patterns
  target/xtensa: xtfpga: provide default memory sizes
  target/xtensa: drop num_[core_]regs from dc232b/dc233c configs
  target/xtensa: gdbstub fix register counting

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5298f4d6 895e4897

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -311,6 +311,8 @@ F: target/xtensa/ 
F: hw/xtensa/

F: tests/tcg/xtensa/

F: disas/xtensa.c

F: include/hw/xtensa/xtensa-isa.h

F: default-configs/xtensa*.mak



TriCore

M: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>

hw/xtensa/xtfpga.c

+10 −0
Original line number Diff line number Diff line
@@ -446,6 +446,8 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) 
    }

}



#define XTFPGA_MMU_RESERVED_MEMORY_SIZE (128 * MiB)



static const hwaddr xtfpga_mmu_io[2] = {

    0xf0000000,

};
@@ -568,6 +570,7 @@ static void xtfpga_lx60_class_init(ObjectClass *oc, void *data) 
    mc->init = xtfpga_lx60_init;

    mc->max_cpus = 4;

    mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;

    mc->default_ram_size = 64 * MiB;

}



static const TypeInfo xtfpga_lx60_type = {
@@ -584,6 +587,7 @@ static void xtfpga_lx60_nommu_class_init(ObjectClass *oc, void *data) 
    mc->init = xtfpga_lx60_nommu_init;

    mc->max_cpus = 4;

    mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;

    mc->default_ram_size = 64 * MiB;

}



static const TypeInfo xtfpga_lx60_nommu_type = {
@@ -600,6 +604,7 @@ static void xtfpga_lx200_class_init(ObjectClass *oc, void *data) 
    mc->init = xtfpga_lx200_init;

    mc->max_cpus = 4;

    mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;

    mc->default_ram_size = 96 * MiB;

}



static const TypeInfo xtfpga_lx200_type = {
@@ -616,6 +621,7 @@ static void xtfpga_lx200_nommu_class_init(ObjectClass *oc, void *data) 
    mc->init = xtfpga_lx200_nommu_init;

    mc->max_cpus = 4;

    mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;

    mc->default_ram_size = 96 * MiB;

}



static const TypeInfo xtfpga_lx200_nommu_type = {
@@ -632,6 +638,7 @@ static void xtfpga_ml605_class_init(ObjectClass *oc, void *data) 
    mc->init = xtfpga_ml605_init;

    mc->max_cpus = 4;

    mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;

    mc->default_ram_size = 512 * MiB - XTFPGA_MMU_RESERVED_MEMORY_SIZE;

}



static const TypeInfo xtfpga_ml605_type = {
@@ -648,6 +655,7 @@ static void xtfpga_ml605_nommu_class_init(ObjectClass *oc, void *data) 
    mc->init = xtfpga_ml605_nommu_init;

    mc->max_cpus = 4;

    mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;

    mc->default_ram_size = 256 * MiB;

}



static const TypeInfo xtfpga_ml605_nommu_type = {
@@ -664,6 +672,7 @@ static void xtfpga_kc705_class_init(ObjectClass *oc, void *data) 
    mc->init = xtfpga_kc705_init;

    mc->max_cpus = 4;

    mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;

    mc->default_ram_size = 1 * GiB - XTFPGA_MMU_RESERVED_MEMORY_SIZE;

}



static const TypeInfo xtfpga_kc705_type = {
@@ -680,6 +689,7 @@ static void xtfpga_kc705_nommu_class_init(ObjectClass *oc, void *data) 
    mc->init = xtfpga_kc705_nommu_init;

    mc->max_cpus = 4;

    mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;

    mc->default_ram_size = 256 * MiB;

}



static const TypeInfo xtfpga_kc705_nommu_type = {

target/xtensa/core-dc232b.c

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ 
static XtensaConfig dc232b __attribute__((unused)) = {

    .name = "dc232b",

    .gdb_regmap = {

        .num_regs = 120,

        .num_core_regs = 52,

        .reg = {

#include "core-dc232b/gdb-config.inc.c"

        }

target/xtensa/core-dc232b/gdb-config.inc.c

+1 −0
Original line number Diff line number Diff line
@@ -259,3 +259,4 @@ 
          0, 0, 0, 0, 0, 0)

  XTREG(119, 476, 32, 4, 4, 0x000f, 0x0006, -2, 8, 0x0100, a15,

          0, 0, 0, 0, 0, 0)

  XTREG_END

target/xtensa/core-dc233c.c

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ 
static XtensaConfig dc233c __attribute__((unused)) = {

    .name = "dc233c",

    .gdb_regmap = {

        .num_regs = 121,

        .num_core_regs = 52,

        .reg = {

#include "core-dc233c/gdb-config.inc.c"

        }