diff options
| -rw-r--r-- | target/config/Config.in.endian.choice | 1 | ||||
| -rw-r--r-- | target/config/Config.in.toolchain | 2 | ||||
| -rw-r--r-- | target/mips/Makefile | 14 | ||||
| -rw-r--r-- | target/mips64/Makefile | 22 |
4 files changed, 13 insertions, 26 deletions
diff --git a/target/config/Config.in.endian.choice b/target/config/Config.in.endian.choice index 303d117c6..3d50b76de 100644 --- a/target/config/Config.in.endian.choice +++ b/target/config/Config.in.endian.choice @@ -6,6 +6,7 @@ prompt "Target Endianess" depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM depends on ADK_LINUX_SH || ADK_LINUX_MIPS || ADK_LINUX_MICROBLAZE || ADK_LINUX_MIPS64 depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 +depends on !ADK_TARGET_SYSTEM_LEMOTE_YEELONG config ADK_TARGET_LITTLE_ENDIAN boolean "Little endian" diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 68c683686..0e0ea507c 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -71,12 +71,14 @@ config ADK_TARGET_USE_GOLD boolean select ADK_TOOLCHAIN_WITH_GOLD depends on !ADK_LINUX_MIPS + depends on !ADK_LINUX_MIPS64 default n config ADK_TARGET_USE_GNU_HASHSTYLE prompt "Use GNU hashstyle for all packages" boolean depends on !ADK_LINUX_MIPS + depends on !ADK_LINUX_MIPS64 default n help Performance optimization for applications with lot of shared library diff --git a/target/mips/Makefile b/target/mips/Makefile index 9779330dd..936501dd6 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -66,11 +66,6 @@ endif ifeq ($(ADK_TARGET_FS),usb) targethelp: @echo 'The root tarball is: ${FW_DIR}/${ROOTFSTARBALL}' -ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) - @echo "Startup the netbook and type del to enter PMON:" - @echo "PMON> load /dev/fs/ext2@usb0/boot/kernel" - @echo "PMON> g" -endif endif ifeq ($(ADK_TARGET_FS),yaffs) targethelp: @@ -81,20 +76,11 @@ targethelp: endif # image creation and kernel install -ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),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_TARGET_QEMU),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 # filesystem specific targets ifeq ($(ADK_TARGET_FS),archive) diff --git a/target/mips64/Makefile b/target/mips64/Makefile index 42f96d27c..e5507e9d1 100644 --- a/target/mips64/Makefile +++ b/target/mips64/Makefile @@ -10,6 +10,10 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id +QEMU_ARGS:=-M malta +QEMU_ARGS+=${ADK_QEMU_ARGS} +QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0 + # target helper text ifeq ($(ADK_TARGET_FS),nfsroot) targethelp: @@ -46,7 +50,7 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @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:" @@ -65,7 +69,7 @@ targethelp: @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -73,21 +77,16 @@ targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0 -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif # image creation and kernel install -ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) -kernel-install: - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) - @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} -endif -ifeq ($(ADK_TARGET_QEMU),y) -kernel-install: +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 # filesystem specific targets ifeq ($(ADK_TARGET_FS),nfsroot) @@ -104,7 +103,6 @@ imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: createinitramfs targethelp - @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) endif ifeq ($(ADK_TARGET_FS),usb) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp |