diff options
| -rw-r--r-- | src/soc/intel/meteorlake/Makefile.mk | 1 | ||||
| -rw-r--r-- | src/vendorcode/intel/edk2/edk2-stable202302/MdePkg/Include/Base.h | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/soc/intel/meteorlake/Makefile.mk b/src/soc/intel/meteorlake/Makefile.mk index 39a1d652f0..893523c304 100644 --- a/src/soc/intel/meteorlake/Makefile.mk +++ b/src/soc/intel/meteorlake/Makefile.mk @@ -60,5 +60,4 @@ smm-y += xhci.c CPPFLAGS_common += -I$(src)/soc/intel/meteorlake CPPFLAGS_common += -I$(src)/soc/intel/meteorlake/include -CFLAGS_common += -fshort-wchar endif diff --git a/src/vendorcode/intel/edk2/edk2-stable202302/MdePkg/Include/Base.h b/src/vendorcode/intel/edk2/edk2-stable202302/MdePkg/Include/Base.h index f1b9c1429d..8cdf6aa5ae 100644 --- a/src/vendorcode/intel/edk2/edk2-stable202302/MdePkg/Include/Base.h +++ b/src/vendorcode/intel/edk2/edk2-stable202302/MdePkg/Include/Base.h @@ -792,8 +792,9 @@ STATIC_ASSERT (sizeof (INT64) == 8, "sizeof (INT64) does not meet UEFI Specifi STATIC_ASSERT (sizeof (UINT64) == 8, "sizeof (UINT64) does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); -STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements"); -STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements"); +// Removed to have coreboot code compile with the Linux gcc defaults. The FSP interface does not need wchar_t anyway. +//STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements"); +//STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements"); // // The following three enum types are used to verify that the compiler |