1) Incorporated generating top level makefile. Now platform build is possible (no FD generation).

2) Added GenFw.exe for EFI file generation
3) Changed the destination directory of *.template file to WORKSPACE/Conf
4) Commented out several modules in the MdePkg.dsc file since they cannot be found in the MdePkg package directory.
5) Removed the usage of WORKSPACE_DIR macro in makefile. WORKSPACE is used instead all the way.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2733 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jwang36
2007-06-25 17:00:40 +00:00
parent 79840ee114
commit 8fc4fc3a0e
5 changed files with 22 additions and 22 deletions

Binary file not shown.

Binary file not shown.

View File

@ -92,24 +92,24 @@ ToolChainFamilyMapping = {
Makefile = { Makefile = {
"nmake" : { "nmake" : {
"C-Code" : '''\ "C-Code" : '''\
${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep} ${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep}
${END} "$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(MODULE_DIR)${sep}${fdir}${sep}${fname} ${END} "$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(MODULE_DIR)${sep}${fdir}${sep}${fname}
''', ''',
"AutoGen-Code" : '''\ "AutoGen-Code" : '''\
${BEGIN}$(OUTPUT_DIR)${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep} ${BEGIN}$(OUTPUT_DIR)${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep}
${END} "$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(DEBUG_DIR)${sep}${fname} ${END} "$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(DEBUG_DIR)${sep}${fname}
''', ''',
"Masm-Code" : '''\ "Masm-Code" : '''\
${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep} ${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep}
${END} "$(PP)" $(PP_FLAGS) $(INC) $(MODULE_DIR)${sep}${fdir}${sep}${fname} > $(@D)${sep}${fbase}.i ${END} "$(PP)" $(PP_FLAGS) $(INC) $(MODULE_DIR)${sep}${fdir}${sep}${fname} > $(@D)${sep}${fbase}.i
Trim -CONVERT $(@D)${sep}${fbase}.i Trim -CONVERT $(@D)${sep}${fbase}.i
"$(ASM)" $(ASM_FLAGS) /Fo$@ $(@D)${sep}${fbase}.iii "$(ASM)" $(ASM_FLAGS) /Fo$@ $(@D)${sep}${fbase}.iii
''', ''',
"Iasm-Code" : '''\ "Iasm-Code" : '''\
${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep} ${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep}
${END} "$(APP)" $(APP_FLAGS) $(INC) $< $(PP_OUTPUT)$(@D)${sep}${fbase}.i ${END} "$(APP)" $(APP_FLAGS) $(INC) $< $(PP_OUTPUT)$(@D)${sep}${fbase}.i
"$(ASM)" $(ASM_FLAGS) $(ASM_OUTPUT)$@ $(@D)${sep}${fbase}.i "$(ASM)" $(ASM_FLAGS) $(ASM_OUTPUT)$@ $(@D)${sep}${fbase}.i
''', ''',

View File

@ -78,24 +78,24 @@ echo EDK_TOOLS_PATH = %EDK_TOOLS_PATH%
echo. echo.
REM REM
REM copy *.template to %EDK_TOOLS_PATH%\Conf REM copy *.template to %WORKSPACE%\Conf
REM REM
if NOT exist %EDK_TOOLS_PATH%\Conf mkdir %EDK_TOOLS_PATH%\Conf if NOT exist %WORKSPACE%\Conf mkdir %WORKSPACE%\Conf
if NOT exist %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.db ( if NOT exist %WORKSPACE%\Conf\FrameworkDatabase.db (
echo copying ... FrameworkDatabase.template to %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.db echo copying ... FrameworkDatabase.template to %WORKSPACE%\Conf\FrameworkDatabase.db
copy %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.template %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.db > nul copy %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.template %WORKSPACE%\Conf\FrameworkDatabase.db > nul
) )
if NOT exist %EDK_TOOLS_PATH%\Conf\target.txt ( if NOT exist %WORKSPACE%\Conf\target.txt (
echo copying ... target.template to %EDK_TOOLS_PATH%\Conf\target.txt echo copying ... target.template to %WORKSPACE%\Conf\target.txt
copy %EDK_TOOLS_PATH%\Conf\target.template %EDK_TOOLS_PATH%\Conf\target.txt > nul copy %EDK_TOOLS_PATH%\Conf\target.template %WORKSPACE%\Conf\target.txt > nul
) )
if NOT exist %EDK_TOOLS_PATH%\Conf\tools_def.txt ( if NOT exist %WORKSPACE%\Conf\tools_def.txt (
echo copying ... tools_def.template to %EDK_TOOLS_PATH%\Conf\tools_def.txt echo copying ... tools_def.template to %WORKSPACE%\Conf\tools_def.txt
copy %EDK_TOOLS_PATH%\Conf\tools_def.template %EDK_TOOLS_PATH%\Conf\tools_def.txt > nul copy %EDK_TOOLS_PATH%\Conf\tools_def.template %WORKSPACE%\Conf\tools_def.txt > nul
) )
if NOT exist %EDK_TOOLS_PATH%\Conf\build_rule.txt ( if NOT exist %WORKSPACE%\Conf\build_rule.txt (
echo copying ... build_rule.template to %EDK_TOOLS_PATH%\Conf\build_rule.txt echo copying ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt
copy %EDK_TOOLS_PATH%\Conf\build_rule.template %EDK_TOOLS_PATH%\Conf\build_rule.txt > nul copy %EDK_TOOLS_PATH%\Conf\build_rule.template %WORKSPACE%\Conf\build_rule.txt > nul
) )
REM REM

View File

@ -84,7 +84,7 @@
${WORKSPACE}\MdePkg\Library/BasePciLibCf8/BasePciLibCf8.inf ${WORKSPACE}\MdePkg\Library/BasePciLibCf8/BasePciLibCf8.inf
${WORKSPACE}\MdePkg\Library/BasePciLibPciExpress/BasePciLibPciExpress.inf ${WORKSPACE}\MdePkg\Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
${WORKSPACE}\MdePkg\Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf ${WORKSPACE}\MdePkg\Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
${WORKSPACE}\MdePkg\Library/BasePeCoffLib/BasePeCoffLib.inf # ${WORKSPACE}\MdePkg\Library/BasePeCoffLib/BasePeCoffLib.inf
${WORKSPACE}\MdePkg\Library/BasePerformanceLibNull/BasePerformanceLibNull.inf ${WORKSPACE}\MdePkg\Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
${WORKSPACE}\MdePkg\Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf ${WORKSPACE}\MdePkg\Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
${WORKSPACE}\MdePkg\Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf ${WORKSPACE}\MdePkg\Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
@ -97,16 +97,16 @@
${WORKSPACE}\MdePkg\Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf ${WORKSPACE}\MdePkg\Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf
${WORKSPACE}\MdePkg\Library/DxePcdLib/DxePcdLib.inf ${WORKSPACE}\MdePkg\Library/DxePcdLib/DxePcdLib.inf
${WORKSPACE}\MdePkg\Library/DxeServicesTableLib/DxeServicesTableLib.inf ${WORKSPACE}\MdePkg\Library/DxeServicesTableLib/DxeServicesTableLib.inf
${WORKSPACE}\MdePkg\Library/DxeSmbusLib/DxeSmbusLib.inf # ${WORKSPACE}\MdePkg\Library/DxeSmbusLib/DxeSmbusLib.inf
${WORKSPACE}\MdePkg\Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf ${WORKSPACE}\MdePkg\Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
${WORKSPACE}\MdePkg\Library/PeiHobLib/PeiHobLib.inf # ${WORKSPACE}\MdePkg\Library/PeiHobLib/PeiHobLib.inf
${WORKSPACE}\MdePkg\Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf ${WORKSPACE}\MdePkg\Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
${WORKSPACE}\MdePkg\Library/PeimEntryPoint/PeimEntryPoint.inf ${WORKSPACE}\MdePkg\Library/PeimEntryPoint/PeimEntryPoint.inf
${WORKSPACE}\MdePkg\Library/PeiPcdLib/PeiPcdLib.inf ${WORKSPACE}\MdePkg\Library/PeiPcdLib/PeiPcdLib.inf
${WORKSPACE}\MdePkg\Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf ${WORKSPACE}\MdePkg\Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
${WORKSPACE}\MdePkg\Library/PeiServicesLib/PeiServicesLib.inf ${WORKSPACE}\MdePkg\Library/PeiServicesLib/PeiServicesLib.inf
${WORKSPACE}\MdePkg\Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf ${WORKSPACE}\MdePkg\Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
${WORKSPACE}\MdePkg\Library/PeiSmbusLib/PeiSmbusLib.inf # ${WORKSPACE}\MdePkg\Library/PeiSmbusLib/PeiSmbusLib.inf
${WORKSPACE}\MdePkg\Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf ${WORKSPACE}\MdePkg\Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
${WORKSPACE}\MdePkg\Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf ${WORKSPACE}\MdePkg\Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
${WORKSPACE}\MdePkg\Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf ${WORKSPACE}\MdePkg\Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf