Add support for a RELASE build

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9858 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 23 insertions, 17 deletions

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index ee23520ff..5d113465b 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -32,12 +32,8 @@
 
 
 [LibraryClasses.common]
-!if TARGET_HACK == DEBUG
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!else
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-!endif
-
+#  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
 
   ArmLib|ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
@@ -169,10 +165,10 @@
   XCODE:*_*_ARM_ARCHCC_FLAGS     == -arch armv6 -march=armv6
   XCODE:*_*_ARM_ARCHASM_FLAGS    == -arch armv6
   XCODE:*_*_ARM_ARCHDLINK_FLAGS  == -arch armv6
+  XCODE:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG 
 
-  RVCT:*_*_ARM_ARCHCC_FLAGS     == --cpu Cortex-A8
-  RVCT:*_*_ARM_ARCHASM_FLAGS    == --cpu Cortex-A8
- 
+  RVCT:*_*_ARM_ARCHCC_FLAGS == --cpu Cortex-A8 
+  RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG 
 
 ################################################################################
 #
diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
index d75a6a94e..d291894a1 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -70,8 +70,8 @@ FV = FVMAIN_COMPACT
 
 [FV.FvMain]
 BlockSize          = 0x40
-NumBlocks          = 0x9000
-FvAlignment        = 8         #FV alignment and FV attributes setting.
+NumBlocks          = 0         # This FV gets compressed so make it just big enough
+FvAlignment        = 8         # FV alignment and FV attributes setting.
 ERASE_POLARITY     = 1
 MEMORY_MAPPED      = TRUE
 STICKY_WRITE       = TRUE
@@ -88,6 +88,8 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 
+  INF MdeModulePkg/Core/Dxe/DxeMain.inf 
+
   #
   # PI DXE Drivers producing Architectural Protocols (EFI Services) 
   #
@@ -194,7 +196,7 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 
   INF BeagleBoardPkg/Sec/Sec.inf
-  INF MdeModulePkg/Core/Dxe/DxeMain.inf 
+#  INF MdeModulePkg/Core/Dxe/DxeMain.inf 
 
   FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {
@@ -260,10 +262,8 @@ READ_LOCK_STATUS   = TRUE
 
 [Rule.Common.DXE_CORE]
   FILE DXE_CORE = $(NAMED_GUID) {
-    GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {
-      PE32     PE32           |.efi
-      UI       STRING="$(MODULE_NAME)" Optional
-    }
+    PE32     PE32           |.efi
+    UI       STRING="$(MODULE_NAME)" Optional
   }
 
 
diff --git a/BeagleBoardPkg/Sec/Sec.c b/BeagleBoardPkg/Sec/Sec.c
index 537475204..a87ff6d65 100755
--- a/BeagleBoardPkg/Sec/Sec.c
+++ b/BeagleBoardPkg/Sec/Sec.c
@@ -260,6 +260,8 @@ CEntryPoint (
   ExtractGuidedSectionLibConstructor();

   LzmaDecompressLibConstructor();

 

+  DecompressFirstFv ();

+

   // Load the DXE Core and transfer control to it

   LoadDxeCoreFromFv(NULL, 0);

   

diff --git a/BeagleBoardPkg/build.sh b/BeagleBoardPkg/build.sh
index ba2d06c59..8eaa1dbdf 100755
--- a/BeagleBoardPkg/build.sh
+++ b/BeagleBoardPkg/build.sh
@@ -73,7 +73,15 @@ case `uname` in
       ;;
 esac
 
-BUILD_ROOT=$WORKSPACE/Build/BeagleBoard/DEBUG_"$TARGET_TOOLS"
+TARGET=DEBUG
+for arg in "$@"
+do
+  if [[ $arg == RELEASE ]]; then
+    TARGET=RELEASE
+  fi
+done
+
+BUILD_ROOT=$WORKSPACE/Build/BeagleBoard/"$TARGET"_"$TARGET_TOOLS"
 GENERATE_IMAGE=$WORKSPACE/BeagleBoardPkg/Tools/generate_image
 FLASH_BOOT=$BUILD_ROOT/FV/BeagleBoard_EFI_flashboot.fd
 
@@ -89,7 +97,7 @@ fi
 #
 # Build the edk2 BeagleBoard code
 #
-build -p $WORKSPACE/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS $1 $2 $3 $4 $5 $6 $7 $8
+build -p $WORKSPACE/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b $TARGET $1 $2 $3 $4 $5 $6 $7 $8
 
 for arg in "$@"
 do