Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial set of DR-05 related patches #1

Open
wants to merge 16 commits into
base: bfin
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ F: disas/arm.c
F: disas/arm-a64.cc
F: disas/libvixl/

Blackfin
M: Mike Frysinger <[email protected]>
S: Maintained
F: target-bfin/
F: hw/bfin/
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, i've squashed this into an earlier patch in the series


CRIS
M: Edgar E. Iglesias <[email protected]>
S: Maintained
Expand Down
2 changes: 2 additions & 0 deletions arch_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ int graphic_depth = 32;
#define QEMU_ARCH QEMU_ARCH_ALPHA
#elif defined(TARGET_ARM)
#define QEMU_ARCH QEMU_ARCH_ARM
#elif defined(TARGET_BFIN)
#define QEMU_ARCH QEMU_ARCH_BFIN
#elif defined(TARGET_CRIS)
#define QEMU_ARCH QEMU_ARCH_CRIS
#elif defined(TARGET_I386)
Expand Down
11 changes: 9 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ strip="${STRIP-${cross_prefix}strip}"
windres="${WINDRES-${cross_prefix}windres}"
pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
query_pkg_config() {
"${pkg_config_exe}" ${QEMU_PKG_CONFIG_FLAGS} "$@"
${pkg_config_exe} ${QEMU_PKG_CONFIG_FLAGS} "$@"
}
pkg_config=query_pkg_config
sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"
Expand Down Expand Up @@ -1762,7 +1762,7 @@ fi
##########################################
# pkg-config probe

if ! has "$pkg_config_exe"; then
if ! has $pkg_config_exe; then
error_exit "pkg-config binary '$pkg_config_exe' not found"
fi

Expand Down Expand Up @@ -5663,6 +5663,9 @@ case "$target_name" in
bflt="yes"
gdb_xml_files="aarch64-core.xml aarch64-fpu.xml arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"
;;
bfin)
bflt="yes"
;;
cris)
;;
lm32)
Expand Down Expand Up @@ -5861,6 +5864,10 @@ for i in $ARCH $TARGET_BASE_ARCH ; do
disas_config "ARM_A64"
fi
;;
bfin)
echo "CONFIG_BFIN_DIS=y" >> $config_target_mak
echo "CONFIG_BFIN_DIS=y" >> config-all-disas.mak
;;
cris)
disas_config "CRIS"
;;
Expand Down
1 change: 1 addition & 0 deletions default-configs/bfin-linux-user.mak
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Default configuration for bfin-linux-user
12 changes: 12 additions & 0 deletions default-configs/bfin-softmmu.mak
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Default configuration for arm-softmmu

CONFIG_NAND=y
CONFIG_ECC=y
CONFIG_SERIAL=y
CONFIG_SD=y
CONFIG_SSI_SD=y
CONFIG_SMC91C111=y
CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_SSI=y
CONFIG_SSI_M25P80=y
3 changes: 3 additions & 0 deletions disas.c
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,9 @@ void disas(FILE *out, void *code, unsigned long size)
s.info.mach = bfd_mach_sparc_v9b;
#elif defined(__arm__)
print_insn = print_insn_arm;
#elif defined(__bfin__)
s.info.mach = bfd_mach_bfin;
print_insn = print_insn_bfin;
#elif defined(__MIPSEB__)
print_insn = print_insn_big_mips;
#elif defined(__MIPSEL__)
Expand Down
1 change: 1 addition & 0 deletions disas/Makefile.objs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ libvixldir = $(SRC_PATH)/disas/libvixl
# some signed-unsigned equality comparisons in libvixl which later gcc
# versions do not.
arm-a64.o-cflags := -I$(libvixldir) -Wno-sign-compare
common-obj-$(CONFIG_BFIN_DIS) += bfin.o
common-obj-$(CONFIG_CRIS_DIS) += cris.o
common-obj-$(CONFIG_HPPA_DIS) += hppa.o
common-obj-$(CONFIG_I386_DIS) += i386.o
Expand Down
Loading