diff --git a/sdm845Pkg/Devices/beryllium.dsc b/sdm845Pkg/Devices/beryllium.dsc
index 4c13436..ee12e9b 100644
--- a/sdm845Pkg/Devices/beryllium.dsc
+++ b/sdm845Pkg/Devices/beryllium.dsc
@@ -11,6 +11,9 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DBUILTIN_LINUX_TEST=1
+
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
   gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
diff --git a/sdm845Pkg/Devices/beryllium.fdf b/sdm845Pkg/Devices/beryllium.fdf
index 68c399c..c7bf33c 100644
--- a/sdm845Pkg/Devices/beryllium.fdf
+++ b/sdm845Pkg/Devices/beryllium.fdf
@@ -563,7 +563,8 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF  sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
+  INF sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
+  INF sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf
 
   #
   # Bds
diff --git a/sdm845Pkg/Devices/enchilada-8g.dsc b/sdm845Pkg/Devices/enchilada-8g.dsc
index beed255..c45335e 100644
--- a/sdm845Pkg/Devices/enchilada-8g.dsc
+++ b/sdm845Pkg/Devices/enchilada-8g.dsc
@@ -16,7 +16,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1 -DAB_SLOTS_SUPPORT=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1 -DAB_SLOTS_SUPPORT=1 -DBUILTIN_LINUX_TEST=1
 
 [PcdsFixedAtBuild.common]
   # System Memory (7GB)
diff --git a/sdm845Pkg/Devices/enchilada.dsc b/sdm845Pkg/Devices/enchilada.dsc
index bfe211b..0266c9b 100644
--- a/sdm845Pkg/Devices/enchilada.dsc
+++ b/sdm845Pkg/Devices/enchilada.dsc
@@ -15,7 +15,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DBUILTIN_LINUX_TEST=1
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)                    
diff --git a/sdm845Pkg/Devices/enchilada.fdf b/sdm845Pkg/Devices/enchilada.fdf
index feddcfc..5043089 100644
--- a/sdm845Pkg/Devices/enchilada.fdf
+++ b/sdm845Pkg/Devices/enchilada.fdf
@@ -576,7 +576,8 @@ APRIORI DXE {
 !endif #$(INCLUDE_TFTP_COMMAND)
 
 
-  INF  sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
+  INF sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
+  INF sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf
 
 
   #
diff --git a/sdm845Pkg/Devices/fajita-10g.dsc b/sdm845Pkg/Devices/fajita-10g.dsc
index 650db01..38349a1 100644
--- a/sdm845Pkg/Devices/fajita-10g.dsc
+++ b/sdm845Pkg/Devices/fajita-10g.dsc
@@ -15,7 +15,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_10G=1 -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT
+  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_10G=1 -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DBUILTIN_LINUX_TEST=1
 
 [PcdsFixedAtBuild.common]
   # System Memory (10GB)
diff --git a/sdm845Pkg/Devices/fajita-8g.dsc b/sdm845Pkg/Devices/fajita-8g.dsc
index 4bdf081..2c8123e 100644
--- a/sdm845Pkg/Devices/fajita-8g.dsc
+++ b/sdm845Pkg/Devices/fajita-8g.dsc
@@ -15,7 +15,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1 -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT
+  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1 -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DBUILTIN_LINUX_TEST=1
 
 [PcdsFixedAtBuild.common]
   # System Memory (7GB)
diff --git a/sdm845Pkg/Devices/fajita.dsc b/sdm845Pkg/Devices/fajita.dsc
index 9986341..8b6219a 100644
--- a/sdm845Pkg/Devices/fajita.dsc
+++ b/sdm845Pkg/Devices/fajita.dsc
@@ -15,7 +15,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT
+  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DBUILTIN_LINUX_TEST=1
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
diff --git a/sdm845Pkg/Devices/fajita.fdf b/sdm845Pkg/Devices/fajita.fdf
index cf3543c..18536ce 100644
--- a/sdm845Pkg/Devices/fajita.fdf
+++ b/sdm845Pkg/Devices/fajita.fdf
@@ -579,7 +579,8 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF  sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
+  INF sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
+  INF sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf
 
   #
   # Bds