9 files changed, 3 insertions, 28 deletions
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index 193f8d487..0ae287e77 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -124,8 +124,7 @@ def run(options, root, testsys, cpu_class):
             if options.fast_forward:
                 testsys.cpu[i].max_insts_any_thread = int(options.fast_forward)
             switch_cpus[i].system =  testsys
-            if not buildEnv['FULL_SYSTEM']:
-                switch_cpus[i].workload = testsys.cpu[i].workload
+            switch_cpus[i].workload = testsys.cpu[i].workload
             switch_cpus[i].clock = testsys.cpu[0].clock
             # simulation period
             if options.maxinsts:
@@ -148,9 +147,8 @@ def run(options, root, testsys, cpu_class):
         for i in xrange(np):
             switch_cpus[i].system =  testsys
             switch_cpus_1[i].system =  testsys
-            if not buildEnv['FULL_SYSTEM']:
-                switch_cpus[i].workload = testsys.cpu[i].workload
-                switch_cpus_1[i].workload = testsys.cpu[i].workload
+            switch_cpus[i].workload = testsys.cpu[i].workload
+            switch_cpus_1[i].workload = testsys.cpu[i].workload
             switch_cpus[i].clock = testsys.cpu[0].clock
             switch_cpus_1[i].clock = testsys.cpu[0].clock
 
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 9f41e24b9..4456212c9 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -47,9 +47,6 @@ from m5.defines import buildEnv
 from m5.objects import *
 from m5.util import addToPath, fatal
 
-if not buildEnv['FULL_SYSTEM']:
-    fatal("This script requires full-system mode (*_FS).")
-
 addToPath('../common')
 
 from FSConfig import *
diff --git a/configs/example/ruby_direct_test.py b/configs/example/ruby_direct_test.py
index d4843e866..28c7dde55 100644
--- a/configs/example/ruby_direct_test.py
+++ b/configs/example/ruby_direct_test.py
@@ -38,9 +38,6 @@ addToPath('../ruby')
 
 import Ruby
 
-if buildEnv['FULL_SYSTEM']:
-    panic("This script requires system-emulation mode (*_SE).")
-
 # Get paths we might need.  It's expected this file is in m5/configs/example.
 config_path = os.path.dirname(os.path.abspath(__file__))
 config_root = os.path.dirname(config_path)
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index e18ed95af..88021bffd 100644
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -40,9 +40,6 @@ from m5.defines import buildEnv
 from m5.objects import *
 from m5.util import addToPath, fatal
 
-if not buildEnv['FULL_SYSTEM']:
-    fatal("This script requires full-system mode (*_FS).")
-
 addToPath('../common')
 addToPath('../ruby')
 
diff --git a/configs/example/ruby_mem_test.py b/configs/example/ruby_mem_test.py
index a418c47eb..5b693f3f6 100644
--- a/configs/example/ruby_mem_test.py
+++ b/configs/example/ruby_mem_test.py
@@ -38,9 +38,6 @@ addToPath('../ruby')
 
 import Ruby
 
-if buildEnv['FULL_SYSTEM']:
-    panic("This script requires system-emulation mode (*_SE).")
-
 # Get paths we might need.  It's expected this file is in m5/configs/example.
 config_path = os.path.dirname(os.path.abspath(__file__))
 config_root = os.path.dirname(config_path)
diff --git a/configs/example/ruby_network_test.py b/configs/example/ruby_network_test.py
index b5d788bf5..79e6365af 100644
--- a/configs/example/ruby_network_test.py
+++ b/configs/example/ruby_network_test.py
@@ -37,9 +37,6 @@ addToPath('../common')
 addToPath('../ruby')
 import Ruby
 
-if buildEnv['FULL_SYSTEM']:
-    panic("This script requires system-emulation mode (*_SE).")
-
 # Get paths we might need.  It's expected this file is in m5/configs/example.
 config_path = os.path.dirname(os.path.abspath(__file__))
 config_root = os.path.dirname(config_path)
diff --git a/configs/example/ruby_random_test.py b/configs/example/ruby_random_test.py
index 4bf17d70b..4074b08f1 100644
--- a/configs/example/ruby_random_test.py
+++ b/configs/example/ruby_random_test.py
@@ -38,9 +38,6 @@ addToPath('../ruby')
 
 import Ruby
 
-if buildEnv['FULL_SYSTEM']:
-    panic("This script requires system-emulation mode (*_SE).")
-
 # Get paths we might need.  It's expected this file is in m5/configs/example.
 config_path = os.path.dirname(os.path.abspath(__file__))
 config_root = os.path.dirname(config_path)
diff --git a/configs/example/se.py b/configs/example/se.py
index f1dae9482..1edd99e9b 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -52,9 +52,6 @@ from m5.defines import buildEnv
 from m5.objects import *
 from m5.util import addToPath, fatal
 
-if buildEnv['FULL_SYSTEM']:
-    fatal("This script requires syscall emulation mode (*_SE).")
-
 addToPath('../common')
 addToPath('../ruby')
 
diff --git a/configs/ruby/Network_test.py b/configs/ruby/Network_test.py
index 0877ac00a..bbe7fe844 100644
--- a/configs/ruby/Network_test.py
+++ b/configs/ruby/Network_test.py
@@ -51,8 +51,6 @@ def create_system(options, system, piobus, dma_devices, ruby_system):
     #
     # The Garnet tester protocol does not support fs nor dma
     #
-    if buildEnv['FULL_SYSTEM']:
-        panic("This script requires system-emulation mode (*_SE).")
     assert(piobus == None)
     assert(dma_devices == [])