diff --git a/trunk/bootrom/build/bootrom/alarm/rom/Makefile b/trunk/bootrom/build/bootrom/alarm/rom/Makefile
index 2ef54c6..f7f2531 100644
--- a/trunk/bootrom/build/bootrom/alarm/rom/Makefile
+++ b/trunk/bootrom/build/bootrom/alarm/rom/Makefile
@@ -24,7 +24,7 @@ LINCLUDES	=   ../include
 
 #----------------------------------------------------------------------------
 
-TARGET_BIN	=	twl_bootrom.exo
+TARGET_BIN	=	alarm.exo
 
 CRT0_O		=  
 
@@ -35,7 +35,11 @@ SRCS		=	\
 #LCFILE		=	# using default
 
 BROM_PADBIN_ARM11 = ../ARM11/bin/$(BROM_BUILDTYPE_ARM11)/alarm11.padbin
+ifneq	($(BROM_PLATFORM),NE1EMU)
 BROM_PADBIN_ARM9  = ../ARM9/bin/$(BROM_BUILDTYPE_ARM9)/alarm9.padbin
+else
+BROM_PADBIN_ARM9  = $(BROM_PADBIN_ARM11)
+endif
 BROM_DEPENDS = $(BROM_PADBIN_ARM11) $(BROM_PADBIN_ARM9)
 
 MACRO_FLAGS += -DBROM_PADBIN_ARM11=$(BROM_PADBIN_ARM11) \
diff --git a/trunk/bootrom/build/bootrom/ctr_bootrom/rom/Makefile b/trunk/bootrom/build/bootrom/ctr_bootrom/rom/Makefile
index d6b0002..91a8fb6 100644
--- a/trunk/bootrom/build/bootrom/ctr_bootrom/rom/Makefile
+++ b/trunk/bootrom/build/bootrom/ctr_bootrom/rom/Makefile
@@ -35,7 +35,11 @@ SRCS		=	\
 #LCFILE		=	# using default
 
 BROM_PADBIN_ARM11 = ../ARM11/bin/$(BROM_BUILDTYPE_ARM11)/ctr_bootrom11.padbin
+ifneq	($(BROM_PLATFORM),NE1EMU)
 BROM_PADBIN_ARM9  = ../ARM9/bin/$(BROM_BUILDTYPE_ARM9)/ctr_bootrom9.padbin
+else
+BROM_PADBIN_ARM9  = $(BROM_PADBIN_ARM11)
+endif
 BROM_DEPENDS = $(BROM_PADBIN_ARM11) $(BROM_PADBIN_ARM9)
 
 MACRO_FLAGS += -DBROM_PADBIN_ARM11=$(BROM_PADBIN_ARM11) \
diff --git a/trunk/bootrom/build/bootrom/jtag-only/rom/Makefile b/trunk/bootrom/build/bootrom/jtag-only/rom/Makefile
index df8122e..777c27e 100644
--- a/trunk/bootrom/build/bootrom/jtag-only/rom/Makefile
+++ b/trunk/bootrom/build/bootrom/jtag-only/rom/Makefile
@@ -35,7 +35,11 @@ SRCS		=	\
 #LCFILE		=	# using default
 
 BROM_PADBIN_ARM11 = ../ARM11/bin/$(BROM_BUILDTYPE_ARM11)/brom11_jtag_only.padbin
+ifneq	($(BROM_PLATFORM),NE1EMU)
 BROM_PADBIN_ARM9  = ../ARM9/bin/$(BROM_BUILDTYPE_ARM9)/brom9_jtag_only.padbin
+else
+BROM_PADBIN_ARM9  = $(BROM_PADBIN_ARM11)
+endif
 BROM_DEPENDS = $(BROM_PADBIN_ARM11) $(BROM_PADBIN_ARM9)
 
 MACRO_FLAGS += -DBROM_PADBIN_ARM11=$(BROM_PADBIN_ARM11) \
diff --git a/trunk/bootrom/build/bootrom/teg-dev/rom/Makefile b/trunk/bootrom/build/bootrom/teg-dev/rom/Makefile
index 1e149ea..e5c9047 100644
--- a/trunk/bootrom/build/bootrom/teg-dev/rom/Makefile
+++ b/trunk/bootrom/build/bootrom/teg-dev/rom/Makefile
@@ -24,7 +24,7 @@ LINCLUDES	=   ../include
 
 #----------------------------------------------------------------------------
 
-TARGET_BIN	=	twl_bootrom.exo
+TARGET_BIN	=	teg_dev.exo
 
 CRT0_O		=  
 
@@ -35,7 +35,12 @@ SRCS		=	\
 #LCFILE		=	# using default
 
 BROM_PADBIN_ARM11 = ../ARM11/bin/$(BROM_BUILDTYPE_ARM11)/teg_dev11.padbin
+ifneq	($(BROM_PLATFORM),NE1EMU)
 BROM_PADBIN_ARM9  = ../ARM9/bin/$(BROM_BUILDTYPE_ARM9)/teg_dev9.padbin
+else
+BROM_PADBIN_ARM9  = $(BROM_PADBIN_ARM11)
+endif
+
 BROM_DEPENDS = $(BROM_PADBIN_ARM11) $(BROM_PADBIN_ARM9)
 
 MACRO_FLAGS += -DBROM_PADBIN_ARM11=$(BROM_PADBIN_ARM11) \
diff --git a/trunk/bootrom/build/bootrom/thread/rom/Makefile b/trunk/bootrom/build/bootrom/thread/rom/Makefile
index c0789e1..32b6f1f 100644
--- a/trunk/bootrom/build/bootrom/thread/rom/Makefile
+++ b/trunk/bootrom/build/bootrom/thread/rom/Makefile
@@ -35,7 +35,11 @@ SRCS		=	\
 #LCFILE		=	# using default
 
 BROM_PADBIN_ARM11 = ../ARM11/bin/$(BROM_BUILDTYPE_ARM11)/thread11.padbin
+ifneq	($(BROM_PLATFORM),NE1EMU)
 BROM_PADBIN_ARM9  = ../ARM9/bin/$(BROM_BUILDTYPE_ARM9)/thread9.padbin
+else
+BROM_PADBIN_ARM9  = $(BROM_PADBIN_ARM11)
+endif
 BROM_DEPENDS = $(BROM_PADBIN_ARM11) $(BROM_PADBIN_ARM9)
 
 MACRO_FLAGS += -DBROM_PADBIN_ARM11=$(BROM_PADBIN_ARM11) \
diff --git a/trunk/bootrom/build/bootrom/vfp/rom/Makefile b/trunk/bootrom/build/bootrom/vfp/rom/Makefile
index 5bd4e84..9eb0762 100644
--- a/trunk/bootrom/build/bootrom/vfp/rom/Makefile
+++ b/trunk/bootrom/build/bootrom/vfp/rom/Makefile
@@ -24,7 +24,7 @@ LINCLUDES	=   ../include
 
 #----------------------------------------------------------------------------
 
-TARGET_BIN	=	twl_bootrom.exo
+TARGET_BIN	=	vfp.exo
 
 CRT0_O		=  
 
@@ -35,7 +35,11 @@ SRCS		=	\
 #LCFILE		=	# using default
 
 BROM_PADBIN_ARM11 = ../ARM11/bin/$(BROM_BUILDTYPE_ARM11)/vfp11.padbin
+ifneq	($(BROM_PLATFORM),NE1EMU)
 BROM_PADBIN_ARM9  = ../ARM9/bin/$(BROM_BUILDTYPE_ARM9)/vfp9.padbin
+else
+BROM_PADBIN_ARM9  = $(BROM_PADBIN_ARM11)
+endif
 BROM_DEPENDS = $(BROM_PADBIN_ARM11) $(BROM_PADBIN_ARM9)
 
 MACRO_FLAGS += -DBROM_PADBIN_ARM11=$(BROM_PADBIN_ARM11) \
diff --git a/trunk/bootrom/build/buildtools/commondefs b/trunk/bootrom/build/buildtools/commondefs
index edc2467..47e90ab 100644
--- a/trunk/bootrom/build/buildtools/commondefs
+++ b/trunk/bootrom/build/buildtools/commondefs
@@ -323,7 +323,7 @@ BROM_INSTALL_ROOT	:= $(subst $(SPACE),\ ,$(subst \,/,$(CTRBROM_INSTALL_ROOT_)))
 BROM_INSTALL_INCDIR	:= $(BROM_INSTALL_ROOT)/include
 BROM_INSTALL_TOOLSDIR	:= $(BROM_INSTALL_ROOT)/tools
 BROM_INSTALL_LIBDIR	:= $(BROM_INSTALL_ROOT)/lib/$(BROM_LIBTYPE)
-BROM_INSTALL_PROMDIR	:= $(BROM_INSTALL_TOOLSDIR)/prom
+BROM_INSTALL_PROMDIR	:= $(BROM_INSTALL_TOOLSDIR)/prom/$(BROM_PLATFORM)$(BROM_CODEGEN_ARCH)
 BROM_INSTALL_COMPONENTSDIR	:= $(BROM_INSTALL_ROOT)/components
 BROM_INSTALL_ADDINS	:= $(BROM_INSTALL_ROOT)/add-ins