diff --git a/trunk/bootrom/build/bootrom/teg-dev/ARM9/Makefile b/trunk/bootrom/build/bootrom/teg-dev/ARM9/Makefile
index 32df0ec..1f8f3fd 100644
--- a/trunk/bootrom/build/bootrom/teg-dev/ARM9/Makefile
+++ b/trunk/bootrom/build/bootrom/teg-dev/ARM9/Makefile
@@ -1,6 +1,6 @@
 #! make -f
 #----------------------------------------------------------------------------
-# Project:  CtrBrom - bootrom - ts-dev
+# Project:  CtrBrom - bootrom - teg-dev
 # File:     Makefile
 #
 # Copyright 2008 Nintendo.  All rights reserved.
diff --git a/trunk/bootrom/build/buildtools/commondefs b/trunk/bootrom/build/buildtools/commondefs
index 90e7578..90c8c13 100644
--- a/trunk/bootrom/build/buildtools/commondefs
+++ b/trunk/bootrom/build/buildtools/commondefs
@@ -39,7 +39,7 @@ EXO_PLATFORM		?= $(BROM_PLATFORM)
 #
 # CodeGen Target
 #
-#	BROM_PLATFORM  = [TS/TEG/MG20EMU]
+#	BROM_PLATFORM  = [TS/TEG/MG20EMU/NE1EMU]
 #	BROM_MEMSIZE   = [64M/128M]
 #	BROM_CODEGEN   = [ARM/THUMB]
 #	BROM_PROC      = [ARM11/ARM9]
diff --git a/trunk/bootrom/build/libraries/os/ARM11/Makefile b/trunk/bootrom/build/libraries/os/ARM11/Makefile
index e52d918..bfadf58 100644
--- a/trunk/bootrom/build/libraries/os/ARM11/Makefile
+++ b/trunk/bootrom/build/libraries/os/ARM11/Makefile
@@ -28,7 +28,6 @@ BROM_CODEGEN_ALL 	?= TRUE
 SRCDIR		= . ../common
 
 SRCS			= \
-				os_printf.c \
 				os_init.c \
 				os_system.c \
 				os_timer.c \
@@ -40,6 +39,7 @@ SRCS			= \
 				os_thread.c \
 				os_context.c \
 				os_cache.c \
+				os_printf.c \
 
 TARGET_LIB		= libos$(BROM_LIBSUFFIX).a
 
diff --git a/trunk/bootrom/build/libraries/os/ARM9/Makefile b/trunk/bootrom/build/libraries/os/ARM9/Makefile
index 0bea35b..8612c4f 100644
--- a/trunk/bootrom/build/libraries/os/ARM9/Makefile
+++ b/trunk/bootrom/build/libraries/os/ARM9/Makefile
@@ -31,7 +31,6 @@ BROM_PROC		= ARM9
 SRCDIR			= . ../common
 
 SRCS			= \
-				os_printf.c \
 				os_init.c \
 				os_system.c \
 				os_timer.c \
@@ -43,6 +42,7 @@ SRCS			= \
 				os_thread.c \
 				os_context.c \
 				os_cache.c \
+				os_printf.c \
 
 TARGET_LIB		= libos_sp$(BROM_LIBSUFFIX).a
 
diff --git a/trunk/build/buildtools/commondefs b/trunk/build/buildtools/commondefs
index 68f8f9d..498ec97 100644
--- a/trunk/build/buildtools/commondefs
+++ b/trunk/build/buildtools/commondefs
@@ -34,7 +34,7 @@ CTRSDK_VERSION_MAJOR	?= 4
 #
 # CodeGen Target
 #
-#	CTR_PLATFORM  = [TS/TEG/MG20EMU]
+#	CTR_PLATFORM  = [TS/TEG/MG20EMU/NE1EMU]
 #	CTR_MEMSIZE   = [64M/128M]
 #	CTR_CODEGEN   = [ARM/THUMB]
 #	CTR_PROC      = [ARM11/ARM9/ARM7]
diff --git a/trunk/include/ctr/hw/ARM11/mmap_global.h b/trunk/include/ctr/hw/ARM11/mmap_global.h
index 8f1d176..6571e7c 100644
--- a/trunk/include/ctr/hw/ARM11/mmap_global.h
+++ b/trunk/include/ctr/hw/ARM11/mmap_global.h
@@ -26,14 +26,18 @@ extern  "C" {
  *---------------------------------------------------------------------------*/
 
 //----------------------------- MAIN
+#ifndef SDK_NE1EMU
 #define HW_MAIN_MEM             0x20000000
+#else // SDK_NE1EMU
+#define HW_MAIN_MEM             0x80000000
+#endif // SDK_NE1EMU
 #define HW_MAIN_MEM_EX          HW_MAIN_MEM_END
 #define HW_MAIN_MEM_END         (HW_MAIN_MEM + HW_MAIN_MEM_SIZE)
 #define HW_MAIN_MEM_EX_END      (HW_MAIN_MEM + HW_MAIN_MEM_EX_SIZE)
 #define HW_MAIN_MEM_SIZE        0x04000000 // 64MB
 #define HW_MAIN_MEM_EX_SIZE     0x08000000 // 128MB
 
-#ifndef SDK_MG20EMU
+#if !defined(SDK_MG20EMU) && !defined(SDK_NE1EMU)
 //----------------------------- AXI-WRAM
 #define HW_AXI_WRAM             0x1ff80000
 #define HW_AXI_WRAM_END         (HW_AXI_WRAM + HW_AXI_WRAM_SIZE)
@@ -49,7 +53,7 @@ extern  "C" {
 #define HW_VRAM_END             (HW_VRAM + HW_VRAM_SIZE)
 #define HW_VRAM_SIZE            0x400000 // 4MB
 
-#else // SDK_MG20EMU
+#else // SDK_MG20EMU || SDK_NE1EMU
 //----------------------------- AXI-WRAM
 #define HW_AXI_WRAM             (HW_AXI_WRAM_END - HW_AXI_WRAM_SIZE)
 #define HW_AXI_WRAM_END         HW_MAIN_MEM_END
@@ -61,11 +65,15 @@ extern  "C" {
 #define HW_DSP_WRAM_SIZE        0x80000 // 512KB
 
 //----------------------------- VRAM
+#ifdef SDK_MG20EMU
 #define HW_VRAM                 0x1e000000
+#else // SDK_NE1EMU
+#define HW_VRAM                 HW_MAIN_MEM_EX_END
+#endif // SDK_NE1EMU
 #define HW_VRAM_END             (HW_VRAM + HW_VRAM_SIZE)
 #define HW_VRAM_SIZE            0x400000 // 4MB
 
-#endif // SDK_MG20EMU
+#endif // SDK_MG20EMU || SDK_NE1EMU
 
 //----------------------------- IOs
 #define HW_IOREG                0x10000000
@@ -76,11 +84,15 @@ extern  "C" {
 #define HW_APB_REG              (HW_IOREG + 0x00200000)
 #define HW_AHBML_REG            (HW_IOREG + 0x00300000)
 #define HW_GPU_REG              (HW_IOREG + 0x00400000)
-#ifndef SDK_MG20EMU
+#if !defined(SDK_MG20EMU) && !defined(SDK_NE1EMU)
 #define HW_MPCORE_REG           (HW_IOREG + 0x07e00000)
-#else // SDK_MG20EMU
+#else // SDK_MG20EMU || SDK_NE1EMU
+#ifdef SDK_MG20EMU
 #define HW_MPCORE_REG           0xff000000
-#endif // SDK_MG20EMU
+#else // SDK_NE1EMU
+#define HW_MPCORE_REG           0xc0000000
+#endif // SDK_NE1EMU
+#endif // SDK_MG20EMU || SDK_NE1EMU
 #define HW_AHBP_REG_END         (HW_AHBP_REG + HW_AHBP_REG_SIZE)
 #define HW_APB_REG_END          (HW_APB_REG + HW_APB_REG_SIZE)
 #define HW_AHBML_REG_END        (HW_AHBML_REG + HW_AHBML_REG_SIZE)
@@ -93,13 +105,13 @@ extern  "C" {
 #define HW_MPCORE_REG_SIZE      0x20000  // 128KB
 
 //----------------------------- System ROM
-#ifndef SDK_MG20EMU
-#define HW_BIOS_IMG             0x00000000
-#define HW_BIOS                 0x00010000
-#else // SDK_MG20EMU
+#ifdef SDK_MG20EMU
 #define HW_BIOS_IMG             0xfffe0000
 #define HW_BIOS                 0xffff0000
-#endif // SDK_MG20EMU
+#else // include SDK_NE1EMU
+#define HW_BIOS_IMG             0x00000000
+#define HW_BIOS                 0x00010000
+#endif // include SDK_NE1EMU
 #define HW_BIOS_END             (HW_BIOS + HW_BIOS_SIZE)
 #define HW_BIOS_SIZE            0x8000  // 32KB