scons: Update the Kconfig build options

The CL updates the Kconfig: 1. Replace the USE_NULL_ISA with BUILD_ISA 2. The USE_XXX_ISAs are depends on BUILD_ISA 3. If the BUILD_ISA is set, at least one of USE_XXX_ISAs must be set 4. Refactor the USE_KVM option Change-Id: I2a600dea9fb671263b0191c46c5790ebbe91a7b8
2023-09-14 11:41:40 +08:00
parent d37673be9f
commit d758df4b5c
31 changed files with 47 additions and 55 deletions
--- a/build_opts/ALL
+++ b/build_opts/ALL
@@ -1,5 +1,6 @@
 RUBY=y
 RUBY_PROTOCOL_MESI_TWO_LEVEL=y
+BUILD_ISA=y
 USE_ARM_ISA=y
 USE_MIPS_ISA=y
 USE_POWER_ISA=y
--- a/build_opts/ARM
+++ b/build_opts/ARM
@@ -1,3 +1,4 @@
+BUILD_ISA=y
 USE_ARM_ISA=y
 RUBY=y
 RUBY_PROTOCOL_CHI=y
--- a/build_opts/ARM_MESI_Three_Level
+++ b/build_opts/ARM_MESI_Three_Level
@@ -1,3 +1,4 @@
+BUILD_ISA=y
 USE_ARM_ISA=y
 RUBY=y
 RUBY_PROTOCOL_MESI_THREE_LEVEL=y
--- a/build_opts/ARM_MESI_Three_Level_HTM
+++ b/build_opts/ARM_MESI_Three_Level_HTM
@@ -1,3 +1,4 @@
+BUILD_ISA=y
 USE_ARM_ISA=y
 RUBY=y
 RUBY_PROTOCOL_MESI_THREE_LEVEL_HTM=y
--- a/build_opts/ARM_MOESI_hammer
+++ b/build_opts/ARM_MOESI_hammer
@@ -1,3 +1,4 @@
+BUILD_ISA=y
 USE_ARM_ISA=y
 RUBY=y
 RUBY_PROTOCOL_MOESI_HAMMER=y
--- a/build_opts/GCN3_X86
+++ b/build_opts/GCN3_X86
@@ -1,5 +1,6 @@
 RUBY=y
 RUBY_PROTOCOL_GPU_VIPER=y
+BUILD_ISA=y
 USE_X86_ISA=y
 GCN3_GPU_ISA=y
 BUILD_GPU=y
--- a/build_opts/Garnet_standalone
+++ b/build_opts/Garnet_standalone
@@ -1,3 +1,2 @@
 RUBY=y
 RUBY_PROTOCOL_GARNET_STANDALONE=y
-USE_NULL_ISA=y
--- a/build_opts/MIPS
+++ b/build_opts/MIPS
@@ -1,3 +1,4 @@
 RUBY=y
 RUBY_PROTOCOL_MI_EXAMPLE=y
+BUILD_ISA=y
 USE_MIPS_ISA=y
--- a/build_opts/NULL
+++ b/build_opts/NULL
@@ -1,3 +1,2 @@
 RUBY=y
 RUBY_PROTOCOL_MI_EXAMPLE=y
-USE_NULL_ISA=y
--- a/build_opts/NULL_MESI_Two_Level
+++ b/build_opts/NULL_MESI_Two_Level
@@ -1,3 +1,2 @@
 RUBY=y
 RUBY_PROTOCOL_MESI_TWO_LEVEL=y
-USE_NULL_ISA=y
--- a/build_opts/NULL_MOESI_CMP_directory
+++ b/build_opts/NULL_MOESI_CMP_directory
@@ -1,3 +1,2 @@
 RUBY=y
 RUBY_PROTOCOL_MOESI_CMP_DIRECTORY=y
-USE_NULL_ISA=y
--- a/build_opts/NULL_MOESI_CMP_token
+++ b/build_opts/NULL_MOESI_CMP_token
@@ -1,3 +1,2 @@
 RUBY=y
 RUBY_PROTOCOL_MOESI_CMP_TOKEN=y
-USE_NULL_ISA=y
--- a/build_opts/NULL_MOESI_hammer
+++ b/build_opts/NULL_MOESI_hammer
@@ -1,3 +1,2 @@
 RUBY=y
 RUBY_PROTOCOL_MOESI_HAMMER=y
-USE_NULL_ISA=y
--- a/build_opts/POWER
+++ b/build_opts/POWER
@@ -1,3 +1,4 @@
 RUBY=y
 RUBY_PROTOCOL_MI_EXAMPLE=y
+BUILD_ISA=y
 USE_POWER_ISA=y
--- a/build_opts/RISCV
+++ b/build_opts/RISCV
@@ -1,3 +1,4 @@
 RUBY=y
 RUBY_PROTOCOL_MI_EXAMPLE=y
+BUILD_ISA=y
 USE_RISCV_ISA=y
--- a/build_opts/SPARC
+++ b/build_opts/SPARC
@@ -1,3 +1,4 @@
 RUBY=y
 RUBY_PROTOCOL_MI_EXAMPLE=y
+BUILD_ISA=y
 USE_SPARC_ISA=y
--- a/build_opts/VEGA_X86
+++ b/build_opts/VEGA_X86
@@ -1,5 +1,6 @@
 RUBY=y
 RUBY_PROTOCOL_GPU_VIPER=y
+BUILD_ISA=y
 USE_X86_ISA=y
 VEGA_GPU_ISA=y
 BUILD_GPU=y
--- a/build_opts/X86
+++ b/build_opts/X86
@@ -1,4 +1,5 @@
 RUBY=y
 NUMBER_BITS_PER_SET=128
 RUBY_PROTOCOL_MESI_TWO_LEVEL=y
+BUILD_ISA=y
 USE_X86_ISA=y
--- a/build_opts/X86_MESI_Two_Level
+++ b/build_opts/X86_MESI_Two_Level
@@ -1,4 +1,5 @@
 RUBY=y
 NUMBER_BITS_PER_SET=128
 RUBY_PROTOCOL_MESI_TWO_LEVEL=y
+BUILD_ISA=y
 USE_X86_ISA=y
--- a/build_opts/X86_MI_example
+++ b/build_opts/X86_MI_example
@@ -1,3 +1,4 @@
 RUBY=y
 RUBY_PROTOCOL_MI_EXAMPLE=y
+BUILD_ISA=y
 USE_X86_ISA=y
--- a/build_opts/X86_MOESI_AMD_Base
+++ b/build_opts/X86_MOESI_AMD_Base
@@ -1,3 +1,4 @@
 RUBY=y
 RUBY_PROTOCOL_MOESI_AMD_BASE=y
+BUILD_ISA=y
 USE_X86_ISA=y