From cf23165261302973a1cb23a287f7ca352542a42e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 8 Dec 2009 21:53:07 +0100 Subject: enable networking for qemu x86/x86_64 - enable driver - show help how to start qemu with ssh port redirected from host to guest --- target/Config.in | 4 ++-- target/linux/config/Config.in.netdevice | 22 ++++++++++++++++++++++ target/qemu-x86/Makefile | 6 +++--- target/qemu-x86_64/Makefile | 6 +++--- 4 files changed, 30 insertions(+), 8 deletions(-) (limited to 'target') diff --git a/target/Config.in b/target/Config.in index 7113496e8..a5e62907c 100644 --- a/target/Config.in +++ b/target/Config.in @@ -369,7 +369,7 @@ config ADK_LINUX_CRIS_QEMU config ADK_LINUX_X86_QEMU bool "x86" select ADK_x86_qemu - select ADK_KPACKAGE_KMOD_NE2K_PCI + select ADK_KPACKAGE_KMOD_8139CP select ADK_KERNEL_INPUT_KEYBOARD select ADK_KERNEL_SCSI select ADK_KERNEL_ATA @@ -380,7 +380,7 @@ config ADK_LINUX_X86_QEMU config ADK_LINUX_X86_64_QEMU bool "x86_64" select ADK_x86_64_qemu - select ADK_KPACKAGE_KMOD_NE2K_PCI + select ADK_KPACKAGE_KMOD_8139CP select ADK_KERNEL_INPUT_KEYBOARD select ADK_KERNEL_SCSI select ADK_KERNEL_ATA diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 2ab36a10f..cef62da0b 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -45,6 +45,28 @@ config ADK_KPACKAGE_KMOD_PCNET32 help AMD PCnet32 driver +config ADK_KPACKAGE_KMOD_8139CP + prompt "kmod-net-rtl8139cp............ RTL8139C+ PCI driver" + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_MII + tristate + default n + help + RTL8139C+ pci driver + +config ADK_KPACKAGE_KMOD_8139TOO + prompt "kmod-net-rtl8139.............. RTL8139 PCI driver" + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_MII + tristate + default n + help + RTL8139 pci driver + config ADK_KPACKAGE_KMOD_E100 prompt "kmod-net-e100................. Intel(R) PRO/100+ driver" select ADK_KERNEL_NETDEVICES diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile index 0b4f6a75b..75404b25c 100644 --- a/target/qemu-x86/Makefile +++ b/target/qemu-x86/Makefile @@ -28,7 +28,7 @@ imageinstall: $(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 command line:" - @echo 'qemu -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu-${CPU_ARCH}.img' + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu-${CPU_ARCH}.img' @echo 'Login as user root with password linux123 via ssh or console' endif @@ -39,7 +39,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS) @echo 'You need a dummy qemu.img, create it with:' @echo 'qemu-img create -f raw qemu.img 1M' @echo "Start qemu with following command line:" - @echo 'qemu -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img' + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img' @echo 'Login as user root with password linux123 via ssh or console' endif @@ -49,6 +49,6 @@ imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit @echo 'You need a dummy qemu.img, create it with:' @echo 'qemu-img create -f raw qemu.img 1M' @echo "Start qemu with following command line:" - @echo 'qemu -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu.img' + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu.img' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-x86_64/Makefile b/target/qemu-x86_64/Makefile index 369d4fabd..e3880de7a 100644 --- a/target/qemu-x86_64/Makefile +++ b/target/qemu-x86_64/Makefile @@ -29,7 +29,7 @@ imageinstall: $(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 command line:" - @echo 'qemu-system-x86_64 -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu-${CPU_ARCH}.img' + @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu-${CPU_ARCH}.img' @echo 'Login as user root with password linux123 via ssh or console' endif @@ -40,7 +40,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS) @echo 'You need a dummy qemu.img, create it with:' @echo 'qemu-img create -f raw qemu.img 1M' @echo "Start qemu with following command line:" - @echo 'qemu-system-x86_64 -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img' + @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img' @echo 'Login as user root with password linux123 via ssh or console' endif @@ -50,6 +50,6 @@ imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit @echo 'You need a dummy qemu.img, create it with:' @echo 'qemu-img create -f raw qemu.img 1M' @echo "Start qemu with following command line:" - @echo 'qemu-system-x86_64 -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu.img' + @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu.img' @echo 'Login as user root with password linux123 via ssh or console' endif -- cgit v1.2.3