Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Capsule update feature branch #29

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Capsule update feature branch #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9ee6a75
Got rid of unnecessary comments.
meag04 Jun 16, 2021
02a33f2
Created FmpDeviceLib.c and FmpDeviceLib.inf files and added it to the
kathyaa11 Jun 16, 2021
b3411d6
GenCapsuleAll.py changes for Whiskey Lake
angelaf7 Jun 16, 2021
e2a3429
Implemented necessary PCDs for the System Firmware FMP instance
kathyaa11 Jun 16, 2021
156f20c
Updated the directory for the FmpDeviceLib files
kathyaa11 Jun 16, 2021
3212963
Updated platformflashaccesslib for WhiskeyLake
angelaf7 Jun 16, 2021
2c8b14f
WhiskeylakeOpenBoardPkg: Got rid of unnecessary comments.
meag04 Jun 16, 2021
fabba30
Merge branch 'CapsuleUpdateFeatureBranch' of https://github.com/meag0…
angelaf7 Jun 16, 2021
6e0a9b0
Merge branch 'CapsuleUpdateFeatureBranch' of https://github.com/meag0…
meag04 Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 74 additions & 25 deletions Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## @file
# Generate capsules for Vlv2TbltDevicePkg
# Generate capsules for Whiskey Lake
# openssl must be install and in path
#
# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
Expand All @@ -25,7 +25,7 @@
#
__prog__ = 'GenCapsuleAll'
__copyright__ = 'Copyright (c) 2019, Intel Corporation. All rights reserved.'
__description__ = 'Generate Vlv2Tbl2DevicePkg capsules.\n'
__description__ = 'Generate WhiskeyLake capsules.\n'

#
# Globals
Expand All @@ -34,6 +34,10 @@
gBaseToolsPath = ''
gArgs = None

gPlatformBoardPkg = 'WhiskeylakeOpenBoardPkg'
gBoard = 'UpXtreme'


def LogAlways(Message):
sys.stdout.write (__prog__ + ': ' + Message + '\n')
sys.stdout.flush()
Expand Down Expand Up @@ -170,6 +174,9 @@ def GenCapsuleDevice (BaseName, PayloadFileName, Guid, Version, Lsv, CapsulesPat
Command = Command + ' -v'

Log (Command)
LogAlways (Command)
#LogAlways ("\nPress Enter key to continue \n")
#input("\n")

Process = subprocess.Popen(Command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
ProcessOutput = Process.communicate()
Expand Down Expand Up @@ -201,6 +208,9 @@ def GenCapsuleDevice (BaseName, PayloadFileName, Guid, Version, Lsv, CapsulesPat
else:
Command = 'gcab --create firmware.cab firmware.bin firmware.metainfo.xml'
Log (Command)
LogAlways (Command)
#LogAlways ("\nPress Enter key to continue \n")
#input("\n")

Process = subprocess.Popen(Command, cwd=CapsulesPath, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
ProcessOutput = Process.communicate()
Expand Down Expand Up @@ -241,6 +251,7 @@ def GenCapsuleSampleDevice (SampleDeviceName, Guid, Version, Lsv, CapsulesPath,
#
# Create command line argument parser object
#

parser = argparse.ArgumentParser (
prog = __prog__,
description = __description__ + __copyright__,
Expand Down Expand Up @@ -291,12 +302,13 @@ def GenCapsuleSampleDevice (SampleDeviceName, Guid, Version, Lsv, CapsulesPath,
gArgs, remaining = parser.parse_known_args()
gArgs.BuildType = 'all'
for BuildType in ['all', 'fds', 'genc', 'genmake', 'clean', 'cleanall', 'modules', 'libraries', 'run']:

if BuildType in remaining:
gArgs.BuildType = BuildType
remaining.remove(BuildType)
break
gArgs.Remaining = ' '.join(remaining)

#
# Get WORKSPACE environment variable
#
Expand All @@ -308,6 +320,7 @@ def GenCapsuleSampleDevice (SampleDeviceName, Guid, Version, Lsv, CapsulesPath,
#
# Get PACKAGES_PATH and generate prioritized list of paths
#

PathList = [gWorkspace]
try:
PathList += os.environ['PACKAGES_PATH'].split(os.pathsep)
Expand All @@ -317,6 +330,7 @@ def GenCapsuleSampleDevice (SampleDeviceName, Guid, Version, Lsv, CapsulesPath,
#
# Determine full path to BaseTools
#

for Path in PathList:
if os.path.exists (os.path.join (Path, 'BaseTools')):
gBaseToolsPath = os.path.join (Path, 'BaseTools')
Expand All @@ -334,12 +348,30 @@ def GenCapsuleSampleDevice (SampleDeviceName, Guid, Version, Lsv, CapsulesPath,
OutputDirectory = Line.strip().split('=')[1].strip()
break

OutputDirectory = OutputDirectory.split('/')[0]
OutputDirectory = OutputDirectory + '/' + gPlatformBoardPkg + '/' + gBoard

#
# Determine full paths to EDK II build directory, EDK II build output
# directory and the CPU arch of the UEFI phase.
#
CommandDir = os.path.dirname(sys.argv[0])

EdkiiBuildDir = os.path.join (gWorkspace, OutputDirectory)
LogAlways("\n*** EdkiiBuildDir is")
LogAlways(EdkiiBuildDir)

LogAlways("\n*** OutputDirecory is")
LogAlways(OutputDirectory)
LogAlways("\n*** PlatformBoardPkg is")
LogAlways(gPlatformBoardPkg)
LogAlways("\n*** Board is")
LogAlways(gBoard)

LogAlways("\n*** OutputDirecory after cat is")
LogAlways(OutputDirectory)


EdkiiBuildOutput = os.path.join (EdkiiBuildDir, gArgs.BuildTarget + '_' + gArgs.ToolChain)
UefiArch = gArgs.Arch[0][0]
if len (gArgs.Arch) > 1:
Expand All @@ -365,33 +397,50 @@ def GenCapsuleSampleDevice (SampleDeviceName, Guid, Version, Lsv, CapsulesPath,
#
# Copy CapsuleApp
#
Copy ((EdkiiBuildOutput, UefiArch, 'CapsuleApp.efi'), (CapsulesPath, CapsulesSubDir))
LogAlways("\n*** CapsulesSubDir is")
LogAlways(CapsulesSubDir)

#
# Generate capsules for the Red Sample Device
#
GenCapsuleSampleDevice('Red','72e2945a-00da-448e-9aa7-075ad840f9d4',0x00000010,0x00000000, CapsulesPath, CapsulesSubDir)
GenCapsuleSampleDevice('Red','72e2945a-00da-448e-9aa7-075ad840f9d4',0x00000011,0x00000000, CapsulesPath, CapsulesSubDir)
GenCapsuleSampleDevice('Red','72e2945a-00da-448e-9aa7-075ad840f9d4',0x00000012,0x00000000, CapsulesPath, CapsulesSubDir)
LogAlways("\n*** gBaseToolsPath is")
LogAlways(gBaseToolsPath)

#
# Generate capsules for the Green Sample Device
#
GenCapsuleSampleDevice('Green','79179bfd-704d-4c90-9e02-0ab8d968c18a',0x00000020,0x00000020, CapsulesPath, CapsulesSubDir)
GenCapsuleSampleDevice('Green','79179bfd-704d-4c90-9e02-0ab8d968c18a',0x00000021,0x00000020, CapsulesPath, CapsulesSubDir)
GenCapsuleSampleDevice('Green','79179bfd-704d-4c90-9e02-0ab8d968c18a',0x00000022,0x00000020, CapsulesPath, CapsulesSubDir)
LogAlways("\n*** gWorkspace is")
LogAlways(gWorkspace)

LogAlways("\n*** EdkiiBuildOutput is")
LogAlways(EdkiiBuildOutput)
#LogAlways("\nPress a Key to continue")

#input("\n")

Copy ((EdkiiBuildOutput, UefiArch, 'CapsuleApp.efi'), (CapsulesPath, CapsulesSubDir))

#
# Generate capsules for the Blue Sample Device
# Generate capsules for the Red Sample Device
#
GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0x00000010,0x00000000, CapsulesPath, CapsulesSubDir)
GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0x00000011,0x00000000, CapsulesPath, CapsulesSubDir)
GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0x00000012,0x00000012, CapsulesPath, CapsulesSubDir)
GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0x00000013,0x00000012, CapsulesPath, CapsulesSubDir)
GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0x00000014,0x00000012, CapsulesPath, CapsulesSubDir)

#GenCapsuleSampleDevice('Red','72e2945a-00da-448e-9aa7-075ad840f9d4',0x00000010,0x00000000, CapsulesPath, CapsulesSubDir)
#GenCapsuleSampleDevice('Red','72e2945a-00da-448e-9aa7-075ad840f9d4',0x00000011,0x00000000, CapsulesPath, CapsulesSubDir)
#GenCapsuleSampleDevice('Red','72e2945a-00da-448e-9aa7-075ad840f9d4',0x00000012,0x00000000, CapsulesPath, CapsulesSubDir)
#
# #
# # Generate capsules for the Green Sample Device
# #
# GenCapsuleSampleDevice('Green','79179bfd-704d-4c90-9e02-0ab8d968c18a',0x00000020,0x00000020, CapsulesPath, CapsulesSubDir)
# GenCapsuleSampleDevice('Green','79179bfd-704d-4c90-9e02-0ab8d968c18a',0x00000021,0x00000020, CapsulesPath, CapsulesSubDir)
# GenCapsuleSampleDevice('Green','79179bfd-704d-4c90-9e02-0ab8d968c18a',0x00000022,0x00000020, CapsulesPath, CapsulesSubDir)
#
# #
# # Generate capsules for the Blue Sample Device
# #
# GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0x00000010,0x00000000, CapsulesPath, CapsulesSubDir)
# GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0x00000011,0x00000000, CapsulesPath, CapsulesSubDir)
# GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0x00000012,0x00000012, CapsulesPath, CapsulesSubDir)
# GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0x00000013,0x00000012, CapsulesPath, CapsulesSubDir)
# GenCapsuleSampleDevice('Blue','149da854-7d19-4faa-a91e-862ea1324be6',0x00000014,0x00000012, CapsulesPath, CapsulesSubDir)
#
#
# Generate capsules for Minnow Max Firmware Updates
#
RomFileName = os.path.join (EdkiiBuildOutput, 'FV', 'VLV.fd')
GenCapsuleDevice('MinnowMax', RomFileName,'4096267b-da0a-42eb-b5eb-fef31d207cb4',0x0000000C,0x00000000, CapsulesPath, CapsulesSubDir)
RomFileName = os.path.join (EdkiiBuildOutput, 'FV', 'UpXtremeIFWI.bin')
GenCapsuleDevice('UpXtreme', RomFileName,'A12B2802-BF37-4886-A307-C060F7929F8F',0x0000000C,0x00000000, CapsulesPath, CapsulesSubDir)
#GenCapsuleDevice('upXtreme', RomFileName,'4096267b-da0a-42eb-b5eb-fef31d207cb4',0x0000000C,0x00000000, CapsulesPath, CapsulesSubDir)
LogAlways ("\n *** Capsule update files in directory : \n *** " + CapsulesPath + CapsulesSubDir + "\nEnd of Post-BUILD")
Loading