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
This commit is contained in:
@@ -97,7 +97,6 @@
|
||||
|
||||
# BDS Libraries
|
||||
BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
|
||||
FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
|
||||
|
||||
[LibraryClasses.common.SEC]
|
||||
DebugSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
|
||||
|
@@ -171,9 +171,13 @@ READ_LOCK_STATUS = TRUE
|
||||
INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
|
||||
|
||||
#
|
||||
# Semi-hosting filesystem
|
||||
|
||||
!if $(EDK2_ARMVE_STANDALONE) != 1
|
||||
#
|
||||
# Semi-hosting filesystem (Required the Hardware Debugger to be connected)
|
||||
#
|
||||
INF ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
|
||||
!endif
|
||||
|
||||
#
|
||||
# FAT filesystem + GPT/MBR partitioning
|
||||
@@ -194,6 +198,10 @@ READ_LOCK_STATUS = TRUE
|
||||
#
|
||||
INF EmbeddedPkg/Ebl/Ebl.inf
|
||||
|
||||
!if $(EDK2_ARMVE_UEFI2_SHELL) == 1
|
||||
INF ShellPkg/Application/Shell/Shell.inf
|
||||
!endif
|
||||
|
||||
#
|
||||
# Bds
|
||||
#
|
||||
|
@@ -278,7 +278,6 @@
|
||||
# Application
|
||||
#
|
||||
EmbeddedPkg/Ebl/Ebl.inf
|
||||
ArmPkg/Application/VariableServicesTest/VariableServicesTest.inf
|
||||
|
||||
!ifdef $(EDK2_ARMVE_UEFI2_SHELL)
|
||||
ShellPkg/Application/Shell/Shell.inf {
|
||||
|
@@ -156,32 +156,14 @@ READ_LOCK_STATUS = TRUE
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
|
||||
#
|
||||
# Multimedia Card Interface
|
||||
#
|
||||
INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
|
||||
INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
|
||||
|
||||
#
|
||||
# UEFI application (Shell Embedded Boot Loader)
|
||||
#
|
||||
INF EmbeddedPkg/Ebl/Ebl.inf
|
||||
|
||||
#
|
||||
# UEFI application (Full EFI Shell)
|
||||
#
|
||||
FILE APPLICATION = PCD(gArmTokenSpaceGuid.PcdShellFile) {
|
||||
SECTION PE32 = EdkShellBinPkg/FullShell/Arm/ShellFull.efi
|
||||
SECTION UI = "ShellFull"
|
||||
}
|
||||
|
||||
!if $(EDK2_ARMVE_UEFI2_SHELL) == 1
|
||||
INF ShellPkg/Application/Shell/Shell.inf
|
||||
!endif
|
||||
#
|
||||
# UEFI application (Test Variable Services)
|
||||
#
|
||||
INF ArmPkg/Application/VariableServicesTest/VariableServicesTest.inf
|
||||
|
||||
#
|
||||
# Bds
|
||||
|
@@ -99,7 +99,6 @@
|
||||
|
||||
# BDS Libraries
|
||||
BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
|
||||
FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
|
||||
|
||||
[LibraryClasses.common.SEC]
|
||||
DebugSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
|
||||
|
@@ -70,6 +70,7 @@
|
||||
#define ARM_VE_SCC_BASE
|
||||
|
||||
// SP810 Controller
|
||||
#undef SP810_CTRL_BASE
|
||||
#define SP810_CTRL_BASE 0x1C020000
|
||||
|
||||
// PL111 Colour LCD Controller
|
||||
|
@@ -21,7 +21,7 @@
|
||||
#include <Library/PrintLib.h>
|
||||
#include <Library/SerialPortLib.h>
|
||||
|
||||
#include <Chipset/ArmV7.h>
|
||||
#include <Chipset/ArmV7.h>
|
||||
|
||||
// When the firmware is built as not Standalone, the secondary cores need to wait the firmware
|
||||
// entirely written into DRAM. It is the firmware from DRAM which will wake up the secondary cores.
|
||||
|
@@ -120,7 +120,7 @@ EblSymbolTable (
|
||||
|
||||
@param Argc Number of command arguments in Argv
|
||||
@param Argv Array of strings that represent the parsed command line.
|
||||
Argv[0] is the comamnd name
|
||||
Argv[0] is the command name
|
||||
|
||||
@return EFI_SUCCESS
|
||||
|
||||
@@ -202,7 +202,7 @@ STATIC CHAR8 *mTokenList[] = {
|
||||
|
||||
@param Argc Number of command arguments in Argv
|
||||
@param Argv Array of strings that represent the parsed command line.
|
||||
Argv[0] is the comamnd name
|
||||
Argv[0] is the command name
|
||||
|
||||
@return EFI_SUCCESS
|
||||
|
||||
|
@@ -21,7 +21,7 @@
|
||||
|
||||
GCC_ASM_IMPORT(CEntryPoint)
|
||||
GCC_ASM_IMPORT(ArmReadMpidr)
|
||||
GCC_ASM_IMPORT(ArmIsMPCore)
|
||||
GCC_ASM_IMPORT(ArmIsMpCore)
|
||||
GCC_ASM_EXPORT(_ModuleEntryPoint)
|
||||
|
||||
StartupAddr: .word CEntryPoint
|
||||
@@ -77,7 +77,7 @@ _SetupStack:
|
||||
_GetStackBase:
|
||||
// Compute Base of Normal stacks for CPU Cores
|
||||
// Is it MpCore system
|
||||
bl ArmIsMPCore
|
||||
bl ArmIsMpCore
|
||||
cmp r0, #0
|
||||
// Case it is not an MP Core system. Just setup the primary core
|
||||
beq _SetupUnicoreStack
|
||||
|
@@ -20,7 +20,7 @@
|
||||
|
||||
IMPORT CEntryPoint
|
||||
IMPORT ArmReadMpidr
|
||||
IMPORT ArmIsMPCore
|
||||
IMPORT ArmIsMpCore
|
||||
EXPORT _ModuleEntryPoint
|
||||
|
||||
PRESERVE8
|
||||
@@ -78,7 +78,7 @@ _SetupStack
|
||||
_GetStackBase
|
||||
// Compute Base of Normal stacks for CPU Cores
|
||||
// Is it MpCore system
|
||||
bl ArmIsMPCore
|
||||
bl ArmIsMpCore
|
||||
cmp r0, #0
|
||||
// Case it is not an MP Core system. Just setup the primary core
|
||||
beq _SetupUnicoreStack
|
||||
|
Reference in New Issue
Block a user