resolve merge conflict

45 files changed, 147 insertions, 4486 deletions

diff --git a/target/arm/Makefile b/target/arm/Makefile
index 17ed6b4b5..c2885e917 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -24,7 +24,7 @@ kernel-install: tools-compile
 
 ifeq ($(ADK_TARGET_FS),nfsroot)
 imageinstall: kernel-install ${BIN_DIR}/${ROOTFSUSERTARBALL}
-	@cp $(KERNEL) $(TARGET_KERNEL)
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
 	@echo 'Type dhcp via u-boot prompt to load kernel'
 	@echo 'After that type bootm to load the kernel'
 endif
@@ -41,25 +41,25 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
 endif
 ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
-	@cp $(KERNEL) $(TARGET_KERNEL)
-	@echo 'The kernel file is: ${TARGET_KERNEL}'
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Use following command to create a QEMU Image:"
 	@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-arm -nographic -kernel $(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
+	@echo 'qemu-system-arm -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
-	@cp $(KERNEL) $(TARGET_KERNEL)
-	@echo 'The kernel file is: ${TARGET_KERNEL}'
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-	@echo 'qemu-system-arm -nographic -kernel $(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-arm -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
-	@cp $(KERNEL) $(TARGET_KERNEL)
-	@echo 'The kernel+initramfs file is: ${TARGET_KERNEL}'
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-arm -nographic -kernel $(TARGET_KERNEL)'
+	@echo 'qemu-system-arm -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
 endif
diff --git a/target/arm/sys-available/toolchain b/target/arm/sys-available/toolchain-arm
index af1aa06a1..83a9bb5de 100644
--- a/target/arm/sys-available/toolchain
+++ b/target/arm/sys-available/toolchain-arm
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
 	bool "Toolchain only"
 	select ADK_arm
-	select ADK_toolchain
+	select ADK_toolchain_arm
 	select ADK_TOOLCHAIN_ONLY
 	select ADK_EABI
 	select ADK_TARGET_NO_FPU
diff --git a/target/armeb/Makefile b/target/armeb/Makefile
index 08ea41264..3acb6dbdb 100644
--- a/target/armeb/Makefile
+++ b/target/armeb/Makefile
@@ -11,8 +11,8 @@ KERNEL:=$(LINUX_DIR)/vmlinux
 
 ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
-	@cp $(KERNEL) $(TARGET_KERNEL)
-	@echo 'The kernel file is: ${TARGET_KERNEL}'
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Use following command to create a QEMU Image:"
 	@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
@@ -21,15 +21,15 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
-	@cp $(KERNEL) $(TARGET_KERNEL)
-	@echo 'The kernel file is: ${TARGET_KERNEL}'
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-	@echo 'qemu-system-arm -nographic -kernel $(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-arm -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
-	@cp $(KERNEL) $(TARGET_KERNEL}
-	@echo 'The kernel+initramfs file is: ${TARGET_KERNEL}'
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL}
+	@echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-arm -nographic -kernel $(TARGET_KERNEL)'
+	@echo 'qemu-system-arm -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
 endif
diff --git a/target/armeb/sys-available/toolchain b/target/armeb/sys-available/toolchain-armeb
index f881c75b8..8e245cb9f 100644
--- a/target/armeb/sys-available/toolchain
+++ b/target/armeb/sys-available/toolchain-armeb
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMEB
 	bool "Toolchain only"
 	select ADK_armeb
-	select ADK_toolchain
+	select ADK_toolchain_armeb
 	select ADK_TOOLCHAIN_ONLY
 	select ADK_EABI
 	select ADK_TARGET_NO_FPU
diff --git a/target/config/Config.in b/target/config/Config.in
index 42e9a65ef..32884f778 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -160,7 +160,7 @@ config ADK_TARGET_CFLAGS
 	default "-march=pentium-m" if ADK_CPU_PENTIUM_M
 	default "-march=amdfam10" if ADK_CPU_AMDFAM10
 	default "-mcpu=v8" if ADK_CPU_SPARC_V8
-	default "-mcpu=v9" if ADK_CPU_SPARC_V9
+	default "-m64 -mcpu=v9" if ADK_CPU_SPARC_V9
 	default "-march=loongson2f" if ADK_CPU_LOONGSON2F
 	default "-march=armv5te -mtune=arm926ej-s" if ADK_CPU_ARMV5
 
@@ -203,7 +203,6 @@ config ADK_TARGET_LIB_UCLIBC
 	depends on \
 		   !ADK_TARGET_SYSTEM_LEMOTE_YEELONG && \
 		   !ADK_LINUX_SPARC64 && \
-		   !ADK_LINUX_SPARC && \
 		   !ADK_LINUX_PPC64 && \
 		   !ADK_LINUX_NATIVE
 	help
diff --git a/target/cris/Makefile b/target/cris/Makefile
index 5aa8b5e93..1e072f78e 100644
--- a/target/cris/Makefile
+++ b/target/cris/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/mk/image.mk
 KERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage
 
 $(TOOLS_BUILD_DIR):
-	mkdir -p $(TOOLS_BUILD_DIR)
+	@mkdir -p $(TOOLS_BUILD_DIR)
 
 tools-compile: $(TOOLS_BUILD_DIR)
 	$(MAKE) -C ../tools/mkfimage
@@ -21,7 +21,7 @@ endif
 	$(INSTALL_BIN) ../tools/boot_linux $(BIN_DIR)/
 
 kernel-install: tools-compile
-	PATH='${TARGET_PATH}' mkfimage $(KERNEL) $(TARGET_KERNEL)
+	PATH='${TARGET_PATH}' mkfimage $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 
 ifeq ($(ADK_TARGET_FS),squashfs)
 imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS)
@@ -36,7 +36,8 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS)
 endif
 ifeq ($(ADK_TARGET_FS),nfsroot)
 imageinstall: kernel-install ${BIN_DIR}/${ROOTFSUSERTARBALL}
-	@echo Use sudo ./boot_linux -F -i ${TARGET_KERNEL} to flash the kernel
+	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo Use sudo ./boot_linux -F -i $(BIN_DIR)/${TARGET_KERNEL} to flash the kernel
 	@echo Do not forget to set network boot jumper, before you start the foxboard
 	@echo ${ROOTFSUSERTARBALL} is your nfs root and can be extracted on your nfs server
 endif
diff --git a/target/cris/files/etc/network/interfaces b/target/cris/files/etc/network/interfaces
deleted file mode 100644
index 104c1a1b6..000000000
--- a/target/cris/files/etc/network/interfaces
+++ /dev/null
@@ -1,5 +0,0 @@
-auto lo
-iface lo inet loopback
-
-auto eth0
-iface eth0 inet dhcp
diff --git a/target/cris/sys-available/toolchain b/target/cris/sys-available/toolchain-cris
index b6e462485..309b85d55 100644
--- a/target/cris/sys-available/toolchain
+++ b/target/cris/sys-available/toolchain-cris
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_CRIS
 	bool "Toolchain only"
 	select ADK_cris
-	select ADK_toolchain
+	select ADK_toolchain_cris
 	select ADK_TOOLCHAIN_ONLY
 	help
 	  Build a cris toolchain.
diff --git a/target/mips/Config.in b/target/mips/Config.in
index 90a519f6b..bbae13a6c 100644
--- a/target/mips/Config.in
+++ b/target/mips/Config.in
@@ -1,5 +1,5 @@
 choice
-depends on ADK_LINUX_MIPS && ADK_CHOOSE_TARGET_ARCH
+depends on ADK_LINUX_MIPS && !ADK_CHOOSE_TARGET_ARCH
 prompt "Target system"
 
 config ADK_CHOOSE_TARGET_SYSTEM_MIPS
diff --git a/target/mips/Makefile b/target/mips/Makefile
index ddacbf2af..51f1824b0 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -16,8 +16,8 @@ kernel-install:
 
 ifeq ($(ADK_TARGET_FS),nfsroot)
 imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL)
-	@cp $(TARGET_DIR)/boot/kernel $(TARGET_KERNEL)
-	@echo 'The kernel file is: ${TARGET_KERNEL}'
+	@cp $(TARGET_DIR)/boot/kernel $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
 endif
 ifeq ($(ADK_TARGET_FS),yaffs)
@@ -29,25 +29,25 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
 endif
 ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
-	@cp $(TARGET_DIR)/boot/kernel $(TARGET_KERNEL)
-	@echo 'The kernel file is: ${TARGET_KERNEL}'
+	@cp $(TARGET_DIR)/boot/kernel $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Use following command to create a QEMU Image:"
 	@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-mips -nographic -M malta -kernel $(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
+	@echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
-	@cp $(KERNEL) $(TARGET_KERNEL)
-	@echo 'The kernel file is: ${TARGET_KERNEL}'
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-	@echo 'qemu-system-mips -nographic -M malta -kernel $(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
-	@cp $(KERNEL) $(TARGET_KERNEL)
-	@echo 'The kernel+initramfs file is: ${TARGET_KERNEL}'
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-mips -nographic -M malta -kernel $(TARGET_KERNEL)'
+	@echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
 endif
diff --git a/target/mips/sys-available/qemu b/target/mips/sys-available/qemu-mips
index 103e70f7b..70ac9718b 100644
--- a/target/mips/sys-available/qemu
+++ b/target/mips/sys-available/qemu-mips
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_MIPS
 	bool "Qemu Emulator"
 	select ADK_mips
-	select ADK_qemu
+	select ADK_qemu_mips
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
diff --git a/target/mips/sys-available/toolchain b/target/mips/sys-available/toolchain-mips
index accf75240..4b03d9b6f 100644
--- a/target/mips/sys-available/toolchain
+++ b/target/mips/sys-available/toolchain-mips
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS
 	bool "Toolchain only"
 	select ADK_mips
-	select ADK_toolchain
+	select ADK_toolchain_mips
 	select ADK_TOOLCHAIN_ONLY
 	help
 	  mips toolchain.
diff --git a/target/mips64/Makefile b/target/mips64/Makefile
index 302df24e0..12781b874 100644
--- a/target/mips64/Makefile
+++ b/target/mips64/Makefile
@@ -15,11 +15,11 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "sudo ./scripts/create-image.sh qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
+	@echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${TARGET_KERNEL} -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
 endif
 ifeq ($(FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
-	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo 'The kernel file is: ${BIN_DIR}/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-	@echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${TARGET_KERNEL} -initrd ${BIN_DIR}/${INITRAMFS}'
 endif
diff --git a/target/mips64/files/etc/inittab b/target/mips64/files/etc/inittab
deleted file mode 100644
index 6f21e703b..000000000
--- a/target/mips64/files/etc/inittab
+++ /dev/null
@@ -1,4 +0,0 @@
-::sysinit:/etc/init.d/rcS
-::shutdown:/etc/init.d/rcK
-ttyS0::respawn:/sbin/getty -i -L ttyS0 115200 vt100
-tty1::respawn:/sbin/getty -i -L tty1 115200 vt100
diff --git a/target/mips64/sys-available/toolchain b/target/mips64/sys-available/toolchain-mips64
index e9514691f..e06280359 100644
--- a/target/mips64/sys-available/toolchain
+++ b/target/mips64/sys-available/toolchain-mips64
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64
 	bool "Toolchain only"
 	select ADK_mips64
-	select ADK_toolchain
+	select ADK_toolchain_mips64
 	select ADK_TOOLCHAIN_ONLY
 	help
 	  Build a mips64 big endian toolchain.
diff --git a/target/mips64/uclibc.config b/target/mips64/uclibc.config
index cb83c4eb1..9d1a34708 100644
--- a/target/mips64/uclibc.config
+++ b/target/mips64/uclibc.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Version: 0.9.32-rc1
-# Mon Dec 27 23:07:24 2010
+# Sat Jan  1 13:09:39 2011
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
@@ -83,12 +83,11 @@ LDSO_SEARCH_INTERP_PATH=y
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
+LINUXTHREADS_OLD=y
 # LINUXTHREADS_NEW is not set
-UCLIBC_HAS_THREADS_NATIVE=y
+# UCLIBC_HAS_THREADS_NATIVE is not set
 UCLIBC_HAS_THREADS=y
-UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
@@ -195,7 +194,6 @@ UCLIBC_HAS_ERRNO_MESSAGES=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 # UCLIBC_HAS_SYS_SIGLIST is not set
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
 
 #
@@ -237,6 +235,7 @@ UCLIBC_BUILD_NOEXECSTACK=y
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
+# DODEBUG_PT is not set
 DOSTRIP=y
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
diff --git a/target/mips64el/Makefile b/target/mips64el/Makefile
index b4bcd24f5..d9ff26f57 100644
--- a/target/mips64el/Makefile
+++ b/target/mips64el/Makefile
@@ -9,19 +9,25 @@ include $(TOPDIR)/mk/image.mk
 
 KERNEL:=$(LINUX_DIR)/vmlinux
 
-ifeq ($(FS),archive)
+ifeq ($(ADK_TARGET_FS),nfsroot)
+imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The linux kernel is here: $(BIN_DIR)/$(TARGET_KERNEL)'
+	@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
+endif
+ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
-	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+	@cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL}
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
 	@echo "Use following command to create a QEMU Image:"
 	@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
+	@echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${TARGET_KERNEL} -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
 endif
-ifeq ($(FS),initramfs)
+ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
-	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
-	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL}
+	@echo 'The kernel file is: ${BIN_DIR}/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-	@echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${TARGET_KERNEL} -initrd ${BIN_DIR}/${INITRAMFS}'
 endif
diff --git a/target/mips64el/files/etc/inittab b/target/mips64el/files/etc/inittab
deleted file mode 100644
index 6f21e703b..000000000
--- a/target/mips64el/files/etc/inittab
+++ /dev/null
@@ -1,4 +0,0 @@
-::sysinit:/etc/init.d/rcS
-::shutdown:/etc/init.d/rcK
-ttyS0::respawn:/sbin/getty -i -L ttyS0 115200 vt100
-tty1::respawn:/sbin/getty -i -L tty1 115200 vt100
diff --git a/target/mips64el/patches/io_map_base.patch b/target/mips64el/patches/io_map_base.patch
deleted file mode 100644
index be39ffe09..000000000
--- a/target/mips64el/patches/io_map_base.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nur linux-2.6.28.orig/arch/mips/include/asm/mips-boards/generic.h linux-2.6.28/arch/mips/include/asm/mips-boards/generic.h
---- linux-2.6.28.orig/arch/mips/include/asm/mips-boards/generic.h	2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/mips/include/asm/mips-boards/generic.h	2009-01-09 23:03:02.000000000 +0100
-@@ -92,7 +92,7 @@
- extern void mips_reboot_setup(void);
- 
- #ifdef CONFIG_PCI
--extern void mips_pcibios_init(void);
-+extern int mips_pcibios_init(void);
- #else
- #define mips_pcibios_init() do { } while (0)
- #endif
-diff -Nur linux-2.6.28.orig/arch/mips/mti-malta/malta-pci.c linux-2.6.28/arch/mips/mti-malta/malta-pci.c
---- linux-2.6.28.orig/arch/mips/mti-malta/malta-pci.c	2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/mips/mti-malta/malta-pci.c	2009-01-09 23:02:02.000000000 +0100
-@@ -87,10 +87,11 @@
- 	.mem_resource	= &msc_mem_resource,
- };
- 
--void __init mips_pcibios_init(void)
-+int __init mips_pcibios_init(void)
- {
- 	struct pci_controller *controller;
- 	resource_size_t start, end, map, start1, end1, map1, map2, map3, mask;
-+	void __iomem *io_map_base;
- 
- 	switch (mips_revision_sconid) {
- 	case MIPS_REVISION_SCON_GT64120:
-@@ -230,7 +231,7 @@
- 		controller = &msc_controller;
- 		break;
- 	default:
--		return;
-+		return 0;
- 	}
- 
- 	if (controller->io_resource->start < 0x00001000UL)	/* FIXME */
-@@ -239,5 +240,14 @@
- 	iomem_resource.end &= 0xfffffffffULL;			/* 64 GB */
- 	ioport_resource.end = controller->io_resource->end;
- 
-+	io_map_base = ioremap(MIPS_MSC01_PCI_REG_BASE,
-+				controller->io_resource->end - controller->io_resource->start + 1);
-+	if (!io_map_base)
-+		return -EBUSY;
-+
-+	controller->io_map_base = (unsigned long)io_map_base;
-+
- 	register_pci_controller(controller);
-+	
-+	return 0;
- }
diff --git a/target/mips64el/patches/lemote.patch b/target/mips64el/patches/lemote.patch
deleted file mode 100644
index dce900900..000000000
--- a/target/mips64el/patches/lemote.patch
+++ /dev/null
@@ -1,4267 +0,0 @@
-diff -Nur linux-2.6.36.orig/arch/mips/Kconfig linux-2.6.36/arch/mips/Kconfig
---- linux-2.6.36.orig/arch/mips/Kconfig	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/mips/Kconfig	2010-11-18 11:47:59.000000000 +0100
-@@ -205,7 +205,7 @@
- 
- config MACH_LOONGSON
- 	bool "Loongson family of machines"
--	select SYS_SUPPORTS_ZBOOT
-+	select SYS_SUPPORTS_ZBOOT_UART16550
- 	help
- 	  This enables the support of Loongson family of machines.
- 
-@@ -1093,6 +1093,8 @@
- 	bool "Loongson 2E"
- 	depends on SYS_HAS_CPU_LOONGSON2E
- 	select CPU_LOONGSON2
-+	select GENERIC_GPIO
-+	select ARCH_REQUIRE_GPIOLIB
- 	help
- 	  The Loongson 2E processor implements the MIPS III instruction set
- 	  with many extensions.
-@@ -2012,6 +2014,18 @@
- source "kernel/time/Kconfig"
- 
- #
-+# High Resolution sched_clock() Configuration
-+#
-+
-+config CPU_HAS_FIXED_C0_COUNT
-+	bool
-+
-+config CPU_SUPPORTS_HR_SCHED_CLOCK
-+	bool
-+	depends on CPU_HAS_FIXED_C0_COUNT || !CPU_FREQ
-+	default y
-+
-+#
- # Timer Interrupt Frequency Configuration
- #
- 
-diff -Nur linux-2.6.36.orig/arch/mips/include/asm/dma-mapping.h linux-2.6.36/arch/mips/include/asm/dma-mapping.h
---- linux-2.6.36.orig/arch/mips/include/asm/dma-mapping.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/mips/include/asm/dma-mapping.h	2010-11-18 11:47:59.000000000 +0100
-@@ -65,4 +65,8 @@
- extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
- 	       enum dma_data_direction direction);
- 
-+#define ARCH_HAS_DMA_MMAP_COHERENT
-+extern int dma_mmap_coherent(struct device *dev, struct vm_area_struct *vma,
-+		void *cpu_addr, dma_addr_t handle, size_t size);
-+
- #endif /* _ASM_DMA_MAPPING_H */
-diff -Nur linux-2.6.36.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h linux-2.6.36/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h
---- linux-2.6.36.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h	2010-11-18 11:47:59.000000000 +0100
-@@ -255,21 +255,12 @@
-  * IDE STANDARD
-  */
- #define	IDE_CAP		0x00
--#define	IDE_CONFIG	0x01
--#define	IDE_SMI		0x02
--#define	IDE_ERROR	0x03
--#define	IDE_PM		0x04
--#define	IDE_DIAG	0x05
--
--/*
-- * IDE SPEC.
-- */
- #define	IDE_IO_BAR	0x08
- #define	IDE_CFG		0x10
- #define	IDE_DTC		0x12
- #define	IDE_CAST	0x13
- #define	IDE_ETC		0x14
--#define	IDE_INTERNAL_PM	0x15
-+#define	IDE_PM		0x15
- 
- /*
-  * ACC STANDARD
-@@ -301,5 +292,40 @@
- /* GPIO : I/O SPACE; REG : 32BITS */
- #define	GPIOL_OUT_VAL		0x00
- #define	GPIOL_OUT_EN		0x04
-+#define	GPIOL_OUT_AUX1_SEL	0x10
-+/* SMB : I/O SPACE, REG : 8BITS WIDTH */
-+#define	SMB_SDA			0x00
-+#define	SMB_STS			0x01
-+#define	SMB_STS_SLVSTP		(1 << 7)
-+#define	SMB_STS_SDAST		(1 << 6)
-+#define	SMB_STS_BER		(1 << 5)
-+#define	SMB_STS_NEGACK		(1 << 4)
-+#define	SMB_STS_STASTR		(1 << 3)
-+#define	SMB_STS_NMATCH		(1 << 2)
-+#define	SMB_STS_MASTER		(1 << 1)
-+#define	SMB_STS_XMIT		(1 << 0)
-+#define	SMB_CTRL_STS		0x02
-+#define	SMB_CSTS_TGSTL		(1 << 5)
-+#define	SMB_CSTS_TSDA		(1 << 4)
-+#define	SMB_CSTS_GCMTCH		(1 << 3)
-+#define	SMB_CSTS_MATCH		(1 << 2)
-+#define	SMB_CSTS_BB		(1 << 1)
-+#define	SMB_CSTS_BUSY		(1 << 0)
-+#define	SMB_CTRL1		0x03
-+#define	SMB_CTRL1_STASTRE	(1 << 7)
-+#define	SMB_CTRL1_NMINTE	(1 << 6)
-+#define	SMB_CTRL1_GCMEN		(1 << 5)
-+#define	SMB_CTRL1_ACK		(1 << 4)
-+#define	SMB_CTRL1_RSVD		(1 << 3)
-+#define	SMB_CTRL1_INTEN		(1 << 2)
-+#define	SMB_CTRL1_STOP		(1 << 1)
-+#define	SMB_CTRL1_START		(1 << 0)
-+#define	SMB_ADDR		0x04
-+#define	SMB_ADDR_SAEN		(1 << 7)
-+#define	SMB_CONTROLLER_ADDR	(0xef << 0)