diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-16 11:19:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-16 11:19:11 +0100 |
| commit | 0cbc41df2f0be20f56b7d252b319510337e90777 (patch) | |
| tree | 7fcaca8035ca70589bf5105d66092f4bdca20107 /target/sparc64 | |
| parent | 1c2490cf2b6382a448c8b854a9040636e6c2d38b (diff) | |
| parent | 3757bab8c484ca0f7ef4e14402f9d1e8f0354d68 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/sparc64')
| -rw-r--r-- | target/sparc64/Makefile | 7 | ||||
| -rw-r--r-- | target/sparc64/kernel/qemu-sparc64 | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 73f765f96..7a31c1499 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -18,7 +18,12 @@ 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 $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" - @echo 'qemu-system-sparc64 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img -append "root=/dev/sda1"' +ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) + @echo 'qemu-system-sparc64 -nographic -kernel $(BIN_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 $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' +endif endif endif ifeq ($(ADK_TARGET_FS),initramfs) diff --git a/target/sparc64/kernel/qemu-sparc64 b/target/sparc64/kernel/qemu-sparc64 index 73e26ec4d..5119f1225 100644 --- a/target/sparc64/kernel/qemu-sparc64 +++ b/target/sparc64/kernel/qemu-sparc64 @@ -16,10 +16,6 @@ CONFIG_SCSI=y CONFIG_SCSI_DMA=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_LOWLEVEL=y -CONFIG_ATA=y -CONFIG_ATA_SFF=y -CONFIG_ATA_BMDMA=y -CONFIG_PATA_CMD64X=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y |