  
  [libraries.common]  
    EfiShellLib
+@@ -72,7 +72,11 @@
+ 
+ [nmake.common]
+   IMAGE_ENTRY_POINT=DrvcfgMain
++
++[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
+   C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings 
+   C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
+   C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
+ 
++[nmake.ARM, nmake.AARCH64]
++  C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
 Index: drvcfg/drvcfg.c
 ===================================================================
 --- drvcfg/drvcfg.c	(revision 64)

 
 [libraries.common]  
   EfiShellLib
Index: attrib/attrib.c
===================================================================
--- attrib/attrib.c	(revision 64)

 
 [libraries.common]  
   EfiShellLib
@@ -63,11 +63,13 @@
 # we will specify some additional DEFINEs on the compile command line.
 #
 [nmake.common]
+  IMAGE_ENTRY_POINT=InitializeShell
+
+[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
   C_PROJ_FLAGS = $(C_PROJ_FLAGS) /Zm500
-  IMAGE_ENTRY_POINT=InitializeShell
   C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings 
   C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
-  C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL=2
+  C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
 
-
- 
\ No newline at end of file
+[nmake.ARM, nmake.AARCH64]
+  C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
Index: newshell/FakeHii.c
===================================================================
--- newshell/FakeHii.c	(revision 64)
