From bb4ec2bf7c62ec772f6210eed7567901f808623c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 15 Feb 2014 16:17:20 +0100
Subject: add more todos

---
 target/arm/sys-available/keyasic-ka2000 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'target')

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.
-- 
cgit v1.2.3


From 5867aad78c4ebd154eace69b026b63d780be0e84 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 16 Feb 2014 10:48:13 +0100
Subject: use virtio drivers for sparc64

---
 mk/modules.mk                        | 11 +++++++++++
 mk/rootfs.mk                         |  3 +++
 target/config/Config.in              | 17 +++++++++++++++++
 target/linux/Config.in               |  1 +
 target/linux/config/Config.in.virtio | 37 ++++++++++++++++++++++++++++++++++++
 target/sparc64/Makefile              |  7 ++++++-
 target/sparc64/kernel/qemu-sparc64   |  4 ----
 7 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 target/linux/config/Config.in.virtio

(limited to 'target')

diff --git a/mk/modules.mk b/mk/modules.mk
index f5660ba97..00667de3e 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1736,3 +1736,14 @@ $(eval $(call KMOD_template,SCx200_ACB,scx200-acb,\
 	$(MODULES_DIR)/kernel/drivers/i2c/busses/scx200_acb \
 ,25))
 
+#
+# VirtIO
+#
+$(eval $(call KMOD_template,VIRTIO_BLK,virtio-block,\
+	$(MODULES_DIR)/kernel/drivers/net/virtio_blk \
+,20))
+
+$(eval $(call KMOD_template,VIRTIO_NET,virtio-net,\
+	$(MODULES_DIR)/kernel/drivers/net/virtio_net \
+,40))
+
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index f1d0bdf3a..5ec5f3107 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -13,6 +13,9 @@ MTDDEV:=	root=/dev/mtdblock0
 ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
 ROOTFS:=	root=/dev/sda1
 endif
+ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
+ROOTFS:=	root=/dev/vda1
+endif
 endif
 
 ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
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
@@ -171,6 +171,23 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686
 	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..51cf67d54
--- /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
+
+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
-- 
cgit v1.2.3


From f27cf10912e36b713e31e1ad5df0ed5c288b4bf8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 16 Feb 2014 11:38:10 +0100
Subject: rename raspberry pi bootloader package

---
 package/bcm2835-bootloader/Makefile   | 30 ++++++++++++++++++++++++++++++
 package/bcm2835-firmware/Makefile     | 29 -----------------------------
 target/arm/sys-available/raspberry-pi |  2 +-
 3 files changed, 31 insertions(+), 30 deletions(-)
 create mode 100644 package/bcm2835-bootloader/Makefile
 delete mode 100644 package/bcm2835-firmware/Makefile

(limited to 'target')

diff --git a/package/bcm2835-bootloader/Makefile b/package/bcm2835-bootloader/Makefile
new file mode 100644
index 000000000..8cd28cdd3
--- /dev/null
+++ b/package/bcm2835-bootloader/Makefile
@@ -0,0 +1,30 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		bcm2835-bootloader
+# actually f46e6d9cb9a6bf419fe2a428a8a586239e93aa2d from 07.01.2014
+# https://github.com/raspberrypi/firmware
+PKG_VERSION:=		0.6
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		dba84ce20fc8a8c1bf473758d9350e19
+PKG_DESCR:=		bootloader for raspberry pi (bcm2835)
+PKG_SECTION:=		boot
+PKG_SITES:=		http://openadk.org/distfiles/
+
+PKG_SYSTEM_DEPENDS:=	raspberry-pi
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,BCM2835_BOOTLOADER,bcm2835-bootloader,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
+
+do-install:
+	${INSTALL_DIR} ${IDIR_BCM2835_BOOTLOADER}/boot
+	${CP} ${WRKBUILD}/boot/* ${IDIR_BCM2835_BOOTLOADER}/boot/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bcm2835-firmware/Makefile b/package/bcm2835-firmware/Makefile
deleted file mode 100644
index a67d1a3ad..000000000
--- a/package/bcm2835-firmware/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		bcm2835-firmware
-# actually f46e6d9cb9a6bf419fe2a428a8a586239e93aa2d from 07.01.2014
-PKG_VERSION:=		0.6
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		e4c1b8f3dd13ae8742a7831c19d212b0
-PKG_DESCR:=		firmware for raspberry pi (bcm2835)
-PKG_SECTION:=		base
-PKG_SITES:=		http://openadk.org/distfiles/
-
-PKG_SYSTEM_DEPENDS:=	raspberry-pi
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,BCM2835_FIRMWARE,bcm2835-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=          manual
-BUILD_STYLE:=           manual
-INSTALL_STYLE:=         manual
-
-do-install:
-	${INSTALL_DIR} ${IDIR_BCM2835_FIRMWARE}/boot
-	${CP} ${WRKBUILD}/boot/* ${IDIR_BCM2835_FIRMWARE}/boot/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
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
-- 
cgit v1.2.3


From aa2b25199d7fa18e7cca629d96dcedd266b7a66c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 16 Feb 2014 14:32:41 +0100
Subject: enable virtio only for qemu emulator

---
 target/linux/config/Config.in.virtio | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'target')

diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio
index 51cf67d54..4ee027baa 100644
--- a/target/linux/config/Config.in.virtio
+++ b/target/linux/config/Config.in.virtio
@@ -11,7 +11,7 @@ config ADK_KERNEL_VIRTIO_BLK
 	boolean
 
 menu "Virtio driver support"
-depends on !ADK_TARGET_QEMU_WITH_VIRTIO
+depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_HARDWARE_QEMU
 
 config ADK_KPACKAGE_KMOD_VIRTIO_NET
 	prompt "kmod-virtio-net.................... Virtio net driver"
-- 
cgit v1.2.3