ARM Packages: Fixed Build failings/warnings/EDK2 coding convention

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

8 files changed, 18 insertions, 56 deletions

diff --git a/BeagleBoardPkg/Bds/Bds.inf b/BeagleBoardPkg/Bds/Bds.inf
index cdfbeef99..1b37f0e2f 100644
--- a/BeagleBoardPkg/Bds/Bds.inf
+++ b/BeagleBoardPkg/Bds/Bds.inf
@@ -61,11 +61,5 @@
   gEfiUsbIoProtocolGuid

   gEfiFirmwareVolume2ProtocolGuid

 

-

-[FeaturePcd]  

-

-[FixedPcd]

-  gEmbeddedTokenSpaceGuid.PcdPrePiStackSize

-

 [Depex]

   TRUE

diff --git a/BeagleBoardPkg/BeagleBoardPkg-next.dsc b/BeagleBoardPkg/BeagleBoardPkg-next.dsc
index 357d93a73..22eb06096 100755
--- a/BeagleBoardPkg/BeagleBoardPkg-next.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg-next.dsc
@@ -122,7 +122,6 @@
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf

 

   BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf

-  FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf

 

 [LibraryClasses.common.SEC]

   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf

@@ -175,7 +174,6 @@
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf

 

-

 [LibraryClasses.common.UEFI_APPLICATION]

   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

   UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf

@@ -207,18 +205,11 @@
 

 

 [BuildOptions]

-  XCODE:*_*_ARM_ARCHCC_FLAGS     == -arch armv7 -march=armv7

-  XCODE:*_*_ARM_ARCHASM_FLAGS    == -arch armv7

-  XCODE:*_*_ARM_ARCHDLINK_FLAGS  == -arch armv7

-  XCODE:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG 

+  XCODE:*_*_ARM_PLATFORM_FLAGS == -arch armv7

 

-  GCC:*_*_ARM_ARCHCC_FLAGS     == -march=armv7-a -mthumb

-  GCC:*_*_ARM_ARCHASM_FLAGS    == -march=armv7-a

-  GCC:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG 

+  GCC:*_*_ARM_PLATFORM_FLAGS == -march=armv7-a

 

-  RVCT:*_*_ARM_ARCHCC_FLAGS  == --cpu Cortex-A8 --thumb

-  RVCT:*_*_ARM_ARCHASM_FLAGS == --cpu Cortex-A8 

-  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG 

+  RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A8

 

 ################################################################################

 #

@@ -309,9 +300,6 @@
   gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07

   gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000

   

-  gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase|0

-  gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize|0

-

 #

 # Optional feature to help prevent EFI memory map fragments

 # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob

@@ -347,17 +335,6 @@
   # Size of the region reserved for fixed address allocations (Reserved 32MB)

   gArmTokenSpaceGuid.PcdArmLinuxKernelMaxOffset|0x02000000

 

-  # Reserved to store the HobBase address (top of UEFI Memory Region)

-  #  = (PcdSystemMemoryBase + PcdSystemMemorySize) - sizeof(UINT32)

-  gEmbeddedTokenSpaceGuid.PcdPrePiHobBase|0x87FFFFFC

-

-  #gEmbeddedTokenSpaceGuid.PcdPrePiHobBase|0x80001000

-  gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0x87FE0000 # stack at top of memory

-  gEmbeddedTokenSpaceGuid.PcdPrePiStackSize|0x20000  # 128K stack

-  

-  gEmbeddedTokenSpaceGuid.PcdMemoryBase|0x80000000

-  gEmbeddedTokenSpaceGuid.PcdMemorySize|0x10000000

-

   gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0x80008000

   gArmTokenSpaceGuid.PcdCpuResetAddress|0x80008000

   

@@ -392,14 +369,14 @@
 ################################################################################

 [Components.common]

 

-#

-# SEC

-#

+  #

+  # SEC

+  #

   ArmPlatformPkg/PrePi/PeiUniCore.inf

   

-#

-# DXE

-#

+  #

+  # DXE

+  #

   MdeModulePkg/Core/Dxe/DxeMain.inf {

     <LibraryClasses>

       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index 12b0bdcd0..1410c41c6 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -122,7 +122,6 @@
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf

 

   BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf

-  FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf

 

 [LibraryClasses.common.SEC]

   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf

@@ -202,18 +201,11 @@
 

 

 [BuildOptions]

-  XCODE:*_*_ARM_ARCHCC_FLAGS     == -arch armv7 -march=armv7

-  XCODE:*_*_ARM_ARCHASM_FLAGS    == -arch armv7

-  XCODE:*_*_ARM_ARCHDLINK_FLAGS  == -arch armv7

-  XCODE:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG 

-

-  GCC:*_*_ARM_ARCHCC_FLAGS     == -march=armv7-a -mthumb

-  GCC:*_*_ARM_ARCHASM_FLAGS    == -march=armv7-a

-  GCC:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG 

-

-  RVCT:*_*_ARM_ARCHCC_FLAGS  == --cpu Cortex-A8 --thumb

-  RVCT:*_*_ARM_ARCHASM_FLAGS == --cpu Cortex-A8 

-  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG 

+  XCODE:*_*_ARM_PLATFORM_FLAGS == -arch armv7

+

+  GCC:*_*_ARM_PLATFORM_FLAGS == -march=armv7-a

+

+  RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A8

 

 ################################################################################

 #

diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
index f265b7d80..18d3d3409 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -174,7 +174,6 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/Bds/Bds.inf
 
 
-
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 8
 ERASE_POLARITY     = 1
diff --git a/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c b/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c
index 0a2cb836e..706a19b27 100644
--- a/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c
+++ b/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c
@@ -125,7 +125,7 @@ LibResetSystem (
   switch (ResetType) {

   case EfiResetWarm:

     //Perform warm reset of the system by jumping to the begining of the FV

-    StartOfFv = (CALL_STUB)(UINTN)PcdGet32(PcdFlashFvMainBase);

+    StartOfFv = (CALL_STUB)(UINTN)PcdGet32(PcdFvBaseAddress);

     StartOfFv ();

     break;

   case EfiResetCold:

diff --git a/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf b/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf
index afb03bd69..e19881255 100644
--- a/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf
+++ b/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf
@@ -46,4 +46,4 @@
   UefiBootServicesTableLib

 

 [Pcd]

-  gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase

+  gArmTokenSpaceGuid.PcdFvBaseAddress

diff --git a/BeagleBoardPkg/b.bat b/BeagleBoardPkg/b.bat
index 7fa4ee691..d7136b384 100755
--- a/BeagleBoardPkg/b.bat
+++ b/BeagleBoardPkg/b.bat
@@ -32,7 +32,7 @@ SET TARGET=DEBUG
 SET BUILD_ROOT=%WORKSPACE%\Build\BeagleBoard\%TARGET%_%TARGET_TOOLS%
 
 @REM Build the Beagle Board firmware and creat an FD (FLASH Device) Image.
-CALL build -p BeagleBoardPkg\BeagleBoardPkg.dsc -a ARM -t RVCT31 -b %TARGET% %1 %2 %3 %4 %5 %6 %7 %8
+CALL build -p BeagleBoardPkg\BeagleBoardPkg.dsc -a ARM -t %TARGET_TOOLS% -b %TARGET% %1 %2 %3 %4 %5 %6 %7 %8
 @if ERRORLEVEL 1 goto Exit
 
 @if /I "%1"=="CLEAN" goto Clean

diff --git a/BeagleBoardPkg/build-next.sh b/BeagleBoardPkg/build-next.sh
index ab09284c7..780ef4ce6 100755
--- a/BeagleBoardPkg/build-next.sh
+++ b/BeagleBoardPkg/build-next.sh
@@ -137,7 +137,7 @@ rm -f $FLASH_BOOT
 # point looks so strange. 
 # OMAP 3430 TRM section 26.4.8 has Image header information. (missing in OMAP 3530 TRM)
 #
-$GENERATE_IMAGE -D $WORKSPACE/BeagleBoardPkg/ConfigurationHeader.dat -E 0x80008208 -I $BUILD_ROOT/FV/BEAGLEBOARD_EFI.fd -O $FLASH_BOOT
+$GENERATE_IMAGE -D $WORKSPACE/BeagleBoardPkg/ConfigurationHeader.dat -E 0x80008000 -I $BUILD_ROOT/FV/BEAGLEBOARD_EFI.fd -O $FLASH_BOOT
 
 echo Creating debugger scripts
 process_debug_scripts $WORKSPACE/BeagleBoardPkg/Debugger_scripts