From: BigfootACA Date: 星期天, 23 Jan 2022 06:49:47 +0000 (+0800) Subject: Rename BuiltinLinuxKrl to LinuxSimpleMassStorage X-Git-Tag: v1.1~3 X-Git-Url: https://git.renegade-project.org/?a=commitdiff_plain;h=7ea1447dbb1bdf5fcfc23bc505a505f33dd4e351;p=edk2-sdm845.git Rename BuiltinLinuxKrl to LinuxSimpleMassStorage follow https://github.com/BigfootACA/linux-simple-mass-storage --- diff --git a/sdm845Pkg/Binary b/sdm845Pkg/Binary index b3a69de..c775d7f 160000 --- 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 ee12e9b..3404908 100644 --- 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 075b15f..8f8e5c4 100644 --- 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 c45335e..e6906e7 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 -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 0266c9b..94065cf 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 -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 7a56bf0..701d2ab 100644 --- 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 38349a1..83d38c0 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 -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 2c8123e..0b57737 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 -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 8b6219a..ad8a206 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 -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 8fa49e0..f28cbb5 100644 --- 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 4301f38..8ab6cab 100644 --- 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 54f08db..5ac4c71 100644 --- 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 db350ce..43edb2e 100644 --- a/sdm845Pkg/Devices/polaris.fdf +++ b/sdm845Pkg/Devices/polaris.fdf @@ -561,7 +561,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/Library/PlatformBootManagerLib/PlatformBm.c b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c index cd91f73..b4e4077 100644 --- 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 9dcfbf5..1fc4584 100644 --- 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 12ebcf5..09633a4 100644 --- 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 8faeece..99eb689 100644 --- 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