diff --git a/trunk/bootrom/build/bootrom/teg-dev/ARM11/Makefile b/trunk/bootrom/build/bootrom/teg-dev/ARM11/Makefile
index cf95b8d..a0e8105 100644
--- a/trunk/bootrom/build/bootrom/teg-dev/ARM11/Makefile
+++ b/trunk/bootrom/build/bootrom/teg-dev/ARM11/Makefile
@@ -26,14 +26,25 @@ SUBDIRS		=
 
 TARGET_BIN	=	teg_dev11.padbin
 
+CRT0_O		=  
+
 SRCS		=	\
-                main.c \
+                crt0.c \
+                crt0_secure.c \
+                crt0_excp.c \
+
+#SRCS		=	\
+#                main.c \
 
 #SRCDIR		=	# using default
 #LCFILE		=	# using default
 
 include	$(CTRBROM_ROOT)/build/buildtools/commondefs
 
+SRCDIR		=	. \
+                $(ROOT)/bootrom/build/libraries/init/ARM11 \
+                $(ROOT)/bootrom/build/libraries/init/common \
+
 INSTALL_DIR	= ..
 INSTALL_TARGETS	= $(BINDIR)/$(TARGET_BIN_BASENAME).axf
 
diff --git a/trunk/bootrom/build/bootrom/thread/ARM11/Makefile b/trunk/bootrom/build/bootrom/thread/ARM11/Makefile
index cf38a50..ee132c4 100644
--- a/trunk/bootrom/build/bootrom/thread/ARM11/Makefile
+++ b/trunk/bootrom/build/bootrom/thread/ARM11/Makefile
@@ -29,11 +29,12 @@ TARGET_BIN	=	thread11.padbin
 SRCS		=	\
                 main.c \
 
-#SRCDIR		=	# using default
 #LCFILE		=	# using default
 
 include	$(CTRBROM_ROOT)/build/buildtools/commondefs
 
+SRCDIR		=	. $(ROOT)/bootrom/build/tests/thread/ARM11 \
+
 INSTALL_DIR	= ..
 INSTALL_TARGETS	= $(BINDIR)/$(TARGET_BIN_BASENAME).axf
 
diff --git a/trunk/bootrom/build/bootrom/thread/ARM9/Makefile b/trunk/bootrom/build/bootrom/thread/ARM9/Makefile
index bedac83..01c0876 100644
--- a/trunk/bootrom/build/bootrom/thread/ARM9/Makefile
+++ b/trunk/bootrom/build/bootrom/thread/ARM9/Makefile
@@ -31,11 +31,12 @@ TARGET_BIN	=	thread9.padbin
 SRCS		=	\
                 main.c \
 
-#SRCDIR		=	# using default
 #LCFILE		=	# using default
 
 include	$(CTRBROM_ROOT)/build/buildtools/commondefs
 
+SRCDIR		=	. $(ROOT)/bootrom/build/tests/thread/ARM9 \
+
 INSTALL_DIR	= ..
 INSTALL_TARGETS	= $(BINDIR)/$(TARGET_BIN_BASENAME).axf
 
diff --git a/trunk/bootrom/build/bootrom/thread/ARM11/main.c b/trunk/bootrom/build/tests/thread/ARM11/main.c
similarity index 100%
rename from trunk/bootrom/build/bootrom/thread/ARM11/main.c
rename to trunk/bootrom/build/tests/thread/ARM11/main.c
diff --git a/trunk/bootrom/build/bootrom/thread/ARM9/main.c b/trunk/bootrom/build/tests/thread/ARM9/main.c
similarity index 100%
rename from trunk/bootrom/build/bootrom/thread/ARM9/main.c
rename to trunk/bootrom/build/tests/thread/ARM9/main.c
diff --git a/trunk/setup b/trunk/setup
index 7709b56..fdecc8b 100644
--- a/trunk/setup
+++ b/trunk/setup
@@ -8,7 +8,7 @@
 export CTRFIRM_ROOT=`cygpath -m $PWD`
 export CTRBROM_ROOT=$CTRFIRM_ROOT/bootrom
 export CTRSDK_ROOT=$CTRFIRM_ROOT
-export CTR_PLATFORM='MG20EMU'
+export CTR_PLATFORM='NE1EMU'
 export BROM_PLATFORM=$CTR_PLATFORM
 export CYGPATH_NOCMD='TRUE'