Enable BuiltinLinuxKrl for beryllium and oneplus devices

Only tested on fajita

diff --git a/sdm845Pkg/Devices/beryllium.dsc b/sdm845Pkg/Devices/beryllium.dsc
index 4c1343682e610497a618d38bb7642e76d38780e0..ee12e9b91c95abf2ffb6fd116d4bcc4ba69900b7 100644 (file)
--- 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 68c399c76fa24828e91d89aa1a6838b063dce6b4..c7bf33ce042fbc524d76955823c3687135d037c0 100644 (file)
--- 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 beed2557a38b6f4a3787fddd21f3535860136899..c45335e470c6339d3e076fbf0d0c68a12ed350e2 100644 (file)
--- 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 bfe211bdc2b818ba256a63b45888616d6e0c791e..0266c9bc4168fd2b0892ab41cb790ffea7a487e2 100644 (file)
--- 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 feddcfcee8704ad24cefe1b7b5d7a6e8035eb3bc..5043089eeb5882efa95c14d70d2dbbbdf82dc8ef 100644 (file)
--- 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 650db01c32ebc3a733e05a1b891b72d084ba053e..38349a1e05541aebf8fdd45ebe2a886268d49663 100644 (file)
--- 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 4bdf081a95d1e769a28bfd0d000f7fbd86da1bab..2c8123e314d38d622616ed0738ccdec35e178f71 100644 (file)
--- 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 9986341b965e290a332c10496311997e400d4167..8b6219a2a648ae590c7405ffcf5120b82571971e 100644 (file)
--- 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 cf3543c8eeeeb5246f4fe4a5aa66630b7f67273e..18536cecabd7812072376c005ff05543667d143f 100644 (file)
--- 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