arm_compute v20.02
diff --git a/SConscript b/SConscript
index 33e8f77..03f3b0f 100644
--- a/SConscript
+++ b/SConscript
@@ -24,13 +24,21 @@
 import re
 import subprocess
 
-VERSION = "v19.11.1"
-SONAME_VERSION="17.1.0"
+VERSION = "v20.02"
+SONAME_VERSION="1.0.0"
 
 Import('env')
 Import('vars')
 Import('install_lib')
 
+def build_bootcode_objs(sources):
+
+    arm_compute_env.Append(ASFLAGS = "-I bootcode/")
+    obj = arm_compute_env.Object(sources)
+    obj = install_lib(obj)
+    Default(obj)
+    return obj
+
 def build_library(name, sources, static=False, libs=[]):
     if static:
         obj = arm_compute_env.StaticLibrary(name, source=sources, LIBS = arm_compute_env["LIBS"] + libs)
@@ -216,11 +224,10 @@
 
     graph_files += Glob('src/graph/backends/NEON/*.cpp')
 
-    if env['arch'] == "armv7a":
+    if env['estate'] == '32':
         core_files += Glob('src/core/NEON/kernels/arm_gemm/kernels/a32_*/*.cpp')
 
-
-    if "arm64-v8" in env['arch']:
+    if env['estate'] == '64':
         core_files += Glob('src/core/NEON/kernels/arm_gemm/kernels/a64_*/*.cpp')
         if "sve" in env['arch']:
              core_files += Glob('src/core/NEON/kernels/arm_gemm/kernels/sve_*/*.cpp')
@@ -241,6 +248,12 @@
 
     graph_files += Glob('src/graph/backends/GLES/*.cpp')
 
+bootcode_o = []
+if env['os'] == 'bare_metal':
+    bootcode_files = Glob('bootcode/*.s')
+    bootcode_o = build_bootcode_objs(bootcode_files)
+Export('bootcode_o')
+
 arm_compute_core_a = build_library('arm_compute_core-static', core_files, static=True)
 Export('arm_compute_core_a')