summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-11-08 18:45:04 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-11-08 18:45:04 +0100
commit7a642cb3dfe3f90be3aed43df6173fe846d95cfc (patch)
treef71bc51148b72d73c4de012a5839365654b3bc58 /target
parent0548cad2cc556db813e36839979232eca64b8988 (diff)
parent5df3d4cc287fb3d6e315bb9a0a152b40dcfc9dee (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r--target/linux/config/Config.in.netdevice6
-rw-r--r--target/mips/Makefile6
2 files changed, 7 insertions, 5 deletions
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 0bff56a1b..dcf9f03ec 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -65,8 +65,6 @@ config ADK_KERNEL_PCNET32
select ADK_KERNEL_NET_ETHERNET
select ADK_KERNEL_NET_PCI
select ADK_KERNEL_MII
- default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL
- default y if ADK_TARGET_SYSTEM_QEMU_MIPS
default n
help
@@ -166,6 +164,10 @@ config ADK_KERNEL_E1000
default y if ADK_NATIVE_SYSTEM_IBM_X40
default y if ADK_TARGET_SYSTEM_QEMU_I686
default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+ default y if ADK_TARGET_SYSTEM_QEMU_MIPS64
+ default y if ADK_TARGET_SYSTEM_QEMU_MIPS64EL
+ default y if ADK_TARGET_SYSTEM_QEMU_MIPS
+ default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL
default n
help
diff --git a/target/mips/Makefile b/target/mips/Makefile
index e753eccc5..cac6858d2 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -111,7 +111,7 @@ ifneq ($(ADK_HARDWARE_QEMU),)
@echo "Use following command to create a QEMU Image:"
@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following options:"
- @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -net user,hostfwd=tcp::2222-:22 -net nic,model=pcnet -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+ @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0,hostfwd=tcp::2222-:22 -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
endif
ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
@echo "Startup the netbook and type del to enter PMON:"
@@ -127,7 +127,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
ifneq ($(ADK_HARDWARE_QEMU),)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -net user,hostfwd=tcp::2222-:22 -net nic,model=pcnet -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0,hostfwd=tcp::2222-:22 -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
endif
endif
ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -136,7 +136,7 @@ imageinstall: createinitramfs
@echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}'
ifneq ($(ADK_HARDWARE_QEMU),)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -net user,hostfwd=tcp::2222-:22 -net nic,model=pcnet -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
+ @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0,hostfwd=tcp::2222-:22 -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
endif
endif
ifeq ($(ADK_TARGET_FS),usb)