Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/modules.mk

@@ -32,6 +32,14 @@ $(eval $(call KMOD_template,NE2K_PCI,ne2k-pci,\
 	$(MODULES_DIR)/kernel/drivers/net/ne2k-pci \
 ,20))
 
+$(eval $(call KMOD_template,8139CP,rtl8139cp,\
+	$(MODULES_DIR)/kernel/drivers/net/8139cp \
+,20))
+
+$(eval $(call KMOD_template,8139TOO,rtl8139,\
+	$(MODULES_DIR)/kernel/drivers/net/8139too \
+,20))
+
 $(eval $(call KMOD_template,E100,e100,\
 	$(MODULES_DIR)/kernel/drivers/net/e100 \
 ,20))
@@ -922,6 +930,7 @@ $(eval $(call KMOD_template,SND,sound-alsa,\
 	$(MODULES_DIR)/kernel/sound/core/snd \
 	$(MODULES_DIR)/kernel/sound/core/snd-timer \
 	$(MODULES_DIR)/kernel/sound/core/snd-pcm \
+	$(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
 ,40))
 
 $(eval $(call KMOD_template,SND_OSSEMUL,sound-alsa-oss-emul,\
@@ -935,11 +944,14 @@ $(eval $(call KMOD_template,SND_AC97_CODEC,sound-alsa-ac97-codec,\
 ,50))
 
 $(eval $(call KMOD_template,SND_VIA82XX,sound-alsa-via82xx,\
-	$(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
 	$(MODULES_DIR)/kernel/sound/drivers/mpu401/snd-mpu401-uart \
 	$(MODULES_DIR)/kernel/sound/pci/snd-via82xx \
 ,55))
 
+$(eval $(call KMOD_template,SND_ENS1370,sound-alsa-ens1370,\
+	$(MODULES_DIR)/kernel/sound/pci/snd-ens1370 \
+,55))
+
 $(eval $(call KMOD_template,SND_CS5535AUDIO,sound-alsa-cs5535,\
 	$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
 ,55))

package/Config.in

@@ -492,6 +492,7 @@ endmenu
 
 menu "X"
 source "package/xorg-server/Config.in"
+source "package/xf86-video-cirrus/Config.in"
 source "package/xf86-video-geode/Config.in"
 
 menu "X Libraries"

package/Depends.mk

@@ -258,6 +258,7 @@ xfsprogs-compile: e2fsprogs-compile
 libXxf86dga-compile: xf86dgaproto-compile libXext-compile libXaw-compile
 xkeyboard-config-compile: xkbcomp-compile
 xf86-video-geode-compile: xorg-server-compile
+xf86-video-cirrus-compile: xorg-server-compile
 xf86dga-compile: libXxf86dga-compile 
 xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixesproto-compile \
 	damageproto-compile scrnsaverproto-compile resourceproto-compile \

package/Makefile

@@ -440,6 +440,7 @@ package-$(ADK_PACKAGE_XCMISCPROTO) += xcmiscproto
 package-$(ADK_PACKAGE_XEXTPROTO) += xextproto
 package-$(ADK_PACKAGE_XKBCOMP) += xkbcomp
 package-$(ADK_PACKAGE_XKEYBOARD_CONFIG) += xkeyboard-config
+package-$(ADK_PACKAGE_XF86_VIDEO_CIRRUS) += xf86-video-cirrus
 package-$(ADK_PACKAGE_XF86_VIDEO_GEODE) += xf86-video-geode
 package-$(ADK_PACKAGE_XF86DGA) += xf86dga
 package-$(ADK_PACKAGE_XF86DGAPROTO) += xf86dgaproto

package/mplayer/Config.in

@@ -12,7 +12,8 @@ config ADK_PACKAGE_MPLAYER
 	select ADK_PACKAGE_LIBFAAD2
 	select ADK_PACKAGE_LIBVORBIS
 	select ADK_PACKAGE_ZLIB
-	depends on ADK_LINUX_X86_ALIX1C
+	depends on ADK_LINUX_X86_ALIX1C || \
+		ADK_LINUX_X86_QEMU
 	help
           http://www.mplayerhq.hu
 

package/xf86-video-cirrus/Config.in

@@ -0,0 +1,8 @@
+config ADK_PACKAGE_XF86_VIDEO_CIRRUS
+	prompt "xf86-video-cirrus.......................... X11 driver for Cirrus chips"
+	tristate
+	default n
+	depends on ADK_LINUX_X86_QEMU || ADK_LINUX_X86_64_QEMU
+	select ADK_PACKAGE_XORG_SERVER
+	help
+         http://www.x.org

package/xf86-video-cirrus/Makefile

@@ -0,0 +1,28 @@
+# 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:=		xf86-video-cirrus
+PKG_VERSION:=		1.3.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c63a29917c48d0c317445991fc36d09a
+PKG_DESCR:=		X11 driver for Cirrus VGA chips
+PKG_SECTION:=		x11
+PKG_DEPENDS:=		xorg-server
+PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_VIDEO_CIRRUS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	${INSTALL_DIR} ${IDIR_XF86_VIDEO_CIRRUS}/usr/lib/xorg/modules/drivers
+	${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/cirrus_*.so \
+		${IDIR_XF86_VIDEO_CIRRUS}/usr/lib/xorg/modules/drivers/
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c

@@ -0,0 +1,17 @@
+--- xorg-server-1.7.1.orig/hw/xfree86/common/xf86VGAarbiter.c	2009-10-09 06:08:28.000000000 +0200
++++ xorg-server-1.7.1/hw/xfree86/common/xf86VGAarbiter.c	2009-12-10 17:14:01.000000000 +0100
+@@ -38,14 +38,8 @@
+ #include "xf86Priv.h"
+ #include "pciaccess.h"
+ 
+-#ifdef DEBUG
+-#error "no, really, you dont want to do this"
+-#define DPRINT_S(x,y) ErrorF(x ": %i\n",y);
+-#define DPRINT(x) ErrorF(x "\n");
+-#else
+ #define DPRINT_S(x,y)
+ #define DPRINT(x)
+-#endif
+ 
+ static GCFuncs VGAarbiterGCFuncs = {
+     VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC,

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

target/linux/config/Config.in.multimedia

@@ -64,6 +64,14 @@ config ADK_KPACKAGE_KMOD_SND_VIA82XX
 	help
 	 ALSA VIA82XX driver
 
+config ADK_KPACKAGE_KMOD_SND_ENS1370
+	prompt "kmod-sound-alsa-ens1370........ ALSA Ensoniq 1370 driver"
+	depends on ADK_KPACKAGE_KMOD_SND
+	tristate
+	default n
+	help
+	 ALSA Ensonique 1370 driver
+
 config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
 	prompt "kmod-sound-alsa-cs5535......... ALSA AMD CS5535 driver (ALIX1C)"
 	depends on ADK_KPACKAGE_KMOD_SND

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

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

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