SE/FS: Pull FULL_SYSTEM out of the build_opts files

--HG--
rename : build_opts/ALPHA_FS => build_opts/ALPHA
rename : build_opts/ALPHA_SE_MESI_CMP_directory => build_opts/ALPHA_MESI_CMP_directory
rename : build_opts/ALPHA_SE_MOESI_CMP_directory => build_opts/ALPHA_MOESI_CMP_directory
rename : build_opts/ALPHA_SE_MOESI_CMP_token => build_opts/ALPHA_MOESI_CMP_token
rename : build_opts/ALPHA_SE_MOESI_hammer => build_opts/ALPHA_MOESI_hammer
rename : build_opts/ALPHA_SE_Network_test => build_opts/ALPHA_Network_test
rename : build_opts/ARM_FS => build_opts/ARM
rename : build_opts/MIPS_SE => build_opts/MIPS
rename : build_opts/POWER_SE => build_opts/POWER
rename : build_opts/SPARC_FS => build_opts/SPARC
rename : build_opts/X86_FS => build_opts/X86

diff --git a/build_opts/ALPHA b/build_opts/ALPHA
new file mode 100644 (file)
index 0000000..3843940
--- /dev/null
+++ b/build_opts/ALPHA
@@ -0,0 +1,4 @@
+TARGET_ISA = 'alpha'
+SS_COMPATIBLE_FP = 1
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+PROTOCOL = 'MI_example'

diff --git a/build_opts/ALPHA_FS b/build_opts/ALPHA_FS
deleted file mode 100644 (file)
index ffe5326..0000000
--- a/build_opts/ALPHA_FS
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ISA = 'alpha'
-FULL_SYSTEM = 1
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
-PROTOCOL = 'MI_example'

diff --git a/build_opts/ALPHA_MESI_CMP_directory b/build_opts/ALPHA_MESI_CMP_directory
new file mode 100644 (file)
index 0000000..32eeb0d
--- /dev/null
+++ b/build_opts/ALPHA_MESI_CMP_directory
@@ -0,0 +1,3 @@
+SS_COMPATIBLE_FP = 1
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+PROTOCOL = 'MESI_CMP_directory'

diff --git a/build_opts/ALPHA_MOESI_CMP_directory b/build_opts/ALPHA_MOESI_CMP_directory
new file mode 100644 (file)
index 0000000..be42e63
--- /dev/null
+++ b/build_opts/ALPHA_MOESI_CMP_directory
@@ -0,0 +1,3 @@
+SS_COMPATIBLE_FP = 1
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+PROTOCOL = 'MOESI_CMP_directory'

diff --git a/build_opts/ALPHA_MOESI_CMP_token b/build_opts/ALPHA_MOESI_CMP_token
new file mode 100644 (file)
index 0000000..0c94391
--- /dev/null
+++ b/build_opts/ALPHA_MOESI_CMP_token
@@ -0,0 +1,3 @@
+SS_COMPATIBLE_FP = 1
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+PROTOCOL = 'MOESI_CMP_token'

diff --git a/build_opts/ALPHA_MOESI_hammer b/build_opts/ALPHA_MOESI_hammer
new file mode 100644 (file)
index 0000000..99e8f68
--- /dev/null
+++ b/build_opts/ALPHA_MOESI_hammer
@@ -0,0 +1,3 @@
+SS_COMPATIBLE_FP = 1
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+PROTOCOL = 'MOESI_hammer'

diff --git a/build_opts/ALPHA_Network_test b/build_opts/ALPHA_Network_test
new file mode 100644 (file)
index 0000000..90bec0c
--- /dev/null
+++ b/build_opts/ALPHA_Network_test
@@ -0,0 +1,3 @@
+SS_COMPATIBLE_FP = 1
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+PROTOCOL = 'Network_test'

diff --git a/build_opts/ALPHA_SE b/build_opts/ALPHA_SE
deleted file mode 100644 (file)
index b21fec4..0000000
--- a/build_opts/ALPHA_SE
+++ /dev/null
@@ -1,4 +0,0 @@
-FULL_SYSTEM = 0
-SS_COMPATIBLE_FP = 1
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
-PROTOCOL = 'MI_example'

diff --git a/build_opts/ALPHA_SE_MESI_CMP_directory b/build_opts/ALPHA_SE_MESI_CMP_directory
deleted file mode 100644 (file)
index c55731b..0000000
--- a/build_opts/ALPHA_SE_MESI_CMP_directory
+++ /dev/null
@@ -1,4 +0,0 @@
-FULL_SYSTEM = 0
-SS_COMPATIBLE_FP = 1
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
-PROTOCOL = 'MESI_CMP_directory'

diff --git a/build_opts/ALPHA_SE_MOESI_CMP_directory b/build_opts/ALPHA_SE_MOESI_CMP_directory
deleted file mode 100644 (file)
index 5edc768..0000000
--- a/build_opts/ALPHA_SE_MOESI_CMP_directory
+++ /dev/null
@@ -1,4 +0,0 @@
-FULL_SYSTEM = 0
-SS_COMPATIBLE_FP = 1
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
-PROTOCOL = 'MOESI_CMP_directory'

diff --git a/build_opts/ALPHA_SE_MOESI_CMP_token b/build_opts/ALPHA_SE_MOESI_CMP_token
deleted file mode 100644 (file)
index f69c2c4..0000000
--- a/build_opts/ALPHA_SE_MOESI_CMP_token
+++ /dev/null
@@ -1,4 +0,0 @@
-FULL_SYSTEM = 0
-SS_COMPATIBLE_FP = 1
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
-PROTOCOL = 'MOESI_CMP_token'

diff --git a/build_opts/ALPHA_SE_MOESI_hammer b/build_opts/ALPHA_SE_MOESI_hammer
deleted file mode 100644 (file)
index f21ca5e..0000000
--- a/build_opts/ALPHA_SE_MOESI_hammer
+++ /dev/null
@@ -1,4 +0,0 @@
-FULL_SYSTEM = 0
-SS_COMPATIBLE_FP = 1
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
-PROTOCOL = 'MOESI_hammer'

diff --git a/build_opts/ALPHA_SE_Network_test b/build_opts/ALPHA_SE_Network_test
deleted file mode 100644 (file)
index 77426d3..0000000
--- a/build_opts/ALPHA_SE_Network_test
+++ /dev/null
@@ -1,4 +0,0 @@
-FULL_SYSTEM = 0
-SS_COMPATIBLE_FP = 1
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
-PROTOCOL = 'Network_test'

diff --git a/build_opts/ARM b/build_opts/ARM
new file mode 100644 (file)
index 0000000..9c27c0d
--- /dev/null
+++ b/build_opts/ARM
@@ -0,0 +1,3 @@
+TARGET_ISA = 'arm'
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
+PROTOCOL = 'MI_example'

diff --git a/build_opts/ARM_FS b/build_opts/ARM_FS
deleted file mode 100644 (file)
index f6b2d9e..0000000
--- a/build_opts/ARM_FS
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ISA = 'arm'
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
-FULL_SYSTEM = 1
-PROTOCOL = 'MI_example'

diff --git a/build_opts/ARM_SE b/build_opts/ARM_SE
deleted file mode 100644 (file)
index 1d89b87..0000000
--- a/build_opts/ARM_SE
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ISA = 'arm'
-FULL_SYSTEM = 0
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
-PROTOCOL = 'MI_example'

diff --git a/build_opts/MIPS b/build_opts/MIPS
new file mode 100644 (file)
index 0000000..82a9d62
--- /dev/null
+++ b/build_opts/MIPS
@@ -0,0 +1,3 @@
+TARGET_ISA = 'mips'
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+PROTOCOL = 'MI_example'

diff --git a/build_opts/MIPS_SE b/build_opts/MIPS_SE
deleted file mode 100644 (file)
index 0855578..0000000
--- a/build_opts/MIPS_SE
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ISA = 'mips'
-FULL_SYSTEM = 0
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
-PROTOCOL = 'MI_example'

diff --git a/build_opts/POWER b/build_opts/POWER
new file mode 100644 (file)
index 0000000..672046c
--- /dev/null
+++ b/build_opts/POWER
@@ -0,0 +1,3 @@
+TARGET_ISA = 'power'
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
+PROTOCOL = 'MI_example'

diff --git a/build_opts/POWER_SE b/build_opts/POWER_SE
deleted file mode 100644 (file)
index 13e175e..0000000
--- a/build_opts/POWER_SE
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ISA = 'power'
-FULL_SYSTEM = 0
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
-PROTOCOL = 'MI_example'

diff --git a/build_opts/SPARC b/build_opts/SPARC
new file mode 100644 (file)
index 0000000..e992b8c
--- /dev/null
+++ b/build_opts/SPARC
@@ -0,0 +1,3 @@
+TARGET_ISA = 'sparc'
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+PROTOCOL = 'MI_example'

diff --git a/build_opts/SPARC_FS b/build_opts/SPARC_FS
deleted file mode 100644 (file)
index f1dd814..0000000
--- a/build_opts/SPARC_FS
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ISA = 'sparc'
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU'
-FULL_SYSTEM = 1
-PROTOCOL = 'MI_example'

diff --git a/build_opts/SPARC_SE b/build_opts/SPARC_SE
deleted file mode 100644 (file)
index a76d7a8..0000000
--- a/build_opts/SPARC_SE
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ISA = 'sparc'
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
-FULL_SYSTEM = 0
-PROTOCOL = 'MI_example'

diff --git a/build_opts/X86 b/build_opts/X86
new file mode 100644 (file)
index 0000000..64d163c
--- /dev/null
+++ b/build_opts/X86
@@ -0,0 +1,3 @@
+TARGET_ISA = 'x86'
+CPU_MODELS = 'AtomicSimpleCPU,O3CPU,TimingSimpleCPU'
+PROTOCOL = 'MI_example'

diff --git a/build_opts/X86_FS b/build_opts/X86_FS
deleted file mode 100644 (file)
index ddec618..0000000
--- a/build_opts/X86_FS
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ISA = 'x86'
-CPU_MODELS = 'AtomicSimpleCPU,O3CPU,TimingSimpleCPU'
-FULL_SYSTEM = 1
-PROTOCOL = 'MI_example'

diff --git a/build_opts/X86_SE b/build_opts/X86_SE
deleted file mode 100644 (file)
index 14f3507..0000000
--- a/build_opts/X86_SE
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ISA = 'x86'
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
-FULL_SYSTEM = 0
-PROTOCOL = 'MI_example'