From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.d.kinney@intel.com) Received: from mga09.intel.com (mga09.intel.com []) by groups.io with SMTP; Mon, 22 Jul 2019 15:59:03 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jul 2019 15:59:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,296,1559545200"; d="scan'208";a="169386453" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.254.83.213]) by fmsmga008.fm.intel.com with ESMTP; 22 Jul 2019 15:59:01 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-platforms Patch V3 00/12] Vlv2Tbl2DevicePkg: Remove Linux/Windows differences Date: Mon, 22 Jul 2019 15:58:47 -0700 Message-Id: <20190722225859.24724-1-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit New in V3 --------- * Fix Readme.md for Linux in PACKAGES_PATH setting and edksetup.sh invocation. * Remove non-ASCII characters from source files that is preventing build report generation on Linux systems. * Fix XCODE5 build break in Vlv2TbltDevicePkg/Library/EfiRegTableLib due to use of EFI_BOOT_SCRIPT_WIDTH instead of S3_BOOT_SCRIPT_LIB_WIDTH. * Add missing #ifdef around InitializeSensorInfoVariable() in PlatformDxe. * Add XCODE5 specific DLINK_FLAGS for 4KB aligned sections. * Remove extra sets of parenthesis in if statements to resolve XCODE5 build failures. * Move a local variable declaration structure init to a module global variable to avoid use of memcpy() by XCODE5. * Remove use of #ifdefs on __GNUC__ to make builds the same for all toolchains. This resolves an XCODE5 build failure due to an unsupported pragma. * Replace the use of EfiBootScriptWidth enum values with S3BootScriptWidth enum values when calling S3BootScriptLib services. This resolves an XCODE5 build failure. New in V2 ---------- * Remove MANUFACTURING defaults from DSC file. They are the same as STANDARD defaults, so there is not need to add a MANUFACTURING default section unless there are differences. * Update PlatformSetupDxe to return EFI_UNSUPPORTED from the RouteConfig() and ExtractConfig() services of the HII_CONFIG_ACCESS_PROTOCOL. Branch for review: https://github.com/mdkinney/edk2-platforms/tree/Bug_xxx_Vlv2_Remove_FCE_BAT_sh_V3 Remove all BAT/sh scripts and use OS independent python scripts for PREBULD and POSTBUILD operations and use standard EDK II build command to build MinnowMax FW images and capsules. The use of FCE has also been removed and replaced with a Structured PCD. The default values for Setup forms are now in the file PlatformSetupDefaults.dsc. A regression bug introduced by a recent commit that broke the detection of the BOOT_ON_FLASH_UPDATE boot mode has also been fixed. Capsules are detected and processed correctly again. Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Michael D Kinney (12): Vlv2TbltDevicePkg/PlatformPei: Add boot mode detection Vlv2TbltDevicePkg: Convert use of FCE tool to Structured PCD Vlv2TbltDevicePkg: Remove Linux/GCC specific DSC/FDF files Vlv2TbltDevicePkg: Convert BAT/sh Capsule scripts to Python Vlv2Tbl2DevicePkg: Convert BAT/sh Build scripts to Python Vlv2TbltDevicePkg: Remove non ASCII characters from source files Vlv2Tbl2DevicePkg/EfiRegTableLib: Use S3_BOOT_SCRIPT_LIB_WIDTH Vlv2TbltDevicePkg/PlatformDxe: Add missing #if Vlv2TbltDevicePkg: Add XCODE5 4K alignment DLINK_FLAGS Vlv2TbltDevicePkg: Fix XCODE5 build errors Vlv2TbltDevicePkg: Remove __GNUC__ specific #ifdefs Vlv2TbltDevicePkg/PlatformDxe: Use S3BootScriptWidth enums .../AcpiPlatform/AcpiPlatform.c | 15 +- Platform/Intel/Vlv2TbltDevicePkg/BfmLib.exe | Bin 499712 -> 0 bytes .../Intel/Vlv2TbltDevicePkg/Build_IFWI.bat | 118 -- .../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 100 -- Platform/Intel/Vlv2TbltDevicePkg/FCE.exe | Bin 632832 -> 0 bytes .../Capsule/GenerateCapsule/GenCapsuleAll.bat | 35 - .../Capsule/GenerateCapsule/GenCapsuleAll.py | 397 +++++ .../Capsule/GenerateCapsule/GenCapsuleAll.sh | 33 - .../GenerateCapsule/GenCapsuleMinnowMax.bat | 131 -- .../GenerateCapsule/GenCapsuleMinnowMax.sh | 59 - .../GenCapsuleMinnowMaxRelease.bat | 131 -- .../GenCapsuleMinnowMaxRelease.sh | 64 - .../GenerateCapsule/GenCapsuleSampleColor.bat | 137 -- .../GenerateCapsule/GenCapsuleSampleColor.sh | 70 - .../Feature/Capsule/GenerateCapsule/Lvfs.ddf | 14 - .../LvfsGenCapsuleMinnowMax.bat | 139 -- .../LvfsGenCapsuleMinnowMaxRelease.bat | 139 -- .../LvfsGenCapsuleSampleColor.bat | 145 -- .../GenerateCapsule/template.metainfo.xml | 27 - .../SystemFirmwareDescriptor.aslc | 83 -- .../SystemFirmwareDescriptor.inf | 40 - .../SystemFirmwareDescriptorPei.c | 60 - .../SystemFirmwareUpdateConfig.ini | 66 - .../SystemFirmwareUpdateConfigGcc.ini | 66 - .../Library/EfiRegTableLib/EfiRegTableLib.c | 6 +- .../BoardClkGens/BoardClkGens.c | 8 - .../PciPlatform/PciPlatform.c | 2 +- .../Vlv2TbltDevicePkg/PlatformCapsule.dsc | 39 - .../Vlv2TbltDevicePkg/PlatformCapsule.fdf | 52 - .../Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc | 38 - .../Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf | 52 - .../Vlv2TbltDevicePkg/PlatformDxe/Platform.c | 10 +- .../Vlv2TbltDevicePkg/PlatformDxe/SensorVar.c | 2 + .../PlatformInitPei/CpuInitPeim.c | 12 - .../PlatformInitPei/PchInitPeim.c | 4 +- .../PlatformInitPei/PlatformEarlyInit.c | 86 +- .../PlatformInitPei/PlatformEarlyInit.h | 6 - .../PlatformInitPei/PlatformInitPei.inf | 2 + .../Vlv2TbltDevicePkg/PlatformPei/BootMode.c | 96 +- .../Vlv2TbltDevicePkg/PlatformPei/Platform.c | 6 + .../Vlv2TbltDevicePkg/PlatformPei/Platform.h | 17 + .../Intel/Vlv2TbltDevicePkg/PlatformPkg.dec | 12 + .../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 52 +- .../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 914 ------------ .../Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 1272 ---------------- .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 1289 ----------------- .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 90 +- .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 88 +- .../PlatformSetupDefaults.dsc | 130 ++ .../PlatformSetupDxe/PlatformSetupDxe.c | 145 +- .../PlatformSetupDxe/Vfr.vfr | 17 +- Platform/Intel/Vlv2TbltDevicePkg/PreBuild.py | 348 +++++ Platform/Intel/Vlv2TbltDevicePkg/Readme.md | 64 +- .../Stitch/Gcc/NvStorageFtwSpare.bin | Bin 262144 -> 0 bytes .../Stitch/Gcc/NvStorageFtwWorking.bin | Bin 8192 -> 0 bytes .../Stitch/Gcc/NvStorageVariable.bin | Bin 253952 -> 0 bytes .../VlvPlatformInitDxe/IgdOpRegion.c | 2 +- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 322 ---- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 235 --- 59 files changed, 1258 insertions(+), 6229 deletions(-) delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/BfmLib.exe delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat delete mode 100755 Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/FCE.exe delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat create mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.py delete mode 100755 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.bat delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.bat delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.bat delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.sh delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs.ddf delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsuleMinnowMax.bat delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsuleMinnowMaxRelease.bat delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsuleSampleColor.bat delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/template.metainfo.xml delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfigGcc.ini delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsule.dsc delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsule.fdf delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc create mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDefaults.dsc create mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PreBuild.py delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageFtwSpare.bin delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageFtwWorking.bin delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat delete mode 100755 Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh -- 2.21.0.windows.1