Skip to content

Commit

Permalink
rebrand as GNU MCU Eclipse
Browse files Browse the repository at this point in the history
  • Loading branch information
ilg-ul committed Jun 15, 2017
1 parent fd9c946 commit 2c04740
Show file tree
Hide file tree
Showing 52 changed files with 291 additions and 291 deletions.
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@

### Prerequisites

In case you encounter problems while using the GNU ARM Eclipse **QEMU**, please consider the following:
In case you encounter problems while using the **GNU MCU Eclipse QEMU**, please consider the following:

* [ ] read the documentation pages carefully
* [ ] check the [Known issues](http://gnuarmeclipse.github.io/support/known-issues/)
* [ ] check the [FAQ](http://gnuarmeclipse.github.io/support/faq/)
* [ ] check the [GNU ARM Eclipse forum](http://gnuarmeclipse.github.io/support/forum/) for similar problems
* [ ] check the GitHub Issues [tracker](https://github.com/gnuarmeclipse/qemu/issues/)
* [ ] check the [GNU MCU Eclipse forum](http://gnuarmeclipse.github.io/support/forum/) for similar problems
* [ ] check the GitHub Issues [tracker](https://github.com/gnu-mcu-eclipse/qemu/issues/)

If you still could not find a solution, if you have interesting use cases, if you have custom
configurations, and generally if you have any experience that you want to share with others,
use the [GNU ARM Eclipse forum](http://gnuarmeclipse.github.io/support/forum/).
use the [GNU MCU Eclipse forum](http://gnuarmeclipse.github.io/support/forum/).

Just [register](http://www.element14.com/community/create-account.jspa) to element14 community and use the [Start a discussion](http://www.element14.com/community/discussion/create.jspa?containerID=2436&containerType=700) link, with the QEMU category.

If you are convinced that you identified a bug (if you have doubts, use the forum), or you have a
pertinent suggestion how to enhance GNU ARM Eclipse QEMU, continue and register
pertinent suggestion how to enhance GNU MCU Eclipse QEMU, continue and register
an issue, but please keep in mind that QEMU is a separate project, and functional changes should normally be addressed to the original project developers.

### Description
Expand Down
8 changes: 4 additions & 4 deletions Makefile.objs
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ common-obj-y += page_cache.o

common-obj-$(CONFIG_SPICE) += spice-qemu-char.o

# [GNU ARM Eclipse]
ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n)
# [GNU MCU Eclipse]
ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n)
common-obj-y += audio/
endif
common-obj-y += hw/
Expand All @@ -68,8 +68,8 @@ common-obj-y += replay/

common-obj-y += ui/

# [GNU ARM Eclipse]
ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n)
# [GNU MCU Eclipse]
ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n)
common-obj-y += bt-host.o bt-vhci.o
endif

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[![GitHub release](https://img.shields.io/github/release/gnuarmeclipse/qemu.svg)](https://github.com/gnuarmeclipse/qemu/releases/latest) [![Github Releases](https://img.shields.io/github/downloads/gnuarmeclipse/qemu/latest/total.svg)](https://github.com/gnuarmeclipse/qemu/releases/latest) [![Github All Releases](https://img.shields.io/github/downloads/gnuarmeclipse/qemu/total.svg)](https://github.com/gnuarmeclipse/qemu/releases/latest)
[![GitHub release](https://img.shields.io/github/release/gnuarmeclipse/qemu.svg)](https://github.com/gnu-mcu-eclipse/qemu/releases/latest) [![Github Releases](https://img.shields.io/github/downloads/gnuarmeclipse/qemu/latest/total.svg)](https://github.com/gnu-mcu-eclipse/qemu/releases/latest) [![Github All Releases](https://img.shields.io/github/downloads/gnuarmeclipse/qemu/total.svg)](https://github.com/gnu-mcu-eclipse/qemu/releases/latest)

# GNU ARM Eclipse QEMU
# GNU MCU Eclipse QEMU

The [GNU ARM Eclipse QEMU](http://gnuarmeclipse.github.io/qemu) subproject is a fork of [QEMU](http://wiki.qemu.org/Main_Page) (an open source machine emulator), intended to provide support for Cortex-M emulation in GNU ARM Eclipse. The source code is part of the **GNU ARM Eclipse** project, and is available from [GitHub](https://github.com/gnuarmeclipse/qemu). Binary packages are available from [GitHub Releases](https://github.com/gnuarmeclipse/qemu/releases).
The [GNU MCU Eclipse QEMU](http://gnuarmeclipse.github.io/qemu) subproject is a fork of [QEMU](http://wiki.qemu.org/Main_Page) (an open source machine emulator), intended to provide support for Cortex-M emulation in GNU MCU Eclipse. The source code is part of the **GNU MCU Eclipse** project, and is available from [GitHub](https://github.com/gnu-mcu-eclipse/qemu). Binary packages are available from [GitHub Releases](https://github.com/gnu-mcu-eclipse/qemu/releases).

## How to use

* [Overview](http://gnuarmeclipse.github.io/qemu/) (read me first!)
* [QEMU Install](http://gnuarmeclipse.github.io/qemu/install)
* Eclipse plug-in
* [Support](https://github.com/gnuarmeclipse/qemu/issues/1) (using the GitHub Issues)
* [Support](https://github.com/gnu-mcu-eclipse/qemu/issues/1) (using the GitHub Issues)

## How to build

Expand All @@ -19,4 +19,4 @@ The [GNU ARM Eclipse QEMU](http://gnuarmeclipse.github.io/qemu) subproject is a
## Releases & binaries

See the [releases](http://gnuarmeclipse.github.io/qemu/releases) page.
Binaries for most platforms can be downloaded from [GitHub Releases](https://github.com/gnuarmeclipse/qemu/releases).
Binaries for most platforms can be downloaded from [GitHub Releases](https://github.com/gnu-mcu-eclipse/qemu/releases).
4 changes: 2 additions & 2 deletions arch_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ int qemu_read_default_config_files(bool userconfig)
}
ret = qemu_read_config_file(f->filename);

#if defined(CONFIG_GNU_ARM_ECLIPSE)
#if defined(CONFIG_GNU_MCU_ECLIPSE)
if (ret < 0 && ret != -ENOENT && ret != -EACCES) {
return ret;
}
#else
if (ret < 0 && ret != -ENOENT) {
return ret;
}
#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */
#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */

}

Expand Down
24 changes: 12 additions & 12 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,12 @@ tcmalloc="no"
jemalloc="no"
replication="yes"

# --- [GNU ARM Eclipse] ---
# --- [GNU MCU Eclipse] ---
gnuarmeclipse="no"
branding_message=""
semihosting_native="no"
verbose="no"
# --- [GNU ARM Eclipse] ---
# --- [GNU MCU Eclipse] ---

# parse CC options first
for opt do
Expand Down Expand Up @@ -744,13 +744,13 @@ case $opt in
esac
done

# --- [GNU ARM Eclipse] ---
# --- [GNU MCU Eclipse] ---
case $target_list in
gnuarmeclipse-softmmu)
gnuarmeclipse="yes"
semihosting_native="yes"
verbose="yes"
branding_message="GNU ARM Eclipse"
branding_message="GNU MCU Eclipse"
# convenience defs
debug_tcg="yes"
debug="yes"
Expand Down Expand Up @@ -778,7 +778,7 @@ case $target_list in
# fdt="no" # it fails
;;
esac
# --- [GNU ARM Eclipse] ---
# --- [GNU MCU Eclipse] ---

for opt do
optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'`
Expand Down Expand Up @@ -2664,21 +2664,21 @@ if test "$sdl" = "yes" ; then
#endif
int main(void) { return 0; }
EOF
# --- [GNU ARM Eclipse] ---
# --- [GNU MCU Eclipse] ---
echo "$sdl_cflags $x11_cflags" "$sdl_libs $x11_libs"
# --- [GNU ARM Eclipse] ---
# --- [GNU MCU Eclipse] ---
if compile_prog "$sdl_cflags $x11_cflags" "$sdl_libs $x11_libs" ; then
sdl_cflags="$sdl_cflags $x11_cflags"
sdl_libs="$sdl_libs $x11_libs"
fi
# --- [GNU ARM Eclipse] ---
# --- [GNU MCU Eclipse] ---
if test $sdlabi = "2.0"; then
sdl_libs="$sdl_libs -lSDL2_image"
elif test $sdlabi = "1.2"; then
sdl_libs="$sdl_libs -lSDL_image"
fi
echo "$sdl_cflags $x11_cflags" "$sdl_libs $x11_libs"
# --- [GNU ARM Eclipse] ---
# --- [GNU MCU Eclipse] ---
libs_softmmu="$sdl_libs $libs_softmmu"
fi

Expand Down Expand Up @@ -6253,9 +6253,9 @@ if test "$ccache_cpp2" = "yes"; then
echo "export CCACHE_CPP2=y" >> $config_host_mak
fi

# --- [GNU ARM Eclipse] ---
# --- [GNU MCU Eclipse] ---
if test "$gnuarmeclipse" = "yes"; then
echo "CONFIG_GNU_ARM_ECLIPSE=y" >> $config_host_mak
echo "CONFIG_GNU_MCU_ECLIPSE=y" >> $config_host_mak
fi

if test "$verbose" = "yes"; then
Expand All @@ -6269,7 +6269,7 @@ fi
if test ! -z "$branding_message"; then
echo "CONFIG_BRANDING_MESSAGE=\"$branding_message\"" >> $config_host_mak
fi
# --- [GNU ARM Eclipse] ---
# --- [GNU MCU Eclipse] ---

# build tree in object directory in case the source is not in the current directory
DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests"
Expand Down
4 changes: 2 additions & 2 deletions cpu-exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
#endif
#include "sysemu/replay.h"

#if defined(CONFIG_GNU_ARM_ECLIPSE)
#if defined(CONFIG_GNU_MCU_ECLIPSE)
#if defined(_WIN64)
#ifdef sigsetjmp
#undef sigsetjmp
#endif
#define sigsetjmp(env, savesigs) _setjmp(env, NULL)
#endif
#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */
#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */

/* -icount align implementation. */

Expand Down
4 changes: 2 additions & 2 deletions default-configs/gnuarmeclipse-softmmu.mak
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ CONFIG_STELLARIS_ENET=y
CONFIG_PTIMER=y
CONFIG_PCI=n

# [GNU ARM Eclipse]
# [GNU MCU Eclipse]
CONFIG_STM32=y
CONFIG_KINETIS=n
CONFIG_LPC=n
CONFIG_TIVA=n
CONFIG_XMC=n
CONFIG_SAM=n
# [GNU ARM Eclipse]
# [GNU MCU Eclipse]
10 changes: 5 additions & 5 deletions gdbstub.c
Original file line number Diff line number Diff line change
Expand Up @@ -1255,11 +1255,11 @@ static void gdb_vm_state_change(void *opaque, int running, RunState state)
const char *type;
int ret;

#if defined(CONFIG_GNU_ARM_ECLIPSE)
#if defined(CONFIG_GNU_MCU_ECLIPSE)
#if defined(DEBUG_GDB)
printf("vm_state %d, %d\n", running, state);
#endif
#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */
#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */

if (running || s->state == RS_INACTIVE) {
return;
Expand Down Expand Up @@ -1513,7 +1513,7 @@ void gdb_exit(CPUArchState *env, int code)
qemu_chr_delete(chr);
#endif

#if defined(CONFIG_GNU_ARM_ECLIPSE)
#if defined(CONFIG_GNU_MCU_ECLIPSE)
gdbserver_state = NULL;
#endif
}
Expand Down Expand Up @@ -1815,9 +1815,9 @@ int gdbserver_start(const char *device)
}
#endif

#if defined(CONFIG_GNU_ARM_ECLIPSE)
#if defined(CONFIG_GNU_MCU_ECLIPSE)
int gdbserver_is_started(void)
{
return (gdbserver_state != NULL);
}
#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */
#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */
4 changes: 2 additions & 2 deletions hw/9pfs/Makefile.objs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# [GNU ARM Eclipse]
# [GNU MCU Eclipse]
# Disable all.

ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n)
ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n)
common-obj-y = 9p.o
common-obj-y += 9p-local.o 9p-xattr.o
common-obj-y += 9p-xattr-user.o 9p-posix-acl.o
Expand Down
22 changes: 11 additions & 11 deletions hw/Makefile.objs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
devices-dirs-$(call land, $(CONFIG_VIRTIO),$(call land,$(CONFIG_VIRTFS),$(CONFIG_PCI))) += 9pfs/
devices-dirs-$(CONFIG_ACPI) += acpi/
# [GNU ARM Eclipse]
ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n)
# [GNU MCU Eclipse]
ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n)
devices-dirs-$(CONFIG_SOFTMMU) += adc/
devices-dirs-$(CONFIG_SOFTMMU) += audio/
devices-dirs-$(CONFIG_SOFTMMU) += block/
Expand All @@ -13,8 +13,8 @@ devices-dirs-$(CONFIG_SOFTMMU) += display/
devices-dirs-$(CONFIG_SOFTMMU) += dma/
devices-dirs-$(CONFIG_SOFTMMU) += gpio/
devices-dirs-$(CONFIG_SOFTMMU) += i2c/
# [GNU ARM Eclipse]
ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n)
# [GNU MCU Eclipse]
ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n)
devices-dirs-$(CONFIG_SOFTMMU) += ide/
endif
devices-dirs-$(CONFIG_SOFTMMU) += input/
Expand All @@ -26,8 +26,8 @@ devices-dirs-$(CONFIG_SOFTMMU) += misc/
devices-dirs-$(CONFIG_SOFTMMU) += net/
devices-dirs-$(CONFIG_SOFTMMU) += nvram/
devices-dirs-$(CONFIG_SOFTMMU) += pci/
# [GNU ARM Eclipse]
ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n)
# [GNU MCU Eclipse]
ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n)
devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
devices-dirs-$(CONFIG_SOFTMMU) += pcmcia/
devices-dirs-$(CONFIG_SOFTMMU) += scsi/
Expand All @@ -40,17 +40,17 @@ devices-dirs-$(CONFIG_SOFTMMU) += usb/
devices-dirs-$(CONFIG_SOFTMMU) += vfio/
devices-dirs-$(CONFIG_VIRTIO) += virtio/
devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
# [GNU ARM Eclipse]
ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n)
# [GNU MCU Eclipse]
ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n)
devices-dirs-$(CONFIG_SOFTMMU) += xen/
endif
devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/
devices-dirs-$(CONFIG_SMBIOS) += smbios/
devices-dirs-y += core/

# [GNU ARM Eclipse]
devices-dirs-$(CONFIG_GNU_ARM_ECLIPSE) += cortexm/
# [GNU ARM Eclipse]
# [GNU MCU Eclipse]
devices-dirs-$(CONFIG_GNU_MCU_ECLIPSE) += cortexm/
# [GNU MCU Eclipse]

common-obj-y += $(devices-dirs-y)
obj-y += $(devices-dirs-y)
8 changes: 4 additions & 4 deletions hw/arm/Makefile.objs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# [GNU ARM Eclipse]
# [GNU MCU Eclipse]
# Disable most.

# [GNU ARM Eclipse] boot.o required for TYPE_ARM_LINUX_BOOT_IF,
# [GNU MCU Eclipse] boot.o required for TYPE_ARM_LINUX_BOOT_IF,
# refered as interface by TYPE_ARM_GIC_COMMON, parent of TYPE_CORTEXM_NVIC
obj-y += boot.o

# [GNU ARM Eclipse] armv7m.o still needed for
# [GNU MCU Eclipse] armv7m.o still needed for
# the definition of "ARM,bitband-memory"
obj-y += armv7m.o

ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n)
ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n)
obj-y += collie.o exynos4_boards.o gumstix.o highbank.o
obj-$(CONFIG_DIGIC) += digic_boards.o
obj-y += integratorcp.o mainstone.o musicpal.o nseries.o
Expand Down
10 changes: 5 additions & 5 deletions hw/core/loader.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
#if defined(CONFIG_VERBOSE)
#include "verbosity.h"
#endif
#if defined(CONFIG_GNU_ARM_ECLIPSE)
#if defined(CONFIG_GNU_MCU_ECLIPSE)
#include "qemu/log.h"
#endif

Expand Down Expand Up @@ -1058,15 +1058,15 @@ int rom_add_option(const char *file, int32_t bootindex)
return rom_add_file(file, "genroms", 0, bootindex, true, NULL, NULL);
}

#if defined(CONFIG_GNU_ARM_ECLIPSE)
#if defined(CONFIG_GNU_MCU_ECLIPSE)
void rom_reset(void *unused)
#else
static void rom_reset(void *unused)
#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */
#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */
{
#if defined(CONFIG_GNU_ARM_ECLIPSE)
#if defined(CONFIG_GNU_MCU_ECLIPSE)
qemu_log_function_name();
#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */
#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */

Rom *rom;

Expand Down
Loading

0 comments on commit 2c04740

Please sign in to comment.