diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 10:37:17 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 10:37:17 +0100 |
| commit | 1d7f99bcee72dbc423a67ddc0e35fa3d77b4d37c (patch) | |
| tree | b22975b1027e086b23184ac390780ead98887094 /target/sparc64 | |
| parent | 2e3ef3075d9ff8be529f105bcea1eb32dd4f1013 (diff) | |
fix networking on qemu-system-sparc64
- use virtio drivers for sparc64 by default,
builtin ne2k-pci emulation does not work
- fix glibc packaging, revert x32 change,
needs a better fix in sysroot
Diffstat (limited to 'target/sparc64')
| -rw-r--r-- | target/sparc64/Makefile | 21 | ||||
| -rw-r--r-- | target/sparc64/kernel/qemu-sparc64 | 3 |
2 files changed, 14 insertions, 10 deletions
diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 8fe5ebbcc..4e59ea267 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -9,6 +9,17 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/vmlinux +QEMU_ARGS:=-M sun4u +ifeq ($(ADK_TARGET_QEMU_WITH_GRAPHICS),) +QEMU_ARGS+=-nographic +endif +ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) +QEMU_ARGS+=-net nic,model=virtio -net user +ifeq ($(ADK_TARGET_FS),archive) +QEMU_ARGS+=-drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 +endif +endif + ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @cp $(KERNEL) $(FW_DIR)/${TARGET_KERNEL} @@ -18,11 +29,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y) @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" -ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) - @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user' -else - @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' -endif + @echo 'qemu-system-sparc64 $(QEMU_ARGS) -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -32,7 +39,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @echo 'qemu-system-sparc64 $(QEMU_ARGS) -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -41,6 +48,6 @@ imageinstall: createinitramfs @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-sparc64 $(QEMU_ARGS) -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/sparc64/kernel/qemu-sparc64 b/target/sparc64/kernel/qemu-sparc64 index e78fd6071..a2b048860 100644 --- a/target/sparc64/kernel/qemu-sparc64 +++ b/target/sparc64/kernel/qemu-sparc64 @@ -12,9 +12,6 @@ CONFIG_OF_NET=y CONFIG_OF_PCI=y CONFIG_IOMMU_SUPPORT=y CONFIG_OF_IOMMU=y -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NET_VENDOR_8390=y -CONFIG_NE2K_PCI=y CONFIG_SERIAL_CONSOLE=y CONFIG_SERIAL_SUNCORE=y CONFIG_SERIAL_SUNSU=y |