[2/2] sim: mips: always enable device models

Message ID 20210504124257.3734-2-vapier@gentoo.org
State New
Headers show
Series
  • [1/2] sim: mips: delete unused constant variables
Related show

Commit Message

Weimin Pan via Gdb-patches May 4, 2021, 12:42 p.m.
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/configure    | 10 +---------
 sim/mips/configure.ac | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

-- 
2.31.1

Patch

diff --git a/sim/mips/configure b/sim/mips/configure
index 4d2ada1f4d61..d6902677a654 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 6c9a6b812e38..fee3816b57af 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