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.

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index c6ccfa0a7826cedb4707aac3ce14d539bc7d5d68..3301767f3c7a24b3b4dea8b30170d9bd5661b04f 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,9 @@
+2021-05-04  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure.ac (hw_extra_devices): Inline contents into
+       SIM_AC_OPTION_HARDWARE and delete.
+       * configure: Regenerate.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * Makefile.in (SIM_IGEN_OBJ): Change @mips_igen_engine@ to engine.o.

diff --git a/sim/mips/configure b/sim/mips/configure
index 4d2ada1f4d61a5de3f68bb6786d68109a12b906e..d6902677a654010d822a762875b1181f169becaa 100755 (executable)
--- 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 6c9a6b812e38934c388226ec406f487c5878ad51..fee3816b57afb5c24ece8f76f96c7672fbb60b94 100644 (file)
--- 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