resolve merge conflict

23 files changed, 7 insertions, 254 deletions

diff --git a/target/mips/Makefile b/target/mips/Makefile
index cdb5b7f8a..5c9f7f5fc 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -25,11 +25,6 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following options:"
 	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
 endif
-ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
-	@echo "Startup the Lemote Yeelong and type del to enter PMON:"
-	@echo "PMON> load /dev/fs/ext2@wd0a/boot/kernel"
-	@echo "PMON> g root=/dev/sda1"
-endif
 ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
 	@echo "Use following command to install it on CF card:"
 	@echo "sudo ./scripts/install-rb532.sh /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -93,14 +88,7 @@ kernel-strip:
 kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}
 endif
-ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
-kernel-strip:
-	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
-
-kernel-install: kernel-strip
-	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}
-endif
-ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_QEMU),y)
 kernel-strip:
 	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 
@@ -124,9 +112,6 @@ endif
 ifeq ($(ADK_TARGET_FS),nfsroot)
 imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
 endif
-ifeq ($(ADK_TARGET_FS),usb)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp
-endif
 ifeq ($(ADK_TARGET_FS),yaffs)
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp
 endif
diff --git a/target/mips/kernel/lemote-yeelong b/target/mips/kernel/lemote-yeelong
deleted file mode 100644
index 96ca64c66..000000000
--- a/target/mips/kernel/lemote-yeelong
+++ /dev/null
@@ -1,18 +0,0 @@
-CONFIG_MIPS=y
-CONFIG_MACH_LOONGSON=y
-CONFIG_LEMOTE_MACH2F=y
-CONFIG_CS5536=y
-CONFIG_CPU_LOONGSON2F=y
-CONFIG_CPU_NOP_WORKAROUNDS=y
-CONFIG_CPU_JUMP_WORKAROUNDS=y
-CONFIG_CPU_LOONGSON2F_WORKAROUNDS=y
-CONFIG_PAGE_SIZE_16KB=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_COMPAT=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO_LIBPS2=y
-
diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips
index ca7b79eb9..422170fbb 100644
--- a/target/mips/kernel/qemu-mips
+++ b/target/mips/kernel/qemu-mips
@@ -3,6 +3,5 @@ CONFIG_MIPS_MALTA=y
 CONFIG_MIPS_BONITO64=y
 CONFIG_MIPS_MSC=y
 CONFIG_CPU_MIPS32_R1=y
-CONFIG_PHYLIB=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/target/mips/kernel/qemu-mips64 b/target/mips/kernel/qemu-mips64
deleted file mode 100644
index 9216fe380..000000000
--- a/target/mips/kernel/qemu-mips64
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_MIPS=y
-CONFIG_MIPS_MALTA=y
-CONFIG_CPU_MIPS64_R1=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
-CONFIG_BINFMT_ELF32=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/target/mips/kernel/qemu-mips64el b/target/mips/kernel/qemu-mips64el
deleted file mode 100644
index 9216fe380..000000000
--- a/target/mips/kernel/qemu-mips64el
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_MIPS=y
-CONFIG_MIPS_MALTA=y
-CONFIG_CPU_MIPS64_R1=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
-CONFIG_BINFMT_ELF32=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/target/mips/kernel/qemu-mipsel b/target/mips/kernel/qemu-mipsel
deleted file mode 100644
index 422170fbb..000000000
--- a/target/mips/kernel/qemu-mipsel
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_MIPS=y
-CONFIG_MIPS_MALTA=y
-CONFIG_MIPS_BONITO64=y
-CONFIG_MIPS_MSC=y
-CONFIG_CPU_MIPS32_R1=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/target/mips/sys-available/lemote-yeelong b/target/mips/sys-available/lemote-yeelong
deleted file mode 100644
index 0a6fd9c32..000000000
--- a/target/mips/sys-available/lemote-yeelong
+++ /dev/null
@@ -1,19 +0,0 @@
-config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	bool "Lemote Yeelong laptop"
-	select ADK_mips
-	select ADK_little
-	select ADK_lemote_yeelong
-	select ADK_LINUX_64
-	select ADK_CPU_LOONGSON2F
-	select ADK_TARGET_WITH_USB_BOOT
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_HDD
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_ROOT_RW
-	select ADK_TARGET_KERNEL_VMLINUZ
-	help
-         System profile for Lemote Yeelong laptop.
-
diff --git a/target/mips/sys-available/qemu-mips b/target/mips/sys-available/qemu-mips
index d3ea99011..2dfc09ca6 100644
--- a/target/mips/sys-available/qemu-mips
+++ b/target/mips/sys-available/qemu-mips
@@ -1,10 +1,9 @@
 config ADK_TARGET_SYSTEM_QEMU_MIPS
-	bool "Qemu Emulator (mips32 big endian)"
+	bool "Qemu Emulator"
 	select ADK_mips
-	select ADK_big
 	select ADK_qemu_mips
-	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
-	 Qemu support for mips32 big endian architecture.
+	 Qemu support for MIPS architecture.
 
diff --git a/target/mips/sys-available/qemu-mips64 b/target/mips/sys-available/qemu-mips64
deleted file mode 100644
index ce9c5b0fa..000000000
--- a/target/mips/sys-available/qemu-mips64
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MIPS64
-	bool "Qemu Emulator (mips64 big endian o32 abi)"
-	select ADK_mips
-	select ADK_big
-	select ADK_o32
-	select ADK_qemu_mips64
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_KERNEL_VMLINUZ
-	help
-	 Qemu support for mips64 big endian architecture with o32 abi.
-
diff --git a/target/mips/sys-available/qemu-mips64el b/target/mips/sys-available/qemu-mips64el
deleted file mode 100644
index 067d0d6ed..000000000
--- a/target/mips/sys-available/qemu-mips64el
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MIPS64EL
-	bool "Qemu Emulator (mips64 little endian o32 abi)"
-	select ADK_mips
-	select ADK_little
-	select ADK_o32
-	select ADK_qemu_mips64el
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_KERNEL_VMLINUZ
-	help
-	 Qemu support for mips64 little endian architecture with o32 abi.
diff --git a/target/mips/sys-available/qemu-mips64eln32 b/target/mips/sys-available/qemu-mips64eln32
deleted file mode 100644
index 31c93b75c..000000000
--- a/target/mips/sys-available/qemu-mips64eln32
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MIPS64ELN32
-	bool "Qemu Emulator (mips64 little endian n32 abi)"
-	select ADK_mips
-	select ADK_little
-	select ADK_n32
-	select ADK_qemu_mips64el
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_KERNEL_VMLINUZ
-	help
-	  Qemu support for mips64 little endian architecture with n32 abi.
diff --git a/target/mips/sys-available/qemu-mips64eln64 b/target/mips/sys-available/qemu-mips64eln64
deleted file mode 100644
index 0f0697602..000000000
--- a/target/mips/sys-available/qemu-mips64eln64
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MIPS64ELN64
-	bool "Qemu Emulator (mips64 little endian n64 abi)"
-	select ADK_mips
-	select ADK_little
-	select ADK_n64
-	select ADK_qemu_mips64el
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_KERNEL_VMLINUZ
-	help
-	  Qemu support for mips64 little endian architecture with n64 abi.
diff --git a/target/mips/sys-available/qemu-mips64n32 b/target/mips/sys-available/qemu-mips64n32
deleted file mode 100644
index 614edde0b..000000000
--- a/target/mips/sys-available/qemu-mips64n32
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MIPS64N32
-	bool "Qemu Emulator (mips64 big endian n32 abi)"
-	select ADK_mips
-	select ADK_big
-	select ADK_n32
-	select ADK_qemu_mips64
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_KERNEL_VMLINUZ
-	help
-	  Qemu support for mips64 big endian architecture with n32 abi.
-
diff --git a/target/mips/sys-available/qemu-mips64n64 b/target/mips/sys-available/qemu-mips64n64
deleted file mode 100644
index 49ad7bba8..000000000
--- a/target/mips/sys-available/qemu-mips64n64
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MIPS64N64
-	bool "Qemu Emulator (mips64 big endian n64 abi)"
-	select ADK_mips
-	select ADK_big
-	select ADK_n64
-	select ADK_qemu_mips64
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_KERNEL_VMLINUZ
-	help
-	 Qemu support for mips64 big endian architecture with n64 abi.
-
diff --git a/target/mips/sys-available/qemu-mipsel b/target/mips/sys-available/qemu-mipsel
deleted file mode 100644
index 688471d6d..000000000
--- a/target/mips/sys-available/qemu-mipsel
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MIPSEL
-	bool "Qemu Emulator (mips32 little endian)"
-	select ADK_mips
-	select ADK_qemu_mipsel
-	select ADK_little
-	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_KERNEL_VMLINUZ
-	help
-	 Qemu support for mips32 little endian architecture.
-
diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips
index 7c7e1c142..035908220 100644
--- a/target/mips/sys-available/toolchain-mips
+++ b/target/mips/sys-available/toolchain-mips
@@ -1,10 +1,9 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS
-	bool "Toolchain only (mips32 big endian)"
+	bool "Toolchain only"
 	select ADK_mips
-	select ADK_big
 	select ADK_toolchain_mips
-	select ADK_TOOLCHAIN
+	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help
-	  MIPS32 big endian toolchain.
+	  MIPS toolchain.
 
diff --git a/target/mips/sys-available/toolchain-mips64 b/target/mips/sys-available/toolchain-mips64
deleted file mode 100644
index f1cc555a2..000000000
--- a/target/mips/sys-available/toolchain-mips64
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64
-	bool "Toolchain only (mips64 big endian o32 ABI)"
-	select ADK_mips
-	select ADK_big
-	select ADK_o32
-	select ADK_toolchain_mips64
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MIPS64 big endian o32 ABI toolchain.
diff --git a/target/mips/sys-available/toolchain-mips64el b/target/mips/sys-available/toolchain-mips64el
deleted file mode 100644
index 7aa82f05d..000000000
--- a/target/mips/sys-available/toolchain-mips64el
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64EL
-	bool "Toolchain only (mips64 little endian o32 ABI)"
-	select ADK_mips
-	select ADK_little
-	select ADK_o32
-	select ADK_toolchain_mips64el
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MIPS64 little endian o32 ABI toolchain.
diff --git a/target/mips/sys-available/toolchain-mips64eln32 b/target/mips/sys-available/toolchain-mips64eln32
deleted file mode 100644
index 96f409ba6..000000000
--- a/target/mips/sys-available/toolchain-mips64eln32
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64ELN32
-	bool "Toolchain only (mips64 little endian n32 ABI)"
-	select ADK_mips
-	select ADK_little
-	select ADK_n32
-	select ADK_toolchain_mips64el
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MIPS64 little endian n32 ABI toolchain.
diff --git a/target/mips/sys-available/toolchain-mips64eln64 b/target/mips/sys-available/toolchain-mips64eln64
deleted file mode 100644
index f28b14997..000000000
--- a/target/mips/sys-available/toolchain-mips64eln64
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64ELN64
-	bool "Toolchain only (mips64 little endian n64 ABI)"
-	select ADK_mips
-	select ADK_little
-	select ADK_n64
-	select ADK_toolchain_mips64el
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MIPS64 little endian n64 ABI toolchain.
diff --git a/target/mips/sys-available/toolchain-mips64n32 b/target/mips/sys-available/toolchain-mips64n32
deleted file mode 100644
index 1337d3e37..000000000
--- a/target/mips/sys-available/toolchain-mips64n32
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64N32
-	bool "Toolchain only (mips64 big endian n32 ABI)"
-	select ADK_mips
-	select ADK_big
-	select ADK_n32
-	select ADK_toolchain_mips64
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MIPS64 big endian n64 ABI toolchain.
diff --git a/target/mips/sys-available/toolchain-mips64n64 b/target/mips/sys-available/toolchain-mips64n64
deleted file mode 100644
index 4cb4939e5..000000000
--- a/target/mips/sys-available/toolchain-mips64n64
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64N64
-	bool "Toolchain only (mips64 big endian n64 ABI)"
-	select ADK_mips
-	select ADK_big
-	select ADK_n64
-	select ADK_toolchain_mips64
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MIPS64 big endian n64 ABI toolchain.
diff --git a/target/mips/sys-available/toolchain-mipsel b/target/mips/sys-available/toolchain-mipsel
deleted file mode 100644
index 4032f9d94..000000000
--- a/target/mips/sys-available/toolchain-mipsel
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL
-	bool "Toolchain only (mips32 little endian)"
-	select ADK_mips
-	select ADK_little
-	select ADK_toolchain_mipsel
-	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MIPS32 little endian toolchain.
-