Update to match changes in the ArmPkg.

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

diff --git a/ArmPlatformPkg/Bds/BdsEntry.c b/ArmPlatformPkg/Bds/BdsEntry.c
index d126710df1c8c2b9d16c92f57b77809bc45c9d32..a2917a565df169eb8eabf6bc9556583fef150deb 100644 (file)
--- a/ArmPlatformPkg/Bds/BdsEntry.c
+++ b/ArmPlatformPkg/Bds/BdsEntry.c
@@ -13,7 +13,6 @@
 **/
 
 #include <PiDxe.h>
 **/
 
 #include <PiDxe.h>

-#include <Library/BdsLib.h>

 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>


@@ -21,6 +20,7 @@
 #include <Library/PerformanceLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/PcdLib.h>
 #include <Library/PerformanceLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/PcdLib.h>

+#include <Library/BdsLinuxLib.h>

 
 #include <Protocol/Bds.h>
 #include <Protocol/DevicePathToText.h>
 
 #include <Protocol/Bds.h>
 #include <Protocol/DevicePathToText.h>

diff --git a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S
index c8deed83b476df5697c863dc69598f2892afd044..94291fc52c59a7906bf8fac0cf0358181eea41bd 100644 (file)
--- a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S
+++ b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S
@@ -19,8 +19,7 @@
 .align 3\r
 \r
 .globl ASM_PFX(CEntryPoint)\r
 .align 3\r
 \r
 .globl ASM_PFX(CEntryPoint)\r

-.globl ASM_PFX(_ModuleEntryPoint)\r
-INTERWORK_FUNC(_ModuleEntryPoint)
+GCC_ASM_EXPORT(_ModuleEntryPoint)\r

 \r
 ASM_PFX(_ModuleEntryPoint):\r
 \r
 \r
 ASM_PFX(_ModuleEntryPoint):\r
 \r