From d77c3ab5f4ad990d5a685f9f11c6d5fac54b5ed1 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 4 Jun 2024 16:52:59 +0100 Subject: [PATCH] Add EROFS support * Also update GRUB and gnu-efi to latest --- .github/workflows/linux_gcc_edk2.yml | 29 +- .github/workflows/linux_gcc_gnu-efi.yml | 8 +- .github/workflows/windows_msvc_edk2.yml | 9 +- .github/workflows/windows_msvc_gnu-efi.yml | 4 + .vs/affs.vcxproj | 12 +- .vs/bfs.vcxproj | 12 +- .vs/btrfs.vcxproj | 12 +- .vs/efifs.vcxproj | 16 +- .vs/erofs.vcxproj | 407 +++++++++++++++++++++ .vs/erofs.vcxproj.filters | 34 ++ .vs/erofs.vcxproj.user | 51 +++ .vs/exfat.vcxproj | 12 +- .vs/ext2.vcxproj | 12 +- .vs/f2fs.vcxproj | 12 +- .vs/grub.vcxproj | 16 +- .vs/hfs.vcxproj | 12 +- .vs/hfsplus.vcxproj | 12 +- .vs/iso9660.vcxproj | 12 +- .vs/jfs.vcxproj | 12 +- .vs/nilfs2.vcxproj | 12 +- .vs/ntfs.vcxproj | 16 +- .vs/reiserfs.vcxproj | 12 +- .vs/sfs.vcxproj | 12 +- .vs/squashfs.vcxproj | 12 +- .vs/udf.vcxproj | 12 +- .vs/ufs.vcxproj | 12 +- .vs/ufs2.vcxproj | 12 +- .vs/xfs.vcxproj | 12 +- .vs/zfs.vcxproj | 12 +- 0001-GRUB-fixes.patch | 110 ++++-- EfiFs.sln | 28 +- EfiFsPkg.dsc | 1 + EfiFsPkg/Affs.inf | 2 +- EfiFsPkg/Afs.inf | 2 +- EfiFsPkg/Bfs.inf | 2 +- EfiFsPkg/Btrfs.inf | 2 +- EfiFsPkg/Cbfs.inf | 2 +- EfiFsPkg/Cpio.inf | 2 +- EfiFsPkg/CpioBe.inf | 2 +- EfiFsPkg/EroFs.inf | 71 ++++ EfiFsPkg/ExFat.inf | 2 +- EfiFsPkg/Ext2.inf | 2 +- EfiFsPkg/F2fs.inf | 2 +- EfiFsPkg/Fat.inf | 2 +- EfiFsPkg/Hfs.inf | 2 +- EfiFsPkg/HfsPlus.inf | 2 +- EfiFsPkg/Iso9660.inf | 2 +- EfiFsPkg/Jfs.inf | 2 +- EfiFsPkg/Minix.inf | 2 +- EfiFsPkg/Minix2.inf | 2 +- EfiFsPkg/Minix2Be.inf | 2 +- EfiFsPkg/Minix3.inf | 2 +- EfiFsPkg/Minix3Be.inf | 2 +- EfiFsPkg/MinixBe.inf | 2 +- EfiFsPkg/NewC.inf | 2 +- EfiFsPkg/NilFs2.inf | 2 +- EfiFsPkg/Ntfs.inf | 2 +- EfiFsPkg/Odc.inf | 2 +- EfiFsPkg/ProcFs.inf | 2 +- EfiFsPkg/ReiserFs.inf | 2 +- EfiFsPkg/RomFs.inf | 2 +- EfiFsPkg/Sfs.inf | 2 +- EfiFsPkg/SquashFs.inf | 2 +- EfiFsPkg/Tar.inf | 2 +- EfiFsPkg/Udf.inf | 2 +- EfiFsPkg/Ufs.inf | 2 +- EfiFsPkg/Ufs2.inf | 2 +- EfiFsPkg/UfsBe.inf | 2 +- EfiFsPkg/Xfs.inf | 2 +- EfiFsPkg/Zfs.inf | 2 +- Make.common | 31 +- _newfs.sh | 3 +- gnu-efi | 2 +- grub | 2 +- src/Makefile | 4 + src/grub.c | 4 - 76 files changed, 948 insertions(+), 200 deletions(-) create mode 100644 .vs/erofs.vcxproj create mode 100644 .vs/erofs.vcxproj.filters create mode 100644 .vs/erofs.vcxproj.user create mode 100644 EfiFsPkg/EroFs.inf diff --git a/.github/workflows/linux_gcc_edk2.yml b/.github/workflows/linux_gcc_edk2.yml index 679f59a..c0f45a1 100644 --- a/.github/workflows/linux_gcc_edk2.yml +++ b/.github/workflows/linux_gcc_edk2.yml @@ -30,7 +30,6 @@ env: GCC5_ARM_PREFIX: arm-linux-gnueabi- GCC5_AARCH64_PREFIX: aarch64-linux-gnu- GCC5_RISCV64_PREFIX: riscv64-linux-gnu- - NASM_VERSION: 2.15.05 jobs: build: @@ -42,10 +41,10 @@ jobs: include: - arch: X64 short: x64 - pkgs: python3-distutils uuid-dev + pkgs: nasm python3-distutils uuid-dev - arch: IA32 short: ia32 - pkgs: gcc-multilib python3-distutils uuid-dev + pkgs: gcc-multilib nasm python3-distutils uuid-dev - arch: AARCH64 short: aa64 pkgs: gcc-aarch64-linux-gnu python3-distutils uuid-dev @@ -58,35 +57,31 @@ jobs: steps: - name: Install toolchain - run: sudo apt install ${{ matrix.pkgs }} - - name: Install nasm ${{ env.NASM_VERSION }} - # https://edk2.groups.io/g/devel/topic/89637409#87359 - if: matrix.arch == 'X64' || matrix.arch == 'IA32' run: | - curl -O https://www.nasm.us/pub/nasm/releasebuilds/${{ env.NASM_VERSION }}/nasm-${{ env.NASM_VERSION }}.tar.bz2 - tar -xjf nasm-${{ env.NASM_VERSION }}.tar.bz2 - cd nasm-${{ env.NASM_VERSION }} - ./autogen.sh - ./configure --prefix=/usr/local/ - make - sudo make install + sudo apt-get update + sudo apt-get install ${{ matrix.pkgs }} + - name: Fix missing Risc-V header if: matrix.arch == 'riscv64' run: sudo ln -s /usr/riscv64-linux-gnu/include/gnu/stubs-lp64d.h /usr/riscv64-linux-gnu/include/gnu/stubs-lp64.h + - name: Set up EDK2 run: | git clone --recursive https://github.com/tianocore/edk2.git make -C edk2/BaseTools + - name: Checkout repository and submodules uses: actions/checkout@v4 with: fetch-depth: 0 submodules: recursive path: edk2/EfiFsPkg + - name: Patch GRUB run: | cd edk2/EfiFsPkg/grub git apply ../0001-GRUB-fixes.patch + - name: Build UEFI drivers run: | cd edk2 @@ -94,17 +89,20 @@ jobs: ./EfiFsPkg/set_grub_cpu.sh ${{ matrix.arch }} build -a ${{ matrix.arch }} -b ${{ env.BUILD_TYPE }} -t ${{ env.COMPILER }} -p EfiFsPkg/EfiFsPkg.dsc for f in Build/EfiFs/${{ env.BUILD_TYPE }}_${{ env.COMPILER }}/${{ matrix.arch }}/*.efi; do mv "$f" "${f%.efi}_${{ matrix.short }}.efi"; done + - name: Upload artifacts uses: actions/upload-artifact@v4 if: ${{ github.event_name == 'push' }} with: name: gcc_edk2_${{ matrix.short }} path: edk2/Build/EfiFs/${{ env.BUILD_TYPE }}_${{ env.COMPILER }}/${{ matrix.arch }}/*.efi + - name: Display SHA-256 if: startsWith(github.ref, 'refs/tags/') run: | mv edk2/Build/EfiFs/${{ env.BUILD_TYPE }}_${{ env.COMPILER }}/${{ matrix.arch }}/*.efi . sha256sum *.efi + - name: Create release uses: softprops/action-gh-release@v2 if: startsWith(github.ref, 'refs/tags/') @@ -112,6 +110,7 @@ jobs: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} with: files: ./*.efi + - name: Create web artifacts if: startsWith(github.ref, 'refs/tags/') run: | @@ -128,6 +127,7 @@ jobs: printf "\"[EFI]\" %-31s%-19s%-5s\n" "${LINK}" "${LINK}" "${FILE_AND_TAG}" "${TIMESTAMP}" "${SIZE}" >> web/${{ matrix.short }}/index.html; done printf "
\n \n\n" >> web/${{ matrix.short }}/index.html + - name: Upload web artifacts uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') @@ -145,6 +145,7 @@ jobs: with: name: gcc_edk2 delete-merged: true + - name: Merge Web Artifacts uses: actions/upload-artifact/merge@v4 if: startsWith(github.ref, 'refs/tags/') diff --git a/.github/workflows/linux_gcc_gnu-efi.yml b/.github/workflows/linux_gcc_gnu-efi.yml index 6833673..37bb850 100644 --- a/.github/workflows/linux_gcc_gnu-efi.yml +++ b/.github/workflows/linux_gcc_gnu-efi.yml @@ -54,15 +54,21 @@ jobs: with: fetch-depth: 0 submodules: recursive + - name: Install gcc toolchain - run: sudo apt install ${{ matrix.pkg }} + run: | + sudo apt-get update + sudo apt-get install ${{ matrix.pkg }} + - name: Patch GRUB run: | cd grub git apply ../0001-GRUB-fixes.patch cd .. + - name: Build drivers run: make ARCH=${{ matrix.arch }} CROSS_COMPILE=${{ matrix.tuple }} + - name: Upload artifacts uses: actions/upload-artifact@v4 if: ${{ github.event_name == 'push' }} diff --git a/.github/workflows/windows_msvc_edk2.yml b/.github/workflows/windows_msvc_edk2.yml index 0e7b4fe..7940cf2 100644 --- a/.github/workflows/windows_msvc_edk2.yml +++ b/.github/workflows/windows_msvc_edk2.yml @@ -27,7 +27,7 @@ on: env: BUILD_TYPE: RELEASE COMPILER: VS2019 - NASM_URL: https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/win64/nasm-2.15.05-win64.zip + NASM_URL: https://www.nasm.us/pub/nasm/releasebuilds/2.16/win64/nasm-2.16-win64.zip jobs: build: @@ -61,30 +61,36 @@ jobs: del nasm.zip move nasm* nasm echo NASM_PREFIX=%cd%\nasm\>> %GITHUB_ENV% + - name: Set Visual Studio for win32 build uses: ilammy/msvc-dev-cmd@v1 with: arch: win32 + - name: Set up EDK2 shell: cmd run: | git clone --recursive https://github.com/tianocore/edk2.git cd edk2 call edksetup.bat rebuild + - name: Checkout repository and submodules uses: actions/checkout@v4 with: fetch-depth: 0 submodules: recursive path: edk2/EfiFsPkg + - name: Patch GRUB run: | cd edk2\EfiFsPkg\grub git apply ..\0001-GRUB-fixes.patch + - name: Set Visual Studio for ${{ matrix.msvc }} build uses: ilammy/msvc-dev-cmd@v1 with: arch: ${{ matrix.msvc }} + - name: Build UEFI drivers shell: cmd run: | @@ -93,6 +99,7 @@ jobs: call EfiFsPkg\set_grub_cpu.cmd ${{ matrix.arch }} call build -a ${{ matrix.arch }} -b ${{ env.BUILD_TYPE }} -t ${{ env.COMPILER }} -p EfiFsPkg/EfiFsPkg.dsc for %%f in (Build\EfiFs\${{ env.BUILD_TYPE }}_${{ env.COMPILER }}\${{ matrix.arch }}\*.efi) do ren "%%~f" "%%~nf_${{ matrix.short }}%%~xf" + - name: Upload artifacts uses: actions/upload-artifact@v4 if: ${{ github.event_name == 'push' }} diff --git a/.github/workflows/windows_msvc_gnu-efi.yml b/.github/workflows/windows_msvc_gnu-efi.yml index 9a191be..f1a9930 100644 --- a/.github/workflows/windows_msvc_gnu-efi.yml +++ b/.github/workflows/windows_msvc_gnu-efi.yml @@ -38,17 +38,21 @@ jobs: with: fetch-depth: 0 submodules: recursive + - name: Patch GRUB run: | cd grub git apply ..\0001-GRUB-fixes.patch cd .. + - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v2 + - name: Build drivers run: | msbuild efifs.sln /m /p:Configuration=Debug,Platform=${{ matrix.arch }} msbuild efifs.sln /m /p:Configuration=Release,Platform=${{ matrix.arch }} + - name: Upload artifacts uses: actions/upload-artifact@v4 if: ${{ github.event_name == 'push' }} diff --git a/.vs/affs.vcxproj b/.vs/affs.vcxproj index 4616208..fa20cd2 100644 --- a/.vs/affs.vcxproj +++ b/.vs/affs.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -253,6 +256,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -278,7 +282,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -307,7 +311,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -336,7 +340,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -365,7 +369,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/bfs.vcxproj b/.vs/bfs.vcxproj index cf7a62e..9b7ef59 100644 --- a/.vs/bfs.vcxproj +++ b/.vs/bfs.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -253,6 +256,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -278,7 +282,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -307,7 +311,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -336,7 +340,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -365,7 +369,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/btrfs.vcxproj b/.vs/btrfs.vcxproj index cd68b44..9155947 100644 --- a/.vs/btrfs.vcxproj +++ b/.vs/btrfs.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -253,6 +256,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -278,7 +282,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -307,7 +311,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -336,7 +340,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -365,7 +369,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/efifs.vcxproj b/.vs/efifs.vcxproj index 6e2782b..462fb7b 100644 --- a/.vs/efifs.vcxproj +++ b/.vs/efifs.vcxproj @@ -151,7 +151,7 @@ ProgramDatabase false Default - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) true @@ -172,7 +172,7 @@ ProgramDatabase false Default - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) true @@ -193,7 +193,7 @@ ProgramDatabase false Default - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) true @@ -214,7 +214,7 @@ ProgramDatabase false Default - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) true @@ -233,7 +233,7 @@ CompileAsC MultiThreaded false - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -256,7 +256,7 @@ CompileAsC MultiThreaded false - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -279,7 +279,7 @@ CompileAsC MultiThreaded false - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -302,7 +302,7 @@ CompileAsC MultiThreaded false - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/erofs.vcxproj b/.vs/erofs.vcxproj new file mode 100644 index 0000000..805439f --- /dev/null +++ b/.vs/erofs.vcxproj @@ -0,0 +1,407 @@ + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + {6a8c4102-1c13-4ae9-a691-bf8ee908d89f} + erofs + 10.0 + + + + x64 + + + Application + true + v143 + Unicode + + + Application + true + v143 + Unicode + + + Application + true + v143 + Unicode + true + + + Application + true + v143 + Unicode + true + + + Application + false + v143 + Unicode + + + Application + false + v143 + Unicode + + + Application + false + v143 + Unicode + true + + + Application + false + v143 + Unicode + true + + + + .efi + false + false + $(SolutionDir)x64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_x64 + + + .efi + false + false + $(SolutionDir)ia32\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_ia32 + + + .efi + false + false + $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_arm + + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + + + .efi + false + false + $(SolutionDir)x64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_x64 + + + .efi + false + false + $(SolutionDir)ia32\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_ia32 + + + .efi + false + false + $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_arm + + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- /std:clatest %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- /std:clatest %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- /std:clatest %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- /std:clatest %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.vs/erofs.vcxproj.filters b/.vs/erofs.vcxproj.filters new file mode 100644 index 0000000..bed986d --- /dev/null +++ b/.vs/erofs.vcxproj.filters @@ -0,0 +1,34 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {b1c3b304-e868-4b07-988c-36ad7bc57300} + + + + + Source Files + + + Source Files + + + + + Resource Files + + + + + Header Files + + + \ No newline at end of file diff --git a/.vs/erofs.vcxproj.user b/.vs/erofs.vcxproj.user new file mode 100644 index 0000000..f3e2ca0 --- /dev/null +++ b/.vs/erofs.vcxproj.user @@ -0,0 +1,51 @@ + + + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + + \ No newline at end of file diff --git a/.vs/exfat.vcxproj b/.vs/exfat.vcxproj index d37088f..e94a96e 100644 --- a/.vs/exfat.vcxproj +++ b/.vs/exfat.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -254,6 +257,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -279,7 +283,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -308,7 +312,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -337,7 +341,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -367,7 +371,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/ext2.vcxproj b/.vs/ext2.vcxproj index 2a0565c..d79be19 100644 --- a/.vs/ext2.vcxproj +++ b/.vs/ext2.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -254,6 +257,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -279,7 +283,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -308,7 +312,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -337,7 +341,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -367,7 +371,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/f2fs.vcxproj b/.vs/f2fs.vcxproj index af1bf8d..971576f 100644 --- a/.vs/f2fs.vcxproj +++ b/.vs/f2fs.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -254,6 +257,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -279,7 +283,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -308,7 +312,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -337,7 +341,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -367,7 +371,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/grub.vcxproj b/.vs/grub.vcxproj index 4e99df4..fa7c722 100644 --- a/.vs/grub.vcxproj +++ b/.vs/grub.vcxproj @@ -159,7 +159,7 @@ ProgramDatabase Default false - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) true @@ -185,7 +185,7 @@ call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) ProgramDatabase Default false - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) true @@ -211,7 +211,7 @@ call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) ProgramDatabase Default false - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) true @@ -237,7 +237,7 @@ call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) ProgramDatabase Default false - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) true @@ -262,7 +262,7 @@ call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) MultiThreaded ProgramDatabase false - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -291,7 +291,7 @@ call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) MultiThreaded ProgramDatabase false - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -320,7 +320,7 @@ call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) MultiThreaded ProgramDatabase false - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -349,7 +349,7 @@ call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) MultiThreaded ProgramDatabase false - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/hfs.vcxproj b/.vs/hfs.vcxproj index 8960c38..805e5c1 100644 --- a/.vs/hfs.vcxproj +++ b/.vs/hfs.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -254,6 +257,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -279,7 +283,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -308,7 +312,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -337,7 +341,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -367,7 +371,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/hfsplus.vcxproj b/.vs/hfsplus.vcxproj index 972706a..5b24e4c 100644 --- a/.vs/hfsplus.vcxproj +++ b/.vs/hfsplus.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -254,6 +257,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -279,7 +283,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -308,7 +312,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -337,7 +341,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -367,7 +371,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/iso9660.vcxproj b/.vs/iso9660.vcxproj index a85259a..0179622 100644 --- a/.vs/iso9660.vcxproj +++ b/.vs/iso9660.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -254,6 +257,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -279,7 +283,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -308,7 +312,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -337,7 +341,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -367,7 +371,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/jfs.vcxproj b/.vs/jfs.vcxproj index 2c6e8f3..082885f 100644 --- a/.vs/jfs.vcxproj +++ b/.vs/jfs.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -254,6 +257,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -279,7 +283,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -308,7 +312,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -337,7 +341,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -367,7 +371,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/nilfs2.vcxproj b/.vs/nilfs2.vcxproj index d69c91d..b29c6fd 100644 --- a/.vs/nilfs2.vcxproj +++ b/.vs/nilfs2.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -254,6 +257,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -279,7 +283,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -308,7 +312,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -337,7 +341,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -367,7 +371,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/ntfs.vcxproj b/.vs/ntfs.vcxproj index e2ccd47..606591d 100644 --- a/.vs/ntfs.vcxproj +++ b/.vs/ntfs.vcxproj @@ -171,7 +171,7 @@ Default false MultiThreadedDebug - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -200,7 +200,7 @@ Default false MultiThreadedDebug - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -228,7 +228,7 @@ Default false MultiThreadedDebug - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -257,7 +257,7 @@ Default false MultiThreadedDebug - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -283,7 +283,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -314,7 +314,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -343,7 +343,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -375,7 +375,7 @@ false MultiThreaded MinSpace - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) EFI Application diff --git a/.vs/reiserfs.vcxproj b/.vs/reiserfs.vcxproj index a396679..0fb2526 100644 --- a/.vs/reiserfs.vcxproj +++ b/.vs/reiserfs.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -254,6 +257,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -279,7 +283,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -308,7 +312,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -337,7 +341,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -367,7 +371,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/sfs.vcxproj b/.vs/sfs.vcxproj index d2df3f6..6ccfb1f 100644 --- a/.vs/sfs.vcxproj +++ b/.vs/sfs.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -253,6 +256,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -278,7 +282,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -307,7 +311,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -336,7 +340,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -365,7 +369,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/squashfs.vcxproj b/.vs/squashfs.vcxproj index 3377769..5efdde1 100644 --- a/.vs/squashfs.vcxproj +++ b/.vs/squashfs.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -253,6 +256,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -278,7 +282,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -307,7 +311,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -336,7 +340,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -365,7 +369,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/udf.vcxproj b/.vs/udf.vcxproj index fd31efa..0e8e070 100644 --- a/.vs/udf.vcxproj +++ b/.vs/udf.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -254,6 +257,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -279,7 +283,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -308,7 +312,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -337,7 +341,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -367,7 +371,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/ufs.vcxproj b/.vs/ufs.vcxproj index 199cc65..40f0d54 100644 --- a/.vs/ufs.vcxproj +++ b/.vs/ufs.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -253,6 +256,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -278,7 +282,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -307,7 +311,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -336,7 +340,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -365,7 +369,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/ufs2.vcxproj b/.vs/ufs2.vcxproj index 96956ce..73b15f9 100644 --- a/.vs/ufs2.vcxproj +++ b/.vs/ufs2.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -253,6 +256,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -278,7 +282,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -307,7 +311,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -336,7 +340,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -365,7 +369,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/xfs.vcxproj b/.vs/xfs.vcxproj index e4a323f..bbafa1c 100644 --- a/.vs/xfs.vcxproj +++ b/.vs/xfs.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -253,6 +256,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -278,7 +282,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -307,7 +311,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -336,7 +340,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -365,7 +369,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/.vs/zfs.vcxproj b/.vs/zfs.vcxproj index 95d75e5..5f76d76 100644 --- a/.vs/zfs.vcxproj +++ b/.vs/zfs.vcxproj @@ -171,6 +171,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -198,6 +199,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -226,6 +228,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -253,6 +256,7 @@ Default false MultiThreadedDebug + /Oi- /std:clatest %(AdditionalOptions) EFI Application @@ -278,7 +282,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -307,7 +311,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -336,7 +340,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace @@ -365,7 +369,7 @@ Level3 false MultiThreaded - /Oi- %(AdditionalOptions) + /Oi- /std:clatest %(AdditionalOptions) MinSpace diff --git a/0001-GRUB-fixes.patch b/0001-GRUB-fixes.patch index 3fa6b1f..022ab18 100644 --- a/0001-GRUB-fixes.patch +++ b/0001-GRUB-fixes.patch @@ -1,6 +1,6 @@ -From e56b3efa53f4dfb99b2b5c8315826986477039ac Mon Sep 17 00:00:00 2001 +From c1eb6b7996d16ab05af43726539b22853abeefd9 Mon Sep 17 00:00:00 2001 From: Pete Batard -Date: Sun, 19 May 2024 11:56:58 +0100 +Date: Tue, 4 Jun 2024 16:50:10 +0100 Subject: [PATCH] GRUB fixes --- @@ -9,6 +9,7 @@ Subject: [PATCH] GRUB fixes grub-core/fs/btrfs.c | 52 +++++++++++++++++----------- grub-core/fs/cbfs.c | 2 +- grub-core/fs/cpio_common.c | 2 +- + grub-core/fs/erofs.c | 6 ++++ grub-core/fs/f2fs.c | 2 ++ grub-core/fs/fat.c | 8 +++-- grub-core/fs/hfs.c | 6 ++++ @@ -46,16 +47,16 @@ Subject: [PATCH] GRUB fixes include/grub/fat.h | 2 ++ include/grub/hfs.h | 2 ++ include/grub/hfsplus.h | 6 ++++ - include/grub/misc.h | 13 +++++++ + include/grub/misc.h | 5 +++ include/grub/ntfs.h | 2 ++ - include/grub/safemath.h | 8 +++++ + include/grub/safemath.h | 24 +++++++++++++ include/grub/term.h | 4 +-- include/grub/types.h | 42 +++++++++++++++------- include/grub/unicode.h | 2 ++ include/grub/x86_64/types.h | 2 +- include/grub/zfs/zap_leaf.h | 2 ++ include/grub/zfs/zio.h | 2 ++ - 51 files changed, 261 insertions(+), 87 deletions(-) + 52 files changed, 275 insertions(+), 87 deletions(-) diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c index ed606b3f1..3f298a696 100644 @@ -303,6 +304,56 @@ index 5d41b6fdb..042870715 100644 { struct head hd; grub_size_t namesize; +diff --git a/grub-core/fs/erofs.c b/grub-core/fs/erofs.c +index 46cfc2e5c..dde762d02 100644 +--- a/grub-core/fs/erofs.c ++++ b/grub-core/fs/erofs.c +@@ -37,6 +37,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); + #define EROFS_FEATURE_INCOMPAT_CHUNKED_FILE 0x00000004 + #define EROFS_ALL_FEATURE_INCOMPAT EROFS_FEATURE_INCOMPAT_CHUNKED_FILE + ++PRAGMA_BEGIN_PACKED + struct grub_erofs_super + { + grub_uint32_t magic; +@@ -71,6 +72,7 @@ struct grub_erofs_super + grub_uint64_t packed_nid; + grub_uint8_t reserved2[24]; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + #define EROFS_INODE_LAYOUT_COMPACT 0 + #define EROFS_INODE_LAYOUT_EXTENDED 1 +@@ -87,11 +89,13 @@ struct grub_erofs_super + #define EROFS_I_VERSION_BIT 0 + #define EROFS_I_DATALAYOUT_BIT 1 + ++PRAGMA_BEGIN_PACKED + struct grub_erofs_inode_chunk_info + { + grub_uint16_t format; + grub_uint16_t reserved; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + #define EROFS_CHUNK_FORMAT_BLKBITS_MASK 0x001F + #define EROFS_CHUNK_FORMAT_INDEXES 0x0020 +@@ -122,6 +126,7 @@ union grub_erofs_inode_i_u + struct grub_erofs_inode_chunk_info c; + }; + ++PRAGMA_BEGIN_PACKED + struct grub_erofs_inode_compact + { + grub_uint16_t i_format; +@@ -183,6 +188,7 @@ struct grub_erofs_dirent + grub_uint8_t file_type; + grub_uint8_t reserved; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_erofs_map_blocks + { diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c index 855e24618..273ff806d 100644 --- a/grub-core/fs/f2fs.c @@ -1379,33 +1430,20 @@ index 2d8336aff..8627dc47e 100644 /* Return the offset of the record with the index INDEX, in the node NODE which is part of the B+ tree BTREE. */ diff --git a/include/grub/misc.h b/include/grub/misc.h -index 1b35a167f..2b3be1c57 100644 +index 1b35a167f..8ef1e4d6c 100644 --- a/include/grub/misc.h +++ b/include/grub/misc.h -@@ -27,12 +27,22 @@ - #include - #include - -+#ifndef _MSC_VER - #define ALIGN_UP(addr, align) \ - (((addr) + (typeof (addr)) (align) - 1) & ~((typeof (addr)) (align) - 1)) +@@ -32,7 +32,9 @@ #define ALIGN_UP_OVERHEAD(addr, align) ((-(addr)) & ((typeof (addr)) (align) - 1)) #define ALIGN_DOWN(addr, align) \ ((addr) & ~((typeof (addr)) (align) - 1)) -+#else -+#define ALIGN_UP(addr, align) \ -+ (((addr) + (align) - 1) & ~((align) - 1)) -+#define ALIGN_UP_OVERHEAD(addr, align) ((-(addr)) & ((align) - 1)) -+#define ALIGN_DOWN(addr, align) \ -+ ((addr) & ~((align) - 1)) -+#endif +#ifndef ARRAY_SIZE #define ARRAY_SIZE(array) (sizeof (array) / sizeof (array[0])) +#endif #define COMPILE_TIME_ASSERT(cond) switch (0) { case 1: case !(cond): ; } #define grub_dprintf(condition, ...) grub_real_dprintf(GRUB_FILE, __LINE__, condition, __VA_ARGS__) -@@ -292,6 +302,9 @@ grub_uuidcasecmp (const char *uuid1, const char *uuid2, grub_size_t n) +@@ -292,6 +294,9 @@ grub_uuidcasecmp (const char *uuid1, const char *uuid2, grub_size_t n) * ... or ... * l = grub_strtoul(s, (const char ** const)&end, 10); */ @@ -1436,24 +1474,40 @@ index d1a6af696..203e0141e 100644 struct grub_ntfs_attr { diff --git a/include/grub/safemath.h b/include/grub/safemath.h -index fbd9b5925..7589bfc65 100644 +index e032f63a0..095695bda 100644 --- a/include/grub/safemath.h +++ b/include/grub/safemath.h -@@ -30,6 +30,14 @@ - #define grub_sub(a, b, res) __builtin_sub_overflow(a, b, res) - #define grub_mul(a, b, res) __builtin_mul_overflow(a, b, res) +@@ -47,6 +47,30 @@ + __failed; \ + }) +#elif defined(_MSC_VER) + +#include ++#include ++#include + +#define grub_add(a, b, res) UIntPtrAdd(a, b, res) +#define grub_sub(a, b, res) UIntPtrSub(a, b, res) +#define grub_mul(a, b, res) UIntPtrMult(a, b, res) + - #define grub_cast(a, res) grub_add ((a), 0, (res)) - ++#define grub_cast(a, res) grub_add ((a), 0, (res)) ++ ++// Only used by EROFS for now... ++static __inline bool ALIGN_UP_OVF(uintptr_t v, uintptr_t align, uintptr_t* res) ++{ ++ bool __failed; ++ uintptr_t __a = ((uintptr_t)(align) - 1); ++ ++ __failed = FAILED(grub_add (v, __a, res)); ++ if (__failed == false) ++ *(res) &= ~__a; ++ return __failed; ++} ++ #else + #error gcc 5.1 or newer or clang 8.0 or newer is required + #endif diff --git a/include/grub/term.h b/include/grub/term.h index 7f1a14c84..6daa584a1 100644 --- a/include/grub/term.h @@ -1636,5 +1690,5 @@ index 19ce136bb..11ee51b61 100644 /* * Gang block headers are self-checksumming and contain an array -- -2.45.1.windows.1 +2.45.2.windows.1 diff --git a/EfiFs.sln b/EfiFs.sln index 89bc7e4..ed27126 100644 --- a/EfiFs.sln +++ b/EfiFs.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27004.2006 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34330.188 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntfs", ".vs\ntfs.vcxproj", "{DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}" ProjectSection(ProjectDependencies) = postProject @@ -160,6 +160,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "f2fs", ".vs\f2fs.vcxproj", {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968} = {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "erofs", ".vs\erofs.vcxproj", "{6A8C4102-1C13-4AE9-A691-BF8EE908D89F}" + ProjectSection(ProjectDependencies) = postProject + {628E3F58-0AA9-40BB-8E49-D8CC513AAD63} = {628E3F58-0AA9-40BB-8E49-D8CC513AAD63} + {3135D563-9596-4584-9ED6-616ADEC52974} = {3135D563-9596-4584-9ED6-616ADEC52974} + {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968} = {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|arm = Debug|arm @@ -540,6 +547,22 @@ Global {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Release|ia32.Build.0 = Release|Win32 {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Release|x64.ActiveCfg = Release|x64 {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Release|x64.Build.0 = Release|x64 + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Debug|arm.ActiveCfg = Debug|ARM + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Debug|arm.Build.0 = Debug|ARM + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Debug|aa64.ActiveCfg = Debug|ARM64 + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Debug|aa64.Build.0 = Debug|ARM64 + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Debug|ia32.ActiveCfg = Debug|Win32 + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Debug|ia32.Build.0 = Debug|Win32 + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Debug|x64.ActiveCfg = Debug|x64 + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Debug|x64.Build.0 = Debug|x64 + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Release|arm.ActiveCfg = Release|ARM + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Release|arm.Build.0 = Release|ARM + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Release|aa64.ActiveCfg = Release|ARM64 + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Release|aa64.Build.0 = Release|ARM64 + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Release|ia32.ActiveCfg = Release|Win32 + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Release|ia32.Build.0 = Release|Win32 + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Release|x64.ActiveCfg = Release|x64 + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -568,5 +591,6 @@ Global {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51} = {F52EBFEF-72E2-444F-8BE5-36059421C6D5} {9CD88C50-8673-473B-879A-8B7FDCBCE5C9} = {F52EBFEF-72E2-444F-8BE5-36059421C6D5} {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B} = {F52EBFEF-72E2-444F-8BE5-36059421C6D5} + {6A8C4102-1C13-4AE9-A691-BF8EE908D89F} = {F52EBFEF-72E2-444F-8BE5-36059421C6D5} EndGlobalSection EndGlobal diff --git a/EfiFsPkg.dsc b/EfiFsPkg.dsc index d08a7e9..5e89e76 100644 --- a/EfiFsPkg.dsc +++ b/EfiFsPkg.dsc @@ -68,6 +68,7 @@ EfiFsPkg/EfiFsPkg/Cbfs.inf EfiFsPkg/EfiFsPkg/Cpio.inf EfiFsPkg/EfiFsPkg/CpioBe.inf + EfiFsPkg/EfiFsPkg/EroFs.inf EfiFsPkg/EfiFsPkg/Ext2.inf EfiFsPkg/EfiFsPkg/ExFat.inf EfiFsPkg/EfiFsPkg/F2fs.inf diff --git a/EfiFsPkg/Affs.inf b/EfiFsPkg/Affs.inf index 675140f..08c01af 100644 --- a/EfiFsPkg/Affs.inf +++ b/EfiFsPkg/Affs.inf @@ -68,5 +68,5 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Amiga FFS\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 GCC:*_*_*_CC_FLAGS = -Wno-overflow diff --git a/EfiFsPkg/Afs.inf b/EfiFsPkg/Afs.inf index d50f646..23e8dde 100644 --- a/EfiFsPkg/Afs.inf +++ b/EfiFsPkg/Afs.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"AFS\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Bfs.inf b/EfiFsPkg/Bfs.inf index 88ad71a..c5311a2 100644 --- a/EfiFsPkg/Bfs.inf +++ b/EfiFsPkg/Bfs.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"BFS\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Btrfs.inf b/EfiFsPkg/Btrfs.inf index f84e668..cc3c139 100644 --- a/EfiFsPkg/Btrfs.inf +++ b/EfiFsPkg/Btrfs.inf @@ -84,4 +84,4 @@ *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"Btrfs\" *_*_*_CC_FLAGS = -DEXTRAMODULE=gzio -DZSTD_NO_TRACE -DGRUB -DNO_RAID6_RECOVERY GCC:*_*_*_CC_FLAGS = -Wno-unused-function - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Cbfs.inf b/EfiFsPkg/Cbfs.inf index 3112e73..5749848 100644 --- a/EfiFsPkg/Cbfs.inf +++ b/EfiFsPkg/Cbfs.inf @@ -70,4 +70,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"CBFS\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Cpio.inf b/EfiFsPkg/Cpio.inf index 505fc37..857c490 100644 --- a/EfiFsPkg/Cpio.inf +++ b/EfiFsPkg/Cpio.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (LE)\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/CpioBe.inf b/EfiFsPkg/CpioBe.inf index 9e8d207..26b495c 100644 --- a/EfiFsPkg/CpioBe.inf +++ b/EfiFsPkg/CpioBe.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (BE)\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/EroFs.inf b/EfiFsPkg/EroFs.inf new file mode 100644 index 0000000..19a1190 --- /dev/null +++ b/EfiFsPkg/EroFs.inf @@ -0,0 +1,71 @@ +## @file +# +# EroFs - EfiFs EROFS File System driver. +# + +[Defines] + INF_VERSION = 0x00010005 + BASE_NAME = erofs + FILE_GUID = 2B0F3769-1EBF-44E9-9BF2-E696C96104A2 + MODULE_TYPE = UEFI_DRIVER + VERSION_STRING = 1.7 + EDK_RELEASE_VERSION = 0x00020000 + EFI_SPECIFICATION_VERSION = 0x00020000 + ENTRY_POINT = FSDriverInstall + +[Sources] + ../src/driver.c + ../src/file.c + ../src/grub.c + ../src/grub_file.c + ../src/logging.c + ../src/missing.c + ../src/this.c + ../src/path.c + ../src/utf8.c + ../grub/grub-core/kern/err.c + ../grub/grub-core/kern/list.c + ../grub/grub-core/kern/misc.c + ../grub/grub-core/fs/fshelp.c + ../grub/grub-core/fs/erofs.c + +[Packages] + EfiFsPkg/EfiFsPkg.dec + MdePkg/MdePkg.dec + ShellPkg/ShellPkg.dec + +[LibraryClasses] + UefiRuntimeServicesTableLib + UefiBootServicesTableLib + MemoryAllocationLib + BaseMemoryLib + BaseLib + UefiLib + UefiDriverEntryPoint + DebugLib + PcdLib + +[Guids] + gEfiFileInfoGuid + gEfiFileSystemInfoGuid + gEfiFileSystemVolumeLabelInfoIdGuid + +[Protocols] + gEfiDiskIoProtocolGuid + gEfiDiskIo2ProtocolGuid + gEfiBlockIoProtocolGuid + gEfiBlockIo2ProtocolGuid + gEfiSimpleFileSystemProtocolGuid + gEfiUnicodeCollationProtocolGuid + gEfiUnicodeCollation2ProtocolGuid + gEfiDevicePathToTextProtocolGuid + +[Pcd] + gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang + gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang + +[BuildOptions] + *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 + *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ext2/3/4\" + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/ExFat.inf b/EfiFsPkg/ExFat.inf index 2cb6789..6999767 100644 --- a/EfiFsPkg/ExFat.inf +++ b/EfiFsPkg/ExFat.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ExFAT\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Ext2.inf b/EfiFsPkg/Ext2.inf index 4e6ccd1..9481eb8 100644 --- a/EfiFsPkg/Ext2.inf +++ b/EfiFsPkg/Ext2.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ext2/3/4\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/F2fs.inf b/EfiFsPkg/F2fs.inf index 093f961..daf9398 100644 --- a/EfiFsPkg/F2fs.inf +++ b/EfiFsPkg/F2fs.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"F2FS\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Fat.inf b/EfiFsPkg/Fat.inf index c23568a..5952513 100644 --- a/EfiFsPkg/Fat.inf +++ b/EfiFsPkg/Fat.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ExFAT\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Hfs.inf b/EfiFsPkg/Hfs.inf index 50c7cf5..422bc3d 100644 --- a/EfiFsPkg/Hfs.inf +++ b/EfiFsPkg/Hfs.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"HFS\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/HfsPlus.inf b/EfiFsPkg/HfsPlus.inf index ebf9560..66a1afc 100644 --- a/EfiFsPkg/HfsPlus.inf +++ b/EfiFsPkg/HfsPlus.inf @@ -72,4 +72,4 @@ *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"HFS+\" # HFS+ has a compressed driver *_*_*_CC_FLAGS = -DCOMPRESSED_DRIVERNAME=$(BASE_NAME)comp -DEXTRAMODULE=gzio - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Iso9660.inf b/EfiFsPkg/Iso9660.inf index e78b72e..df0c878 100644 --- a/EfiFsPkg/Iso9660.inf +++ b/EfiFsPkg/Iso9660.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ISO9660\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Jfs.inf b/EfiFsPkg/Jfs.inf index ef24cab..2c4f2ec 100644 --- a/EfiFsPkg/Jfs.inf +++ b/EfiFsPkg/Jfs.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"JFS\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Minix.inf b/EfiFsPkg/Minix.inf index 30b7d8d..6aaa59a 100644 --- a/EfiFsPkg/Minix.inf +++ b/EfiFsPkg/Minix.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix (LE)\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Minix2.inf b/EfiFsPkg/Minix2.inf index a7a0886..c7009a6 100644 --- a/EfiFsPkg/Minix2.inf +++ b/EfiFsPkg/Minix2.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix2 (LE)\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Minix2Be.inf b/EfiFsPkg/Minix2Be.inf index 206731b..75f4c8c 100644 --- a/EfiFsPkg/Minix2Be.inf +++ b/EfiFsPkg/Minix2Be.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix2 (BE)\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Minix3.inf b/EfiFsPkg/Minix3.inf index d4c2d4c..a326d40 100644 --- a/EfiFsPkg/Minix3.inf +++ b/EfiFsPkg/Minix3.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix3 (LE)\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Minix3Be.inf b/EfiFsPkg/Minix3Be.inf index f18c543..fd0063d 100644 --- a/EfiFsPkg/Minix3Be.inf +++ b/EfiFsPkg/Minix3Be.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix3 (BE)\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/MinixBe.inf b/EfiFsPkg/MinixBe.inf index 21beefd..eb3958b 100644 --- a/EfiFsPkg/MinixBe.inf +++ b/EfiFsPkg/MinixBe.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix (BE)\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/NewC.inf b/EfiFsPkg/NewC.inf index 23407e6..b43b461 100644 --- a/EfiFsPkg/NewC.inf +++ b/EfiFsPkg/NewC.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (newc)\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/NilFs2.inf b/EfiFsPkg/NilFs2.inf index ad31645..4310ef5 100644 --- a/EfiFsPkg/NilFs2.inf +++ b/EfiFsPkg/NilFs2.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"NILFS2\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Ntfs.inf b/EfiFsPkg/Ntfs.inf index 48ddea4..0437ab5 100644 --- a/EfiFsPkg/Ntfs.inf +++ b/EfiFsPkg/Ntfs.inf @@ -71,4 +71,4 @@ *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"NTFS\" # NTFS has a compressed driver *_*_*_CC_FLAGS = -DCOMPRESSED_DRIVERNAME=$(BASE_NAME)comp - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Odc.inf b/EfiFsPkg/Odc.inf index 566cefa..ceebcd8 100644 --- a/EfiFsPkg/Odc.inf +++ b/EfiFsPkg/Odc.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (odc)\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/ProcFs.inf b/EfiFsPkg/ProcFs.inf index edb2522..d389cf5 100644 --- a/EfiFsPkg/ProcFs.inf +++ b/EfiFsPkg/ProcFs.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"procfs\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/ReiserFs.inf b/EfiFsPkg/ReiserFs.inf index a5cd936..e67c5a1 100644 --- a/EfiFsPkg/ReiserFs.inf +++ b/EfiFsPkg/ReiserFs.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ReiserFS\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/RomFs.inf b/EfiFsPkg/RomFs.inf index 60baac1..5d85338 100644 --- a/EfiFsPkg/RomFs.inf +++ b/EfiFsPkg/RomFs.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"romfs\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Sfs.inf b/EfiFsPkg/Sfs.inf index 57941c2..4c85fe5 100644 --- a/EfiFsPkg/Sfs.inf +++ b/EfiFsPkg/Sfs.inf @@ -68,4 +68,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Amiga SFS\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/SquashFs.inf b/EfiFsPkg/SquashFs.inf index c90ab0a..0fee208 100644 --- a/EfiFsPkg/SquashFs.inf +++ b/EfiFsPkg/SquashFs.inf @@ -80,4 +80,4 @@ *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"SquashFS\" # SquashFS uses additional modules *_*_*_CC_FLAGS = -DEXTRAMODULE=gzio -DEXTRAMODULE2=lzopio -DEXTRAMODULE3=xzio - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Tar.inf b/EfiFsPkg/Tar.inf index 9e22186..6bd2f5c 100644 --- a/EfiFsPkg/Tar.inf +++ b/EfiFsPkg/Tar.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"tar\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Udf.inf b/EfiFsPkg/Udf.inf index 45a38bd..d60dba4 100644 --- a/EfiFsPkg/Udf.inf +++ b/EfiFsPkg/Udf.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"UDF\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Ufs.inf b/EfiFsPkg/Ufs.inf index b7cbddf..a017da4 100644 --- a/EfiFsPkg/Ufs.inf +++ b/EfiFsPkg/Ufs.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"UFS (LE)\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Ufs2.inf b/EfiFsPkg/Ufs2.inf index 85a0214..d986b45 100644 --- a/EfiFsPkg/Ufs2.inf +++ b/EfiFsPkg/Ufs2.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"UFS2\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/UfsBe.inf b/EfiFsPkg/UfsBe.inf index 834bb58..2516d0a 100644 --- a/EfiFsPkg/UfsBe.inf +++ b/EfiFsPkg/UfsBe.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"UFS (BE)\"" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Xfs.inf b/EfiFsPkg/Xfs.inf index 8c8940c..acecc86 100644 --- a/EfiFsPkg/Xfs.inf +++ b/EfiFsPkg/Xfs.inf @@ -69,4 +69,4 @@ *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"XFS\" - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Zfs.inf b/EfiFsPkg/Zfs.inf index c4a6a95..84de866 100644 --- a/EfiFsPkg/Zfs.inf +++ b/EfiFsPkg/Zfs.inf @@ -75,4 +75,4 @@ *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ZFS\" # ZFS has an extra module *_*_*_CC_FLAGS = -DEXTRAMODULE=gzio - MSFT:*_*_*_CC_FLAGS = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/Make.common b/Make.common index 1c919a6..6d827ef 100644 --- a/Make.common +++ b/Make.common @@ -167,6 +167,17 @@ ifdef OBJS -include $(OBJS:.o=.d) endif +# Set verbose or nonverbose output similarly to automake's silent rules. +# Default is nonverbose, but, just like with automake, it can be disabled +# with: 'make V=1' +ifneq ($(V),1) + HIDE=@ + ECHO=echo +else + HIDE= + ECHO=true +endif + $(GNUEFI_LIB): $(MAKE) -C$(GNUEFI_DIR) CROSS_COMPILE=$(CROSS_COMPILE) ARCH=$(GNUEFI_ARCH) $(GNUEFI_LIBS) @@ -175,21 +186,21 @@ $(GNUEFI_LIB): driver: $(DRIVER).efi $(DRIVER).efi: $(OBJS) - @echo [LD] $(notdir $@) -ifeq ($(CRT0_LIBS),) - @$(CC) $(LDFLAGS) $(OBJS) -o $(DRIVER).efi $(LIBS) + @$(ECHO) " LD $(notdir $@)" +ifeq ($(CRT0_LIBS),) + $(HIDE)$(CC) $(LDFLAGS) $(OBJS) -o $(DRIVER).efi $(LIBS) else - @$(CC) $(LDFLAGS) $(OBJS) -o $(DRIVER).elf $(LIBS) - @$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel* \ - -j .rela* -j .reloc -j .eh_frame -O binary $(DRIVER).elf $@ - @rm -f $(DRIVER).elf + $(HIDE)$(CC) $(LDFLAGS) $(OBJS) -o $(DRIVER).elf $(LIBS) + $(HIDE)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel* \ + -j .rela* -j .reloc -j .eh_frame -O binary $(DRIVER).elf $@ + $(HIDE)rm -f $(DRIVER).elf endif @chmod a-x $(DRIVER).efi %.o: %.c - @echo [CC] $(notdir $@) - @$(CC) $(CFLAGS) -ffreestanding -c $< -o $@ - @$(CC) -MM $(CFLAGS) $*.c > $*.d + @$(ECHO) " CC $(notdir $@)" + $(HIDE)$(CC) $(CFLAGS) -ffreestanding -c $< -o $@ + $(HIDE)$(CC) -MM $(CFLAGS) $*.c > $*.d clean.common: $(MAKE) -C$(GNUEFI_DIR) ARCH=$(GNUEFI_ARCH) clean diff --git a/_newfs.sh b/_newfs.sh index a44c1d5..beba29d 100644 --- a/_newfs.sh +++ b/_newfs.sh @@ -2,7 +2,8 @@ # This script creates a new driver project TEMPLATE=exfat TEMPLATE_GUID=25E5B551-F9DD-4D25-A7CD-A1090B558A49 -GUID=`curl -ks https://www.guidgen.com | grep YourGuidLabel | sed 's/.*value=\"\(.*\)\".*/\1/'` +GUID=`curl -ks https://www.guidgen.com | grep value= | sed 's/.*value=\"\(.*\)\".*/\1/'` +cd .vs/ cp $TEMPLATE.vcxproj $1.vcxproj cp $TEMPLATE.vcxproj.filters $1.vcxproj.filters cp $TEMPLATE.vcxproj.user $1.vcxproj.user diff --git a/gnu-efi b/gnu-efi index 52c3c36..9e47972 160000 --- a/gnu-efi +++ b/gnu-efi @@ -1 +1 @@ -Subproject commit 52c3c36e34dce51454794ff0034691f3dca402e3 +Subproject commit 9e479726ed02f325c8a82b0985d021ed1fd13f00 diff --git a/grub b/grub index 386b59d..56e5882 160000 --- a/grub +++ b/grub @@ -1 +1 @@ -Subproject commit 386b59ddb42fa3f86ddfe557113b25c8fa16f88c +Subproject commit 56e58828cf3cd32ba4768779accc6655120c3136 diff --git a/src/Makefile b/src/Makefile index 4d4af7c..b3b3d67 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,6 +17,10 @@ btrfs: @rm -f this.o +$(MAKE) DRIVERNAME=$@ DRIVERNAME_STR="Btrfs" FSDIR=fs EXTRAMODULE=gzio EXTRAMODULEDIR=io -f $(DRIVER_MAKEFILE) driver +erofs: + @rm -f this.o + +$(MAKE) DRIVERNAME=$@ DRIVERNAME_STR="EROFS" FSDIR=fs -f $(DRIVER_MAKEFILE) driver + exfat: @rm -f this.o +$(MAKE) DRIVERNAME=$@ DRIVERNAME_STR="ExFAT" FSDIR=fs -f $(DRIVER_MAKEFILE) driver diff --git a/src/grub.c b/src/grub.c index cc80c59..7a92cd7 100644 --- a/src/grub.c +++ b/src/grub.c @@ -144,11 +144,7 @@ grub_realloc(void *p, grub_size_t new_size) if (ptr != NULL) { ptr = &ptr[-1]; -#if defined(__MAKEWITH_GNUEFI) - ptr = ReallocatePool(ptr, (UINTN)*ptr, (UINTN)(new_size + sizeof(grub_size_t))); -#else ptr = ReallocatePool((UINTN)*ptr, (UINTN)(new_size + sizeof(grub_size_t)), ptr); -#endif if (ptr != NULL) *ptr++ = new_size; }