From 9b1af85c785f050e9c8ce8a30c3c12561d60503c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 4 May 2021 08:39:17 -0400 Subject: sim: mips: always enable device models There's no need to restrict these to only specific targets as the user can select them at runtime if they want them. Always build them so we can improve build coverage too. --- sim/mips/ChangeLog | 6 ++++++ sim/mips/configure | 10 +--------- sim/mips/configure.ac | 10 +--------- 3 files changed, 8 insertions(+), 18 deletions(-) (limited to 'sim') diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index c6ccfa0..3301767 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,5 +1,11 @@ 2021-05-04 Mike Frysinger + * configure.ac (hw_extra_devices): Inline contents into + SIM_AC_OPTION_HARDWARE and delete. + * configure: Regenerate. + +2021-05-04 Mike Frysinger + * Makefile.in (SIM_IGEN_OBJ): Change @mips_igen_engine@ to engine.o. (MIPS_EXTRA_LIB, SIM_EXTRA_LIBS): Delete. * configure.ac (mips_igen_engine, mips_extra_libs): Delete. diff --git a/sim/mips/configure b/sim/mips/configure index 4d2ada1..d690267 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -12584,16 +12584,8 @@ sim_micromips_flags=" -F ${sim_micromips_filter} ${sim_micromips_machine} ${si # # Add simulated hardware devices # -hw_extra_devices="" -case "${target}" in - mips*tx39*) - hw_extra_devices="tx3904cpu tx3904irc tx3904tmr tx3904sio" - ;; - *) - ;; -esac -hardware="cfi core pal glue $hw_extra_devices" +hardware="cfi core pal glue tx3904cpu tx3904irc tx3904tmr tx3904sio" sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac index 6c9a6b8..fee3816 100644 --- a/sim/mips/configure.ac +++ b/sim/mips/configure.ac @@ -426,15 +426,7 @@ AC_SUBST(sim_multi_obj) # # Add simulated hardware devices # -hw_extra_devices="" -case "${target}" in - mips*tx39*) - hw_extra_devices="tx3904cpu tx3904irc tx3904tmr tx3904sio" - ;; - *) - ;; -esac -SIM_AC_OPTION_HARDWARE($hw_extra_devices) +SIM_AC_OPTION_HARDWARE(tx3904cpu tx3904irc tx3904tmr tx3904sio) AC_PATH_X -- cgit v1.1