5 files changed, 10 insertions, 21 deletions
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index cb130e0a17..ccc06db16c 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@@ -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
   #
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
index e381f1fb0c..f2a96cb968 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
@@ -278,7 +278,6 @@
   # Application
   #  
   EmbeddedPkg/Ebl/Ebl.inf
-  ArmPkg/Application/VariableServicesTest/VariableServicesTest.inf
 
 !ifdef $(EDK2_ARMVE_UEFI2_SHELL)
   ShellPkg/Application/Shell/Shell.inf {
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
index 0333e442df..f54404bc45 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
@@ -157,31 +157,13 @@ READ_LOCK_STATUS   = TRUE
   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
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
index 760e450423..6d8c828c76 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
@@ -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
diff --git a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h
index f9e03fb651..64191f32ea 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h
+++ b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h
@@ -70,6 +70,7 @@
 #define ARM_VE_SCC_BASE
 
 // SP810 Controller
+#undef SP810_CTRL_BASE
 #define SP810_CTRL_BASE                         0x1C020000
 
 // PL111 Colour LCD Controller