diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-16 14:47:05 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-16 14:47:05 +0100 |
commit | c062739e40050cc48de91fc4f7bf5c95d57e3963 (patch) | |
tree | 1c5a34b62e032e50658b5ce491ba05d99e1cc32c /target | |
parent | bb54dac334f360b33533d89af8b7823b83df39cf (diff) | |
parent | 6fccc935878c544f9b94ab234eb2dbe87c3c49df (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r-- | target/arm/sys-available/keyasic-ka2000 | 4 | ||||
-rw-r--r-- | target/arm/sys-available/raspberry-pi | 2 | ||||
-rw-r--r-- | target/config/Config.in | 17 | ||||
-rw-r--r-- | target/linux/Config.in | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.virtio | 37 | ||||
-rw-r--r-- | target/sparc64/Makefile | 7 | ||||
-rw-r--r-- | target/sparc64/kernel/qemu-sparc64 | 4 |
7 files changed, 64 insertions, 8 deletions
diff --git a/target/arm/sys-available/keyasic-ka2000 b/target/arm/sys-available/keyasic-ka2000 index d4ed74282..cc193e2ef 100644 --- a/target/arm/sys-available/keyasic-ka2000 +++ b/target/arm/sys-available/keyasic-ka2000 @@ -8,8 +8,8 @@ config ADK_TARGET_SYSTEM_KEYASIC_KA2000 select ADK_CPU_ARMV5 select ADK_TARGET_NO_FPU select ADK_TOOLCHAIN - select ADK_STATIC - select BUSYBOX_STATIC + select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL + select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL help KeyASIC KA2000 aka Transcend WifiSD. Build a toolchain only and make all binaries static. diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index 9fd1c1b2a..36d96b064 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -9,7 +9,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_INPUT - select ADK_PACKAGE_BCM2835_FIRMWARE + select ADK_PACKAGE_BCM2835_BOOTLOADER select ADK_TARGET_KERNEL_ZIMAGE select ADK_USE_KERNEL_MINICONFIG help diff --git a/target/config/Config.in b/target/config/Config.in index b047742b7..99e810528 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -172,6 +172,23 @@ config ADK_TARGET_KERNEL_MINICONFIG default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI choice +prompt "Qemu Emulation using VirtIO drivers" +depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 + +config ADK_TARGET_QEMU_WITH_VIRTIO + boolean "enabled" + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_VIRTIO + select ADK_KERNEL_VIRTIO_PCI + select ADK_KERNEL_VIRTIO_NET + select ADK_KERNEL_VIRTIO_BLK + +config ADK_TARGET_QEMU_WITHOUT_VIRTIO + boolean "disabled" + +endchoice + +choice prompt "Qemu MICROBLAZE Emulation" depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL diff --git a/target/linux/Config.in b/target/linux/Config.in index e4b81dd2f..f4ead4caf 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -25,3 +25,4 @@ source target/linux/config/Config.in.serial source target/linux/config/Config.in.spi source target/linux/config/Config.in.kvm source target/linux/config/Config.in.debug +source target/linux/config/Config.in.virtio diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio new file mode 100644 index 000000000..4ee027baa --- /dev/null +++ b/target/linux/config/Config.in.virtio @@ -0,0 +1,37 @@ +config ADK_KERNEL_VIRTIO + boolean + +config ADK_KERNEL_VIRTIO_PCI + boolean + +config ADK_KERNEL_VIRTIO_NET + boolean + +config ADK_KERNEL_VIRTIO_BLK + boolean + +menu "Virtio driver support" +depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_HARDWARE_QEMU + +config ADK_KPACKAGE_KMOD_VIRTIO_NET + prompt "kmod-virtio-net.................... Virtio net driver" + tristate + select ADK_KERNEL_VIRTIO + select ADK_KERNEL_VIRTIO_PCI + depends on !ADK_KERNEL_VIRTIO_NET + default n + help + Enables support for Virtio Net driver. + +config ADK_KPACKAGE_KMOD_VIRTIO_BLK + prompt "kmod-virtio-block.................. Virtio block driver" + tristate + select ADK_KERNEL_VIRTIO + select ADK_KERNEL_VIRTIO_PCI + select ADK_KERNEL_BLK_DEV + depends on !ADK_KERNEL_VIRTIO_BLK + default n + help + Enables support for Virtio Block driver. + +endmenu 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 |