| Message ID | 20180322180940.8253-2-jcmvbkbc@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | target/xtensa: improvements for core-specific files | expand |
On 03/22/2018 01:09 PM, Max Filippov wrote: > Fix definitions of existing cores and core importing script. This mentions the script... > > Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> > --- > target/xtensa/core-dc232b.c | 4 ++-- > target/xtensa/core-dc232b/{gdb-config.c => gdb-config.inc.c} | 0 > target/xtensa/core-dc232b/{xtensa-modules.c => xtensa-modules.inc.c} | 0 > target/xtensa/core-dc233c.c | 4 ++-- > target/xtensa/core-dc233c/{gdb-config.c => gdb-config.inc.c} | 0 > target/xtensa/core-dc233c/{xtensa-modules.c => xtensa-modules.inc.c} | 0 > target/xtensa/core-de212.c | 4 ++-- > target/xtensa/core-de212/{gdb-config.c => gdb-config.inc.c} | 0 > target/xtensa/core-de212/{xtensa-modules.c => xtensa-modules.inc.c} | 0 > target/xtensa/core-fsf.c | 2 +- > target/xtensa/core-fsf/{xtensa-modules.c => xtensa-modules.inc.c} | 0 > target/xtensa/core-sample_controller.c | 4 ++-- > .../xtensa/core-sample_controller/{gdb-config.c => gdb-config.inc.c} | 0 > .../core-sample_controller/{xtensa-modules.c => xtensa-modules.inc.c} | 0 > 14 files changed, 9 insertions(+), 9 deletions(-) ...but only touches .c files.
On Thu, Mar 22, 2018 at 12:16 PM, Eric Blake <eblake@redhat.com> wrote: > On 03/22/2018 01:09 PM, Max Filippov wrote: >> >> Fix definitions of existing cores and core importing script. > > This mentions the script... > ...but only touches .c files. Yeah, I initially did it in a single patch, but then split it into two. Will merge them back as suggested.
On 03/22/2018 05:37 PM, Max Filippov wrote: > On Thu, Mar 22, 2018 at 12:16 PM, Eric Blake <eblake@redhat.com> wrote: >> On 03/22/2018 01:09 PM, Max Filippov wrote: >>> >>> Fix definitions of existing cores and core importing script. >> >> This mentions the script... >> ...but only touches .c files. > > Yeah, I initially did it in a single patch, but then split it into > two. Will merge > them back as suggested. > squashed with #2 (import_core.sh): Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/target/xtensa/core-dc232b.c b/target/xtensa/core-dc232b.c index fe80582df465..aa07018af4e7 100644 --- a/target/xtensa/core-dc232b.c +++ b/target/xtensa/core-dc232b.c @@ -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,7 +43,7 @@ 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, diff --git a/target/xtensa/core-dc232b/gdb-config.c b/target/xtensa/core-dc232b/gdb-config.inc.c similarity index 100% rename from target/xtensa/core-dc232b/gdb-config.c rename to target/xtensa/core-dc232b/gdb-config.inc.c diff --git a/target/xtensa/core-dc232b/xtensa-modules.c b/target/xtensa/core-dc232b/xtensa-modules.inc.c similarity index 100% rename from target/xtensa/core-dc232b/xtensa-modules.c rename to target/xtensa/core-dc232b/xtensa-modules.inc.c diff --git a/target/xtensa/core-dc233c.c b/target/xtensa/core-dc233c.c index 00301c28a2e8..8296e6fa109a 100644 --- a/target/xtensa/core-dc233c.c +++ b/target/xtensa/core-dc233c.c @@ -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, diff --git a/target/xtensa/core-dc233c/gdb-config.c b/target/xtensa/core-dc233c/gdb-config.inc.c similarity index 100% rename from target/xtensa/core-dc233c/gdb-config.c rename to target/xtensa/core-dc233c/gdb-config.inc.c diff --git a/target/xtensa/core-dc233c/xtensa-modules.c b/target/xtensa/core-dc233c/xtensa-modules.inc.c similarity index 100% rename from target/xtensa/core-dc233c/xtensa-modules.c rename to target/xtensa/core-dc233c/xtensa-modules.inc.c diff --git a/target/xtensa/core-de212.c b/target/xtensa/core-de212.c index 466a467f7fa0..53775a97fae0 100644 --- a/target/xtensa/core-de212.c +++ b/target/xtensa/core-de212.c @@ -36,13 +36,13 @@ #include "overlay_tool.h" #define xtensa_modules xtensa_modules_de212 -#include "core-de212/xtensa-modules.c" +#include "core-de212/xtensa-modules.inc.c" static XtensaConfig de212 __attribute__((unused)) = { .name = "de212", .gdb_regmap = { .reg = { -#include "core-de212/gdb-config.c" +#include "core-de212/gdb-config.inc.c" } }, .isa_internal = &xtensa_modules, diff --git a/target/xtensa/core-de212/gdb-config.c b/target/xtensa/core-de212/gdb-config.inc.c similarity index 100% rename from target/xtensa/core-de212/gdb-config.c rename to target/xtensa/core-de212/gdb-config.inc.c diff --git a/target/xtensa/core-de212/xtensa-modules.c b/target/xtensa/core-de212/xtensa-modules.inc.c similarity index 100% rename from target/xtensa/core-de212/xtensa-modules.c rename to target/xtensa/core-de212/xtensa-modules.inc.c diff --git a/target/xtensa/core-fsf.c b/target/xtensa/core-fsf.c index f41de9a1aa05..01932bdc8b15 100644 --- a/target/xtensa/core-fsf.c +++ b/target/xtensa/core-fsf.c @@ -36,7 +36,7 @@ #include "overlay_tool.h" #define xtensa_modules xtensa_modules_fsf -#include "core-fsf/xtensa-modules.c" +#include "core-fsf/xtensa-modules.inc.c" static XtensaConfig fsf __attribute__((unused)) = { .name = "fsf", diff --git a/target/xtensa/core-fsf/xtensa-modules.c b/target/xtensa/core-fsf/xtensa-modules.inc.c similarity index 100% rename from target/xtensa/core-fsf/xtensa-modules.c rename to target/xtensa/core-fsf/xtensa-modules.inc.c diff --git a/target/xtensa/core-sample_controller.c b/target/xtensa/core-sample_controller.c index 879e853a9224..c622335ca5a2 100644 --- a/target/xtensa/core-sample_controller.c +++ b/target/xtensa/core-sample_controller.c @@ -36,13 +36,13 @@ #include "overlay_tool.h" #define xtensa_modules xtensa_modules_sample_controller -#include "core-sample_controller/xtensa-modules.c" +#include "core-sample_controller/xtensa-modules.inc.c" static XtensaConfig sample_controller __attribute__((unused)) = { .name = "sample_controller", .gdb_regmap = { .reg = { -#include "core-sample_controller/gdb-config.c" +#include "core-sample_controller/gdb-config.inc.c" } }, .isa_internal = &xtensa_modules, diff --git a/target/xtensa/core-sample_controller/gdb-config.c b/target/xtensa/core-sample_controller/gdb-config.inc.c similarity index 100% rename from target/xtensa/core-sample_controller/gdb-config.c rename to target/xtensa/core-sample_controller/gdb-config.inc.c diff --git a/target/xtensa/core-sample_controller/xtensa-modules.c b/target/xtensa/core-sample_controller/xtensa-modules.inc.c similarity index 100% rename from target/xtensa/core-sample_controller/xtensa-modules.c rename to target/xtensa/core-sample_controller/xtensa-modules.inc.c
Fix definitions of existing cores and core importing script. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> --- target/xtensa/core-dc232b.c | 4 ++-- target/xtensa/core-dc232b/{gdb-config.c => gdb-config.inc.c} | 0 target/xtensa/core-dc232b/{xtensa-modules.c => xtensa-modules.inc.c} | 0 target/xtensa/core-dc233c.c | 4 ++-- target/xtensa/core-dc233c/{gdb-config.c => gdb-config.inc.c} | 0 target/xtensa/core-dc233c/{xtensa-modules.c => xtensa-modules.inc.c} | 0 target/xtensa/core-de212.c | 4 ++-- target/xtensa/core-de212/{gdb-config.c => gdb-config.inc.c} | 0 target/xtensa/core-de212/{xtensa-modules.c => xtensa-modules.inc.c} | 0 target/xtensa/core-fsf.c | 2 +- target/xtensa/core-fsf/{xtensa-modules.c => xtensa-modules.inc.c} | 0 target/xtensa/core-sample_controller.c | 4 ++-- .../xtensa/core-sample_controller/{gdb-config.c => gdb-config.inc.c} | 0 .../core-sample_controller/{xtensa-modules.c => xtensa-modules.inc.c} | 0 14 files changed, 9 insertions(+), 9 deletions(-) rename target/xtensa/core-dc232b/{gdb-config.c => gdb-config.inc.c} (100%) rename target/xtensa/core-dc232b/{xtensa-modules.c => xtensa-modules.inc.c} (100%) rename target/xtensa/core-dc233c/{gdb-config.c => gdb-config.inc.c} (100%) rename target/xtensa/core-dc233c/{xtensa-modules.c => xtensa-modules.inc.c} (100%) rename target/xtensa/core-de212/{gdb-config.c => gdb-config.inc.c} (100%) rename target/xtensa/core-de212/{xtensa-modules.c => xtensa-modules.inc.c} (100%) rename target/xtensa/core-fsf/{xtensa-modules.c => xtensa-modules.inc.c} (100%) rename target/xtensa/core-sample_controller/{gdb-config.c => gdb-config.inc.c} (100%) rename target/xtensa/core-sample_controller/{xtensa-modules.c => xtensa-modules.inc.c} (100%)