summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/modules.mk14
-rw-r--r--package/Config.in1
-rw-r--r--package/Depends.mk1
-rw-r--r--package/Makefile1
-rw-r--r--package/mplayer/Config.in3
-rw-r--r--package/xf86-video-cirrus/Config.in8
-rw-r--r--package/xf86-video-cirrus/Makefile28
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c17
-rw-r--r--target/Config.in4
-rw-r--r--target/linux/config/Config.in.multimedia8
-rw-r--r--target/linux/config/Config.in.netdevice22
-rw-r--r--target/qemu-x86/Makefile6
-rw-r--r--target/qemu-x86_64/Makefile6
13 files changed, 109 insertions, 10 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index faf25ba13..7f85c6f9f 100644
--- a/mk/modules.mk
+++ b/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))
diff --git a/package/Config.in b/package/Config.in
index 3055b2e00..2e3aee10c 100644
--- a/package/Config.in
+++ b/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"
diff --git a/package/Depends.mk b/package/Depends.mk
index cf139b4da..35e426786 100644
--- a/package/Depends.mk
+++ b/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 \
diff --git a/package/Makefile b/package/Makefile
index 3684a77ed..e4df19ce3 100644
--- a/package/Makefile
+++ b/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
diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
index 963e2c0ba..edc4f291f 100644
--- a/package/mplayer/Config.in
+++ b/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
diff --git a/package/xf86-video-cirrus/Config.in b/package/xf86-video-cirrus/Config.in
new file mode 100644
index 000000000..4df3074b3
--- /dev/null
+++ b/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
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
new file mode 100644
index 000000000..4e40f4d0b
--- /dev/null
+++ b/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
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c
new file mode 100644
index 000000000..411d7b2e2
--- /dev/null
+++ b/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,
diff --git a/target/Config.in b/target/Config.in
index 7113496e8..a5e62907c 100644
--- a/target/Config.in
+++ b/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
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index d485d31ec..30e6aa293 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/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
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 2ab36a10f..cef62da0b 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/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
diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile
index 0b4f6a75b..75404b25c 100644
--- a/target/qemu-x86/Makefile
+++ b/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
diff --git a/target/qemu-x86_64/Makefile b/target/qemu-x86_64/Makefile
index 369d4fabd..e3880de7a 100644
--- a/target/qemu-x86_64/Makefile
+++ b/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 03:09:20 +0000