 -  Library\Perf.c
 -  Library\VarCheck.c
 -  Library\HiiSupport.c
+-
+-  newshell\NshellStrings.uni
+-  newshell\init.c
+-  newshell\nshell.h
+-  newshell\fakehii.c
 +  Library/ShellDebug.c
 +  Library/DPath.c
 +  Library/Init.c

 
+[nmake.ARM, nmake.AARCH64]
+  C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
Index: mm/mm.c
===================================================================
--- mm/mm.c	(revision 64)
+++ mm/mm.c	(working copy)
@@ -49,18 +49,18 @@
 
 VOID
 ReadMem (
-  IN  EFI_IO_WIDTH  Width,
-  IN  UINT64        Address,
-  IN  UINTN         Size,
-  IN  VOID          *Buffer
+  IN  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH  Width,
+  IN  UINT64                                 Address,
+  IN  UINTN                                  Size,
+  IN  VOID                                   *Buffer
   );
 
 VOID
 WriteMem (
-  IN  EFI_IO_WIDTH  Width,
-  IN  UINT64        Address,
-  IN  UINTN         Size,
-  IN  VOID          *Buffer
+  IN  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH  Width,
+  IN  UINT64                                 Address,
+  IN  UINTN                                  Size,
+  IN  VOID                                   *Buffer
   );
 
 STATIC
@@ -73,7 +73,7 @@
 //
 // Global Variables
 //
-EFI_HII_HANDLE HiiHandle;
+STATIC EFI_HII_HANDLE HiiHandle;
 EFI_GUID EfiIomodGuid = EFI_IOMOD_GUID;
 SHELL_VAR_CHECK_ITEM    IomodCheckList[] = {
   {
@@ -134,7 +134,7 @@
     NULL,
     0,
     0,

   }
 };
 
diff --git a/DeviceTree/devicetree.h b/DeviceTree/devicetree.h
index c452fc7..07bb939 100644
--- a/DeviceTree/devicetree.h
+++ b/DeviceTree/devicetree.h
@@ -32,3 +32,4 @@ Revision History
     0xf21044af, 0xeef6, 0x4d58, 0xb4, 0x56, 0x32, 0x86, 0xa0, 0x2b, 0x7c, 0x49 \
   }
 #endif
+
diff --git a/DeviceTree/devicetree.inf b/DeviceTree/devicetree.inf
index a86a1a0..7adc097 100644
--- a/DeviceTree/devicetree.inf
+++ b/DeviceTree/devicetree.inf
@@ -40,24 +40,24 @@ COMPONENT_TYPE       = APPLICATION
 
 
 [sources.common]
