Rename BuiltinLinuxKrl to LinuxSimpleMassStorage

follow https://github.com/BigfootACA/linux-simple-mass-storage

diff --git a/sdm845Pkg/Binary b/sdm845Pkg/Binary
index b3a69de2d3eec03d1055b5a79f4d92e5fff889fc..c775d7fe1713b041219c7dfafc6265219c901d6d 160000 (submodule)
--- a/sdm845Pkg/Binary
+++ b/sdm845Pkg/Binary
@@ -1 +1 @@
-Subproject commit b3a69de2d3eec03d1055b5a79f4d92e5fff889fc
+Subproject commit c775d7fe1713b041219c7dfafc6265219c901d6d

diff --git a/sdm845Pkg/Devices/beryllium.dsc b/sdm845Pkg/Devices/beryllium.dsc
index ee12e9b91c95abf2ffb6fd116d4bcc4ba69900b7..34049083e3475799151885b8f903ba1811442e8e 100644 (file)
--- a/sdm845Pkg/Devices/beryllium.dsc
+++ b/sdm845Pkg/Devices/beryllium.dsc
@@ -12,7 +12,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DBUILTIN_LINUX_TEST=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)

diff --git a/sdm845Pkg/Devices/beryllium.fdf b/sdm845Pkg/Devices/beryllium.fdf
index 075b15ffae6bdcdc5dc177c6063910d2fb681f5a..8f8e5c44c4b97e6c971eb606c0baad78b9a8411b 100644 (file)
--- a/sdm845Pkg/Devices/beryllium.fdf
+++ b/sdm845Pkg/Devices/beryllium.fdf
@@ -563,7 +563,7 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf
+  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
 
   #
   # Bds

diff --git a/sdm845Pkg/Devices/enchilada-8g.dsc b/sdm845Pkg/Devices/enchilada-8g.dsc
index c45335e470c6339d3e076fbf0d0c68a12ed350e2..e6906e7fbf8f39b406d0684fb7ea6913a9a29c02 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 -DBUILTIN_LINUX_TEST=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1 -DAB_SLOTS_SUPPORT=1 -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
   # System Memory (7GB)

diff --git a/sdm845Pkg/Devices/enchilada.dsc b/sdm845Pkg/Devices/enchilada.dsc
index 0266c9bc4168fd2b0892ab41cb790ffea7a487e2..94065cf4768d97dd2423a1b044ef5ee898818f62 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 -DBUILTIN_LINUX_TEST=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)                    

diff --git a/sdm845Pkg/Devices/enchilada.fdf b/sdm845Pkg/Devices/enchilada.fdf
index 7a56bf0abe720bab7104dfda089cfaa963241b8d..701d2abffedecf65f5daf76c5e9ca6615e0d7b1a 100644 (file)
--- a/sdm845Pkg/Devices/enchilada.fdf
+++ b/sdm845Pkg/Devices/enchilada.fdf
@@ -575,7 +575,7 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf
+  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
 
 
   #

diff --git a/sdm845Pkg/Devices/fajita-10g.dsc b/sdm845Pkg/Devices/fajita-10g.dsc
index 38349a1e05541aebf8fdd45ebe2a886268d49663..83d38c0052b43b8adeb0eca933cc41aa803e6e58 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 -DBUILTIN_LINUX_TEST=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_10G=1 -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
   # System Memory (10GB)

diff --git a/sdm845Pkg/Devices/fajita-8g.dsc b/sdm845Pkg/Devices/fajita-8g.dsc
index 2c8123e314d38d622616ed0738ccdec35e178f71..0b5773799a7df46c0d73dcf9de892ba7c7bb7c06 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 -DBUILTIN_LINUX_TEST=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1 -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
   # System Memory (7GB)

diff --git a/sdm845Pkg/Devices/fajita.dsc b/sdm845Pkg/Devices/fajita.dsc
index 8b6219a2a648ae590c7405ffcf5120b82571971e..ad8a206801cace3331def6f786c33c1789df2f7a 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 -DBUILTIN_LINUX_TEST=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)

diff --git a/sdm845Pkg/Devices/fajita.fdf b/sdm845Pkg/Devices/fajita.fdf
index 8fa49e0dbff758f114993c26e7d704518913d942..f28cbb55d628b3f8028bd973f5bdd24b01f68841 100644 (file)
--- a/sdm845Pkg/Devices/fajita.fdf
+++ b/sdm845Pkg/Devices/fajita.fdf
@@ -579,7 +579,7 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf
+  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
 
   #
   # Bds

diff --git a/sdm845Pkg/Devices/polaris-8g.dsc b/sdm845Pkg/Devices/polaris-8g.dsc
index 4301f3852665cd9579681cbb4bc2f2b4716d4be5..8ab6cab5e01d027bd29b967169c5697a3e95a545 100644 (file)
--- a/sdm845Pkg/Devices/polaris-8g.dsc
+++ b/sdm845Pkg/Devices/polaris-8g.dsc
@@ -12,7 +12,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DXIAOMI_PIL_FIXED=1 -DMEMORY_8G=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DBUILTIN_LINUX_TEST=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DXIAOMI_PIL_FIXED=1 -DMEMORY_8G=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
   # System Memory (7GB)

diff --git a/sdm845Pkg/Devices/polaris.dsc b/sdm845Pkg/Devices/polaris.dsc
index 54f08dbb92ba0e86171e1c4cf0635471f5514e92..5ac4c712cb9ad9a58f1e652e55db4109ce5d2161 100644 (file)
--- a/sdm845Pkg/Devices/polaris.dsc
+++ b/sdm845Pkg/Devices/polaris.dsc
@@ -12,7 +12,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DXIAOMI_PIL_FIXED=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DBUILTIN_LINUX_TEST=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DXIAOMI_PIL_FIXED=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)

diff --git a/sdm845Pkg/Devices/polaris.fdf b/sdm845Pkg/Devices/polaris.fdf
index db350ce0b6a8d34764eb5be085af9ef5060bc8e2..43edb2e4e993a35fd31427f8bbdab685aaf5928a 100644 (file)
--- a/sdm845Pkg/Devices/polaris.fdf
+++ b/sdm845Pkg/Devices/polaris.fdf
@@ -561,7 +561,7 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
 !endif #$(INCLUDE_TFTP_COMMAND)\r
 \r
-  INF sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf\r
+  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf\r
 \r
   #\r
   # Bds\r

diff --git a/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c
index cd91f73b80b4e4257367a91021e110ea219a033c..b4e40773c2ec79d559c1177f29ab148752dff096 100644 (file)
--- a/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -682,12 +682,12 @@ VOID EFIAPI PlatformBootManagerAfterConsole(VOID)
   PlatformRegisterFvBootOption(
       &gUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE);
 
-#ifdef BUILTIN_LINUX_TEST
+#ifdef ENABLE_LINUX_SIMPLE_MASS_STORAGE
   //
   // Register Built-in Linux Kernel
   //
   PlatformRegisterFvBootOption(
-      &gBuiltinLinuxKrlFileGuid, L"USB Attached SCSI (UAS) Storage", LOAD_OPTION_ACTIVE);
+      &gLinuxSimpleMassStorageGuid, L"USB Attached SCSI (UAS) Storage", LOAD_OPTION_ACTIVE);
 #endif
 
 #ifdef AB_SLOTS_SUPPORT

diff --git a/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index 9dcfbf54f8d69d246ba6f58b4c3f41330fc17622..1fc4584afa8a00858eb925f0a7f75c1e7dedd7e5 100644 (file)
--- a/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -77,7 +77,7 @@
   gEfiEndOfDxeEventGroupGuid
   gEfiTtyTermGuid
   gUefiShellFileGuid
-  gBuiltinLinuxKrlFileGuid
+  gLinuxSimpleMassStorageGuid
   gSwitchSlotsAppFileGuid
   gSimpleInitFileGuid
 

diff --git a/sdm845Pkg/sdm845Pkg.dec b/sdm845Pkg/sdm845Pkg.dec
index 12ebcf50447b89d368fd9674dd29c47959086b47..09633a438d28a85cfd1da3e681cd00c2734f5968 100644 (file)
--- a/sdm845Pkg/sdm845Pkg.dec
+++ b/sdm845Pkg/sdm845Pkg.dec
@@ -47,7 +47,7 @@
 [Guids]
   gSwitchSlotsAppFileGuid             = { 0xD5BC0FB1, 0xA833, 0x4607, { 0xB7, 0xB6, 0x5E, 0xF9, 0xD1, 0x0B, 0xEE, 0xB7 } }
   gSimpleInitFileGuid                 = { 0x6D77B2BB, 0x69EB, 0x42AB, { 0xBE, 0xCF, 0x4F, 0x40, 0xC8, 0x95, 0x68, 0xC3 } }
-  gBuiltinLinuxKrlFileGuid            = { 0x2a24787e, 0xe09c, 0x43ce, { 0xb5, 0xcf, 0xd0, 0x30, 0x66, 0xf6, 0x09, 0x2f } }
+  gLinuxSimpleMassStorageGuid         = { 0x2a24787e, 0xe09c, 0x43ce, { 0xb5, 0xcf, 0xd0, 0x30, 0x66, 0xf6, 0x09, 0x2f } }
 
 [PcdsFixedAtBuild.common]
   # Simple FrameBuffer

diff --git a/sdm845Pkg/sdm845Pkg.dsc b/sdm845Pkg/sdm845Pkg.dsc
index 8faeeced0a4055ba24e778632043d3b095c986c8..99eb689f5bb72f3ce4392cc01b7e7cc8b23e935e 100644 (file)
--- a/sdm845Pkg/sdm845Pkg.dsc
+++ b/sdm845Pkg/sdm845Pkg.dsc
@@ -342,4 +342,4 @@
   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf
+  sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf