From 2d6d208a5df72dc4f2c1e764db3c6393b1cd4cb1 Mon Sep 17 00:00:00 2001 From: Xilin Wu Date: Sun, 11 Sep 2022 23:11:02 +0800 Subject: [PATCH] Enable USB mass storage for all devices(experimental) Also enable Simpleinit for all devices Signed-off-by: Xilin Wu --- sdm845Pkg/Devices/845.fdf | 11 +++++++++++ sdm845Pkg/Devices/akershus.dsc | 3 +++ sdm845Pkg/Devices/ayn-odin.dsc | 2 +- sdm845Pkg/Devices/ayn-odin.fdf | 11 +++++++++++ sdm845Pkg/Devices/dipper-old.dsc | 3 +++ sdm845Pkg/Devices/dipper.fdf | 2 +- sdm845Pkg/Devices/draco.dsc | 3 +++ sdm845Pkg/Devices/generic.dsc | 3 +++ sdm845Pkg/Devices/judyln.fdf | 3 +-- sdm845Pkg/Devices/judyp.fdf | 3 +-- sdm845Pkg/Devices/judypn.fdf | 3 +-- sdm845Pkg/Devices/m1882.dsc | 3 +++ sdm845Pkg/Devices/m1892.dsc | 3 +++ sdm845Pkg/Devices/m1892.fdf | 4 +++- sdm845Pkg/Devices/nx616j.dsc | 3 +++ sdm845Pkg/Devices/olympic.dsc | 3 +++ sdm845Pkg/Devices/pafm00.dsc | 2 +- sdm845Pkg/Devices/pd1821.dsc | 3 +++ sdm845Pkg/Devices/perseus.fdf | 2 +- sdm845Pkg/Devices/skr-a0.dsc | 3 +++ sdm845Pkg/Devices/star2qltechn.dsc | 3 +++ sdm845Pkg/Devices/trident.dsc | 2 +- sdm845Pkg/Devices/trident.fdf | 10 ++++++---- 23 files changed, 72 insertions(+), 16 deletions(-) diff --git a/sdm845Pkg/Devices/845.fdf b/sdm845Pkg/Devices/845.fdf index 65a1120..99424af 100644 --- 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 1632f31..e82aee8 100644 --- 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 6fb5fd3..6674fe5 100644 --- 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 f15b006..4d325cf 100644 --- 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 13fb2ff..78845d2 100644 --- 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 80a27cd..95f513e 100644 --- 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 7d52b26..0c38621 100644 --- 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 5d34463..6b8dc85 100644 --- 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 94e3e67..b739950 100644 --- 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 52acf68..9a08901 100644 --- 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 a2ebe43..728a873 100644 --- 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 a00105f..bdd2244 100644 --- 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 58fa525..12b3652 100644 --- 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 78fa81e..7c5e1c1 100644 --- 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 6e47210..399bdd7 100644 --- 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 7882cc4..8ed81ad 100644 --- 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 401c414..026165f 100644 --- 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 1ad4f7c..76b1ecc 100644 --- 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 61d2929..27c1170 100644 --- 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 f154b2e..24c7e00 100644 --- 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 414f671..a5328b3 100644 --- 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 506b4ae..44787b1 100644 --- 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 f27e923..a9430bf 100644 --- 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 -- 2.45.2