diff options
author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-03-05 08:08:23 +0000 |
---|---|---|
committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-03-05 08:08:23 +0000 |
commit | 2dcef689963d9f975b0d792e677c2d43cf3cc995 (patch) | |
tree | fdea84fc092e76238ec30916228b55c18319a010 | |
parent | b80022da3b54bda5de3da298a56a7ec0e5873384 (diff) | |
download | edk2-2dcef689963d9f975b0d792e677c2d43cf3cc995.zip edk2-2dcef689963d9f975b0d792e677c2d43cf3cc995.tar.gz edk2-2dcef689963d9f975b0d792e677c2d43cf3cc995.tar.bz2 |
UnixPkg: Use build flag to prevent FatPkg from being required
In the default case we use FatBinPkg from the edk2 tree.
"-D COMPILE_BINS" can be used on the command line if FatPkg
is present and needs to be built.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11345 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r-- | UnixPkg/UnixPkg.dsc | 4 | ||||
-rw-r--r-- | UnixPkg/UnixPkg.fdf | 5 | ||||
-rw-r--r-- | UnixPkg/UnixPkgX64.dsc | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/UnixPkg/UnixPkg.dsc b/UnixPkg/UnixPkg.dsc index 7673a30..76e0e98 100644 --- a/UnixPkg/UnixPkg.dsc +++ b/UnixPkg/UnixPkg.dsc @@ -327,5 +327,7 @@ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
}
- #FatPkg/EnhancedFatDxe/Fat.inf
+!if $(COMPILE_BINS)
+ FatPkg/EnhancedFatDxe/Fat.inf
+!endif
diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf index 22c134f..9548541 100644 --- a/UnixPkg/UnixPkg.fdf +++ b/UnixPkg/UnixPkg.fdf @@ -247,8 +247,11 @@ INF UnixPkg/UnixSnpDxe/UnixSnpDxe.inf #
# Build from source or use checked in binary
#
-#INF FatPkg/EnhancedFatDxe/Fat.inf
+!if $(COMPILE_BINS)
+INF FatPkg/EnhancedFatDxe/Fat.inf
+!else
INF RuleOverride = BINARY USE = IA32 FatBinPkg/EnhancedFatDxe/Fat.inf
+!endif
# If you build GccShellPkg you can source level debug shell
#FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
diff --git a/UnixPkg/UnixPkgX64.dsc b/UnixPkg/UnixPkgX64.dsc index 95a7877..2ff5b9d 100644 --- a/UnixPkg/UnixPkgX64.dsc +++ b/UnixPkg/UnixPkgX64.dsc @@ -328,5 +328,7 @@ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
}
+!if $(COMPILE_BINS)
FatPkg/EnhancedFatDxe/Fat.inf
+!endif
!endif
|