The IS_ALIGNED macro defined in PlatformBoardConfig.h conflicts with the definition from MdePkg/Include/Base.h.
Since the definitions in CometlakeOpenBoardPkg and WhiskeylakeOpenBoardPkg aren't used, delete them. Signed-off-by: Rebecca Cran <[email protected]> --- Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/PlatformBoardConfig.h | 3 --- Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/PlatformBoardConfig.h b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/PlatformBoardConfig.h index 4d286b897ad7..10f4d8d45861 100644 --- a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/PlatformBoardConfig.h +++ b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/Include/PlatformBoardConfig.h @@ -15,9 +15,6 @@ #include <GpioConfig.h> #include <TbtBoardInfo.h> -#define IS_ALIGNED(addr, size) (((addr) & (size - 1)) ? 0 : 1) -#define ALIGN16(size) (IS_ALIGNED(size, 16) ? size : ((size + 16) & 0xFFF0)) - #define BOARD_CONFIG_BLOCK_PEI_PREMEM_VERSION 0x00000001 #define BOARD_CONFIG_BLOCK_PEI_POSTMEM_VERSION 0x00000001 #define BOARD_CONFIG_BLOCK_DXE_VERSION 0x00000001 diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h index 44b4059f8ebf..e8bd003af79c 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/PlatformBoardConfig.h @@ -15,9 +15,6 @@ #include <GpioConfig.h> #include <TbtBoardInfo.h> -#define IS_ALIGNED(addr, size) (((addr) & (size - 1)) ? 0 : 1) -#define ALIGN16(size) (IS_ALIGNED(size, 16) ? size : ((size + 16) & 0xFFF0)) - #define BOARD_CONFIG_BLOCK_PEI_PREMEM_VERSION 0x00000001 #define BOARD_CONFIG_BLOCK_PEI_POSTMEM_VERSION 0x00000001 #define BOARD_CONFIG_BLOCK_DXE_VERSION 0x00000001 -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104878): https://edk2.groups.io/g/devel/message/104878 Mute This Topic: https://groups.io/mt/98903763/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
