From 2c227a193160e5d86e0ae70b876e43f90ac04902 Mon Sep 17 00:00:00 2001 From: srs5694 Date: Sat, 29 Jun 2013 23:54:41 -0400 Subject: [PATCH] REALLY fixed build problem with development version of EDK2. --- Make.tiano | 1 + Makefile | 2 +- refind/AutoGen.c | 8 +++++++- refind/main.c | 4 +--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Make.tiano b/Make.tiano index 6884a07..5ed907b 100644 --- a/Make.tiano +++ b/Make.tiano @@ -30,6 +30,7 @@ ifeq ($(ARCH),x86_64) endif EDK2BASE = /usr/local/UDK2010/MyWorkSpace +#EDK2BASE = /usr/local/EDK2/tianocore-edk2 # Below file defines TARGET (RELEASE or DEBUG) and TOOL_CHAIN_TAG (GCC44, GCC45, GCC46, or GCC47) include $(EDK2BASE)/Conf/target.txt diff --git a/Makefile b/Makefile index c0c1e43..a84ca25 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ tiano: +make AR_TARGET=mok -C $(MOK_DIR) -f Make.tiano +make BUILDME=refind DLL_TARGET=refind -C $(LOADER_DIR) -f Make.tiano +make -C $(GPTSYNC_DIR) -f Make.tiano - +make -C $(FS_DIR) +# +make -C $(FS_DIR) clean: make -C $(LIBEG_DIR) clean diff --git a/refind/AutoGen.c b/refind/AutoGen.c index 6423efc..22f7f3a 100644 --- a/refind/AutoGen.c +++ b/refind/AutoGen.c @@ -115,6 +115,13 @@ extern const BOOLEAN _gPcd_FixedAtBuild_PcdVerifyNodeInList; #define _PCD_GET_MODE_BOOL_PcdVerifyNodeInList _gPcd_FixedAtBuild_PcdVerifyNodeInList #define _PCD_SET_MODE_BOOL_PcdVerifyNodeInList ASSERT(FALSE) // It is not allowed to set value for a FIXED_AT_BUILD PCD +#define _PCD_TOKEN_PcdMaximumDevicePathNodeCount 6U +#define _PCD_VALUE_PcdMaximumDevicePathNodeCount 0U +GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 _gPcd_FixedAtBuild_PcdMaximumDevicePathNodeCount = _PCD_VALUE_PcdMaximumDevicePathNodeCount; +extern const UINT32 _gPcd_FixedAtBuild_PcdMaximumDevicePathNodeCount; +#define _PCD_GET_MODE_32_PcdMaximumDevicePathNodeCount _gPcd_FixedAtBuild_PcdMaximumDevicePathNodeCount +//#define _PCD_SET_MODE_32_PcdMaximumDevicePathNodeCount ASSERT(FALSE) // It is not allowed to set value for a FIXED_AT_BUILD PCD + #define _PCD_TOKEN_PcdDriverDiagnosticsDisable 6U #define _PCD_VALUE_PcdDriverDiagnosticsDisable ((BOOLEAN)0U) GLOBAL_REMOVE_IF_UNREFERENCED const BOOLEAN _gPcd_FixedAtBuild_PcdDriverDiagnosticsDisable = _PCD_VALUE_PcdDriverDiagnosticsDisable; @@ -150,7 +157,6 @@ extern const UINT32 _gPcd_FixedAtBuild_PcdUefiLibMaxPrintBufferSize; #define _PCD_GET_MODE_32_PcdUefiLibMaxPrintBufferSize _gPcd_FixedAtBuild_PcdUefiLibMaxPrintBufferSize #define _PCD_SET_MODE_32_PcdUefiLibMaxPrintBufferSize ASSERT(FALSE) // It is not allowed to set value for a FIXED_AT_BUILD PCD - EFI_STATUS EFIAPI UefiBootServicesTableLibConstructor ( diff --git a/refind/main.c b/refind/main.c index ca7bb13..2c3b18d 100644 --- a/refind/main.c +++ b/refind/main.c @@ -1228,9 +1228,7 @@ static BOOLEAN ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16 SPrint(FileName, 255, L"\\%s", DirEntry->FileName); CleanUpPathNameSlashes(FileName); - if( /* (!StriSubCmp(L"vmlinuz", DirEntry->FileName) || - !StriSubCmp(L"bzImage", DirEntry->FileName)) && */ - !IsValidLoader(Volume, FileName)) + if(!IsValidLoader(Volume, FileName)) continue; NewLoader = AllocateZeroPool(sizeof(struct LOADER_LIST)); -- 2.39.2