Enable USB mass storage for all devices(experimental)

Also enable Simpleinit for all devices

Signed-off-by: Xilin Wu <strongtz@yeah.net>

diff --git a/sdm845Pkg/Devices/845.fdf b/sdm845Pkg/Devices/845.fdf
index 65a11206df8b952c431b04fdc7dfaf08fe0931de..99424af05f0a9e0475d74e552feac81601f727f7 100644 (file)
--- a/sdm845Pkg/Devices/845.fdf
+++ b/sdm845Pkg/Devices/845.fdf
@@ -564,6 +564,17 @@ APRIORI DXE {
     SECTION UI = "AcpiTables"
   }
 
+  #
+  # FDT support
+  #
+  INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
+
+  FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
+    SECTION RAW = sdm845Pkg/FdtBlob/sdm845-generic-msd.dtb
+  }
+
+  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
+
   #
   # SMBIOS Support
   #

diff --git a/sdm845Pkg/Devices/akershus.dsc b/sdm845Pkg/Devices/akershus.dsc
index 1632f3150eec7d0ed958c8aec5e24378da90a886..e82aee88f7c2c6888e8709409d7de2b3b3ae44b2 100644 (file)
--- a/sdm845Pkg/Devices/akershus.dsc
+++ b/sdm845Pkg/Devices/akershus.dsc
@@ -11,6 +11,9 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080

diff --git a/sdm845Pkg/Devices/ayn-odin.dsc b/sdm845Pkg/Devices/ayn-odin.dsc
index 6fb5fd3610bad3a009c1c0359f9857e183770d51..6674fe5e30f8e71bb67ee6e6b628685353467861 100644 (file)
--- a/sdm845Pkg/Devices/ayn-odin.dsc
+++ b/sdm845Pkg/Devices/ayn-odin.dsc
@@ -12,7 +12,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT
+  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
 

diff --git a/sdm845Pkg/Devices/ayn-odin.fdf b/sdm845Pkg/Devices/ayn-odin.fdf
index f15b0060c4d137877b780088975a4a0f663261d1..4d325cf9c628620175dcc6ef9d4e8e06665ba000 100644 (file)
--- a/sdm845Pkg/Devices/ayn-odin.fdf
+++ b/sdm845Pkg/Devices/ayn-odin.fdf
@@ -557,6 +557,17 @@ APRIORI DXE {
     SECTION UI = "AcpiTables"
   }
 
+  #
+  # FDT support
+  #
+  INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
+
+  FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
+    SECTION RAW = sdm845Pkg/FdtBlob/sdm845-generic-msd.dtb
+  }
+
+  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
+
   #
   # SMBIOS Support
   #

diff --git a/sdm845Pkg/Devices/dipper-old.dsc b/sdm845Pkg/Devices/dipper-old.dsc
index 13fb2ffb00c7a4a4fd084221d6a848345704e64d..78845d24aaf220f6e4fae923038c733dc91b1a82 100644 (file)
--- a/sdm845Pkg/Devices/dipper-old.dsc
+++ b/sdm845Pkg/Devices/dipper-old.dsc
@@ -11,6 +11,9 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080

diff --git a/sdm845Pkg/Devices/dipper.fdf b/sdm845Pkg/Devices/dipper.fdf
index 80a27cd3ec4f80bb7ad87a13afc2681cda3b6341..95f513e227fd2495c6513192a3abd2282dc88d4e 100644 (file)
--- a/sdm845Pkg/Devices/dipper.fdf
+++ b/sdm845Pkg/Devices/dipper.fdf
@@ -573,7 +573,7 @@ APRIORI DXE {
   INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
 
   FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
-    SECTION RAW = sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dtb
+    SECTION RAW = sdm845Pkg/FdtBlob/sdm845-generic-msd.dtb
   }
 
 

diff --git a/sdm845Pkg/Devices/draco.dsc b/sdm845Pkg/Devices/draco.dsc
index 7d52b268e1e50d78c01d3233d09647da0444db98..0c38621dc9045a2a680a1f6f6cfe30adb53a65ab 100644 (file)
--- a/sdm845Pkg/Devices/draco.dsc
+++ b/sdm845Pkg/Devices/draco.dsc
@@ -11,6 +11,9 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080

diff --git a/sdm845Pkg/Devices/generic.dsc b/sdm845Pkg/Devices/generic.dsc
index 5d344630816188db2f8195226ea484415a2fbfc4..6b8dc857f43d0511b58eb8a71dab29db3937c82b 100644 (file)
--- a/sdm845Pkg/Devices/generic.dsc
+++ b/sdm845Pkg/Devices/generic.dsc
@@ -11,6 +11,9 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080

diff --git a/sdm845Pkg/Devices/judyln.fdf b/sdm845Pkg/Devices/judyln.fdf
index 94e3e676be1f16f7516e176e11d243e4a82e3e6e..b7399501568484fe2fa062fdcc25b16f029effb3 100644 (file)
--- a/sdm845Pkg/Devices/judyln.fdf
+++ b/sdm845Pkg/Devices/judyln.fdf
@@ -584,6 +584,7 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
+  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
 
   #
   # Bds
@@ -615,8 +616,6 @@ APRIORI DXE {
 
   INF src/kernelfdt/KernelFdtDxe.inf
 
-  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
-
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 8
 ERASE_POLARITY     = 1

diff --git a/sdm845Pkg/Devices/judyp.fdf b/sdm845Pkg/Devices/judyp.fdf
index 52acf68c41ac82233e6a313e02b734eb9c5da819..9a0890137cfab91553b7029e014d5357d1b54f11 100644 (file)
--- a/sdm845Pkg/Devices/judyp.fdf
+++ b/sdm845Pkg/Devices/judyp.fdf
@@ -584,6 +584,7 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
+  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
 
   #
   # Bds
@@ -615,8 +616,6 @@ APRIORI DXE {
 
   INF src/kernelfdt/KernelFdtDxe.inf
 
-  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
-
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 8
 ERASE_POLARITY     = 1

diff --git a/sdm845Pkg/Devices/judypn.fdf b/sdm845Pkg/Devices/judypn.fdf
index a2ebe439551e3cecefc1ce9eeee668a2fb9729f6..728a873371b73a6502247ef011294aeceae03cc9 100644 (file)
--- a/sdm845Pkg/Devices/judypn.fdf
+++ b/sdm845Pkg/Devices/judypn.fdf
@@ -584,6 +584,7 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
+  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
 
   #
   # Bds
@@ -615,8 +616,6 @@ APRIORI DXE {
 
   INF src/kernelfdt/KernelFdtDxe.inf
 
-  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
-
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 8
 ERASE_POLARITY     = 1

diff --git a/sdm845Pkg/Devices/m1882.dsc b/sdm845Pkg/Devices/m1882.dsc
index a00105fe0c049507c2153aa26b7bea5ded796ade..bdd2244e99362f885e2b0e0e48638e6691a23296 100644 (file)
--- a/sdm845Pkg/Devices/m1882.dsc
+++ b/sdm845Pkg/Devices/m1882.dsc
@@ -11,6 +11,9 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080

diff --git a/sdm845Pkg/Devices/m1892.dsc b/sdm845Pkg/Devices/m1892.dsc
index 58fa525dda9cac6f381ab0a085a080e80018dce7..12b3652179b32b447db0957da064b84687baa1fc 100644 (file)
--- a/sdm845Pkg/Devices/m1892.dsc
+++ b/sdm845Pkg/Devices/m1892.dsc
@@ -11,6 +11,9 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080

diff --git a/sdm845Pkg/Devices/m1892.fdf b/sdm845Pkg/Devices/m1892.fdf
index 78fa81e8783749647e0436a952e0a7cd492b1769..7c5e1c1397cab67a7ef5b902a9f7191135deb749 100644 (file)
--- a/sdm845Pkg/Devices/m1892.fdf
+++ b/sdm845Pkg/Devices/m1892.fdf
@@ -574,9 +574,11 @@ APRIORI DXE {
   INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
 
   FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
-    SECTION RAW = sdm845Pkg/FdtBlob/sdm845-oneplus-fajita.dtb
+    SECTION RAW = sdm845Pkg/FdtBlob/sdm845-generic-msd.dtb
   }
 
+  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
+
   #
   # SMBIOS Support
   #

diff --git a/sdm845Pkg/Devices/nx616j.dsc b/sdm845Pkg/Devices/nx616j.dsc
index 6e472100048014149eafa2ffdf67aff76c1a27cf..399bdd7d1cd2574c36ea0bd7ae433917f1295fc7 100644 (file)
--- a/sdm845Pkg/Devices/nx616j.dsc
+++ b/sdm845Pkg/Devices/nx616j.dsc
@@ -11,6 +11,9 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080

diff --git a/sdm845Pkg/Devices/olympic.dsc b/sdm845Pkg/Devices/olympic.dsc
index 7882cc4d0cde1dd7d3e2097ad2ec0db6d56e208a..8ed81ad48e7a5c29b0d5cdc9e565586ca2d50bd5 100644 (file)
--- a/sdm845Pkg/Devices/olympic.dsc
+++ b/sdm845Pkg/Devices/olympic.dsc
@@ -11,6 +11,9 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1440

diff --git a/sdm845Pkg/Devices/pafm00.dsc b/sdm845Pkg/Devices/pafm00.dsc
index 401c4149b642215eda4b5d826eeb05a95f7bdc25..026165fdebd0a38ec9c17a973a4f174729ef6de1 100644 (file)
--- a/sdm845Pkg/Devices/pafm00.dsc
+++ b/sdm845Pkg/Devices/pafm00.dsc
@@ -12,7 +12,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
 

diff --git a/sdm845Pkg/Devices/pd1821.dsc b/sdm845Pkg/Devices/pd1821.dsc
index 1ad4f7ca5da0f4779a93a329c00cddb13de150f7..76b1ecc4d2b664e7f36d0f7e46ec37da60ac23db 100644 (file)
--- a/sdm845Pkg/Devices/pd1821.dsc
+++ b/sdm845Pkg/Devices/pd1821.dsc
@@ -11,6 +11,9 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080

diff --git a/sdm845Pkg/Devices/perseus.fdf b/sdm845Pkg/Devices/perseus.fdf
index 61d2929d84407748db1d14acbb02576f8398e9ab..27c11708b451e8af961201eaeb9b6111e95ec27f 100644 (file)
--- a/sdm845Pkg/Devices/perseus.fdf
+++ b/sdm845Pkg/Devices/perseus.fdf
@@ -563,7 +563,7 @@ APRIORI DXE {
   INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
 
   FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
-    SECTION RAW = sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dtb
+    SECTION RAW = sdm845Pkg/FdtBlob/sdm845-generic-msd.dtb
   }
 
   #

diff --git a/sdm845Pkg/Devices/skr-a0.dsc b/sdm845Pkg/Devices/skr-a0.dsc
index f154b2ecc8dfb45c29c718166d3e444ac0e3632d..24c7e00167e86f0ef5c28f8bd55a4102b9912dda 100644 (file)
--- a/sdm845Pkg/Devices/skr-a0.dsc
+++ b/sdm845Pkg/Devices/skr-a0.dsc
@@ -11,6 +11,9 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080

diff --git a/sdm845Pkg/Devices/star2qltechn.dsc b/sdm845Pkg/Devices/star2qltechn.dsc
index 414f671127de45ce484890e7f6c2e3c0c3ee8e25..a5328b3860b94055e182c04839aed8a355cef30c 100644 (file)
--- a/sdm845Pkg/Devices/star2qltechn.dsc
+++ b/sdm845Pkg/Devices/star2qltechn.dsc
@@ -11,6 +11,9 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1440

diff --git a/sdm845Pkg/Devices/trident.dsc b/sdm845Pkg/Devices/trident.dsc
index 506b4aea5af5889bf7bdef8e143406217fd43ad9..44787b1794aa41cf639c3e6fa6e2af5891142aa1 100644 (file)
--- a/sdm845Pkg/Devices/trident.dsc
+++ b/sdm845Pkg/Devices/trident.dsc
@@ -12,7 +12,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
 

diff --git a/sdm845Pkg/Devices/trident.fdf b/sdm845Pkg/Devices/trident.fdf
index f27e923e4de0fc0d5223d52140d220beb17e390b..a9430bfa90885a2437f950e88789745f41e654f2 100644 (file)
--- a/sdm845Pkg/Devices/trident.fdf
+++ b/sdm845Pkg/Devices/trident.fdf
@@ -570,11 +570,13 @@ APRIORI DXE {
   #
   # FDT support
   #
-#   INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
+  INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
 
-#   FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
-#     SECTION RAW = sdm845Pkg/FdtBlob/sdm845-oneplus-fajita.dtb
-#   }
+  FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
+    SECTION RAW = sdm845Pkg/FdtBlob/sdm845-generic-msd.dtb
+  }
+
+  INF sdm845Pkg/Binary/845/LinuxSimpleMassStorage/LinuxSimpleMassStorage.inf
 
   #
   # SMBIOS Support