Commit 62d02896 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target/xtensa fixes for 2.12:

- add .inc. to non-top level source file names under target/xtensa;
- fix #include <xtensa-isa.h> in the import_core.sh script;
- remove stray linux-user/xtensa/syscall.h;
- fix timers test.

# gpg: Signature made Mon 26 Mar 2018 22:40:20 BST
# 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/20180326-xtensa:
  target/xtensa: fix timers test
  linux-user/xtensa: remove stray syscall.h
  target/xtensa/import_core.sh: fix #include <xtensa-isa.h>
  target/xtensa: add .inc. to non-top level source file names

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents bdc408e9 d0ce7e9c

linux-user/xtensa/syscall.h

deleted100644 → 0
+0 −0

Empty file deleted.

target/xtensa/core-dc232b.c

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "overlay_tool.h"



#define xtensa_modules xtensa_modules_dc232b

#include "core-dc232b/xtensa-modules.c"

#include "core-dc232b/xtensa-modules.inc.c"



static XtensaConfig dc232b __attribute__((unused)) = {

    .name = "dc232b",
@@ -43,11 +43,11 @@ static XtensaConfig dc232b __attribute__((unused)) = { 
        .num_regs = 120,

        .num_core_regs = 52,

        .reg = {

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

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

        }

    },

    .isa_internal = &xtensa_modules,

    .clock_freq_khz = 10000,

    .clock_freq_khz = (NANOSECONDS_PER_SECOND / 64) / 1000,

    DEFAULT_SECTIONS

};

target/xtensa/core-dc233c.c

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include "overlay_tool.h"



#define xtensa_modules xtensa_modules_dc233c

#include "core-dc233c/xtensa-modules.c"

#include "core-dc233c/xtensa-modules.inc.c"



static XtensaConfig dc233c __attribute__((unused)) = {

    .name = "dc233c",
@@ -44,7 +44,7 @@ static XtensaConfig dc233c __attribute__((unused)) = { 
        .num_regs = 121,

        .num_core_regs = 52,

        .reg = {

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

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

        }

    },

    .isa_internal = &xtensa_modules,