From bfed5d80af4cb3d76f9e064bc4d513d1be92ee2e Mon Sep 17 00:00:00 2001 From: Tim He Date: Fri, 23 Jan 2015 08:14:39 +0000 Subject: [PATCH] Increase the BiosID major version to 0.77 and Enable gcc build for minnowboard max with UDK2014.SP1.P1. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Tim He Reviewed-by: David Wei git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16648 6f19259b-4bc3-4df7-8a09-765794883524 --- Vlv2TbltDevicePkg/BiosIdD.env | 2 +- Vlv2TbltDevicePkg/BiosIdR.env | 2 +- Vlv2TbltDevicePkg/BiosIdx64D.env | 2 +- Vlv2TbltDevicePkg/BiosIdx64R.env | 2 +- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 1 + Vlv2TbltDevicePkg/bld_vlv.sh | 2 +- Vlv2TbltDevicePkg/cln.sh | 2 ++ 7 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Vlv2TbltDevicePkg/BiosIdD.env b/Vlv2TbltDevicePkg/BiosIdD.env index a2631e12ec..bee10dd2ee 100644 --- a/Vlv2TbltDevicePkg/BiosIdD.env +++ b/Vlv2TbltDevicePkg/BiosIdD.env @@ -26,5 +26,5 @@ OEM_ID = I32 BUILD_TYPE = D BOARD_ID = BLAKCRB -VERSION_MAJOR = 0076 +VERSION_MAJOR = 0077 VERSION_MINOR = 01 diff --git a/Vlv2TbltDevicePkg/BiosIdR.env b/Vlv2TbltDevicePkg/BiosIdR.env index 051df7a3ce..69bcfb9902 100644 --- a/Vlv2TbltDevicePkg/BiosIdR.env +++ b/Vlv2TbltDevicePkg/BiosIdR.env @@ -26,5 +26,5 @@ OEM_ID = I32 BUILD_TYPE = R BOARD_ID = BLAKCRB -VERSION_MAJOR = 0076 +VERSION_MAJOR = 0077 VERSION_MINOR = 01 diff --git a/Vlv2TbltDevicePkg/BiosIdx64D.env b/Vlv2TbltDevicePkg/BiosIdx64D.env index 585ba614f1..32a7191757 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64D.env +++ b/Vlv2TbltDevicePkg/BiosIdx64D.env @@ -25,6 +25,6 @@ BOARD_REV = 1 OEM_ID = X64 BUILD_TYPE = D -VERSION_MAJOR = 0076 +VERSION_MAJOR = 0077 VERSION_MINOR = 01 BOARD_ID = BBAYCRB diff --git a/Vlv2TbltDevicePkg/BiosIdx64R.env b/Vlv2TbltDevicePkg/BiosIdx64R.env index 961550f77b..fa0fca2dc9 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64R.env +++ b/Vlv2TbltDevicePkg/BiosIdx64R.env @@ -25,6 +25,6 @@ BOARD_REV = 1 OEM_ID = X64 BUILD_TYPE = R -VERSION_MAJOR = 0076 +VERSION_MAJOR = 0077 VERSION_MINOR = 01 BOARD_ID = BBAYCRB diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 7963855cb7..ad643c9acd 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -1371,6 +1371,7 @@ DEFINE PDB_BUILD_OPTION = /Zi !endif + GCC:*_*_*_CC_FLAGS = -Wno-missing-braces !if $(SOURCE_DEBUG_ENABLE) == TRUE MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable GCC:*_*_X64_GENFW_FLAGS = --keepexceptiontable diff --git a/Vlv2TbltDevicePkg/bld_vlv.sh b/Vlv2TbltDevicePkg/bld_vlv.sh index 4c01b1ca3c..e6d5e98852 100644 --- a/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Vlv2TbltDevicePkg/bld_vlv.sh @@ -57,7 +57,7 @@ fi ## Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf ## Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding -. edksetup.sh +. edksetup.sh BaseTools make -C BaseTools ## Define platform specific environment variables. diff --git a/Vlv2TbltDevicePkg/cln.sh b/Vlv2TbltDevicePkg/cln.sh index a0c7f0cbe3..3f0987f0e4 100644 --- a/Vlv2TbltDevicePkg/cln.sh +++ b/Vlv2TbltDevicePkg/cln.sh @@ -6,6 +6,8 @@ echo echo Directories to clean... echo +cd .. + if [ -d "Build" ]; then rm -r Build fi -- 2.39.2