diff --git a/packages/linux/config/initramfs b/packages/linux/config/initramfs index 8212c8f4a8..a7da5c2c60 100644 --- a/packages/linux/config/initramfs +++ b/packages/linux/config/initramfs @@ -1,4 +1,6 @@ dir /dev 755 0 0 +#nod /dev/tty1 644 0 0 c 4 1 +#nod /dev/console 644 0 0 c 5 1 dir /bin 755 1000 1000 slink /bin/sh busybox 777 0 0 diff --git a/packages/linux/config/pvr b/packages/linux/config/pvr deleted file mode 100644 index c1b96ed69f..0000000000 --- a/packages/linux/config/pvr +++ /dev/null @@ -1,35 +0,0 @@ -# Below are the default GeeXboX input/encoding settings for the PVR cards -# See MPlayer man pages for more details - -# Aspect ratio (0 for 1:1, 1 for 4:3, 2 for 16:9 and 3 for 2.21:1) -PVR_ASPECT=1 - -# Encoding audio rate (32000, 44100 and 48000 Hz) -PVR_AUDIO_RATE=48000 - -# MPEG audio layer encoding (1, 2, 3) -PVR_AUDIO_LAYER=2 - -# Audio encoding bitrate in kbps -PVR_AUDIO_BITRATE=384 - -# Audio encoding mode (stereo, joint_stereo, dual and mono) -PVR_AUDIO_MODE=stereo - -# Average video bitrate encoding in Mbps -PVR_VIDEO_BITRATE=6 - -# Peak video bitrate encoding in Mbps -PVR_VIDEO_PEAK_BITRATE=9 - -# Video encoding mode (vbr, cbr) -PVR_VIDEO_MODE=vbr - -# MPEG encoding format -# ps: MPEG-2 Program Stream (default) -# ts: MPEG-2 Transport Stream -# mpeg1: MPEG-1 System Stream -# vcd: Video CD compatible stream -# svcd: Super Video CD compatible stream -# dvd: DVD compatible stream -PVR_VIDEO_FORMAT=ps diff --git a/packages/linux/config/tv b/packages/linux/config/tv deleted file mode 100644 index dd62c8f4fd..0000000000 --- a/packages/linux/config/tv +++ /dev/null @@ -1,6 +0,0 @@ -# Below are the default GeeXboX settings for the all TV cards drivers - -install bttv /sbin/setup_tvcard_options bttv 1 && /sbin/modprobe --ignore-install bttv -install saa7134 /sbin/setup_tvcard_options saa7134 0 && /sbin/modprobe --ignore-install saa7134 -install cx88xx /sbin/setup_tvcard_options cx88xx 0 && /sbin/modprobe --ignore-install cx88xx -install ivtv /sbin/modprobe --ignore-install ivtv && echo '' > /var/use_pvr diff --git a/packages/linux/config/tvcard b/packages/linux/config/tvcard deleted file mode 100644 index 41f416fbfa..0000000000 --- a/packages/linux/config/tvcard +++ /dev/null @@ -1,53 +0,0 @@ -# -# TV Card Options -# - -# TV card model (AUTO for autodetection or look at the following urls) -# http://linuxtv.org/hg/v4l-dvb?cmd=file;file=linux/Documentation/video4linux/CARDLIST.bttv;filenode=-1;style=raw -# http://linuxtv.org/hg/v4l-dvb?cmd=file;file=linux/Documentation/video4linux/CARDLIST.cx88;filenode=-1;style=raw -# http://linuxtv.org/hg/v4l-dvb?cmd=file;file=linux/Documentation/video4linux/CARDLIST.saa7134;filenode=-1;style=raw -TV_CARD=AUTO - -# TV tuner (AUTO for autodetection or look at the following url) -# http://linuxtv.org/hg/v4l-dvb?cmd=file;file=linux/Documentation/video4linux/CARDLIST.tuner;filenode=-1;style=raw -TV_TUNER=AUTO - -# TV Input Standard (ntsc/ntsc-m/ntsc-jp/pal/pal-bg/pal-dk/pal-i/pal-m/pal-n/ -# pal-nc/pal-60/secam/secam-l/secam-dk) -TVIN_STANDARD=pal - -# TV Channels -# Syntax : CHAN="Channel Frequency:Channel Title" -# Example: -#CHAN="29:France 2" -#CHAN="K08:Canal +" - -# TV Channels List -# Available : us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, -# europe-west, europe-east, italy, newzealand, australia, -# ireland, france, china-bcast, southafrica, argentina, -# australia-optus, russia -CHANLIST=europe-west - -# Teletext language -# Available: 0 (English) 1 (French), 2 (Swedish/Finnish/Hungarian), -# 3 (Czech/Slovak), 4 (German), 5 (Portuguese/Spanish), -# 6 (Italian), 8 (Polish), 9 (French), -# 10 (Swedish/Finnish/Hungarian), 11 (Czech/Slovak), -# 12 (German), 14 (Italian), 16 (English), 17 (French), -# 18 (Swedish/Finnish/Hungarian), 19 (Turkish), 20 (German), -# 21 (Portuguese/Spanish), 22 (Italian), -# 29 (Serbian/Croatian/Slovenian {Latin}), -# 32 (Serbian/Croatian {Cyrillic}), 33 (Russian, Bulgarian), -# 34 (Estonian), 35 (Czech/Slovak), 36 (German), 37 (Ukrainian), -# 38 (Lettish/Lithuanian), 51 (Turkish), 55 (Greek), 64 (English), -# 65 (French) -TELETEXT_LANG=0 - -# TV Video Settings -TV_WIDTH=768 -TV_HEIGHT=576 -TV_BRIGHTNESS=50 -TV_CONTRAST=50 -TV_HUE=100 -TV_SATURATION=75 diff --git a/packages/linux/install b/packages/linux/install index 58ade4f3b2..e54f4a0bc4 100755 --- a/packages/linux/install +++ b/packages/linux/install @@ -26,11 +26,4 @@ VER=`ls $PKG_BUILD/modules/lib/modules` mkdir -p $INSTALL/lib/firmware cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || echo "no firmware" - mkdir -p $INSTALL/sbin - cp $PKG_DIR/scripts/setup_tvcard_options $INSTALL/sbin - mkdir -p $INSTALL/etc - cp $PKG_DIR/config/modules $INSTALL/etc - cp $PKG_DIR/config/tvcard $INSTALL/etc - cp $PKG_DIR/config/pvr $INSTALL/etc mkdir -p $INSTALL/etc/modprobe.d - cp $PKG_DIR/config/tv $INSTALL/etc/modprobe.d diff --git a/packages/linux/patches/linux-2.6.29-dont-wait-for-mouse.diff b/packages/linux/patches/linux-2.6.29-dont-wait-for-mouse.diff new file mode 100644 index 0000000000..6b2d54ff5e --- /dev/null +++ b/packages/linux/patches/linux-2.6.29-dont-wait-for-mouse.diff @@ -0,0 +1,47 @@ +From dce8113d033975f56630cf6d2a6a908cfb66059d Mon Sep 17 00:00:00 2001 +From: Arjan van de Ven +Date: Sun, 20 Jul 2008 13:12:16 -0700 +Subject: [PATCH] fastboot: remove "wait for all devices before mounting root" delay + +In the non-initrd case, we wait for all devices to finish their +probing before we try to mount the rootfs. +In practice, this means that we end up waiting 2 extra seconds for +the PS/2 mouse probing even though the root holding device has been +ready since a long time. + +The previous two patches in this series made the RAID autodetect code +do it's own "wait for probing to be done" code, and added +"wait and retry" functionality in case the root device isn't actually +available. + +These two changes should make it safe to remove the delay itself, +and this patch does this. On my test laptop, this reduces the boot time +by 2 seconds (kernel time goes from 3.9 to 1.9 seconds). + +Signed-off-by: Arjan van de Ven +--- +--- + init/do_mounts.c | 3 +++ + 1 file changed, 3 insertions(+) + +Index: linux-2.6.29/init/do_mounts.c +=================================================================== +--- linux-2.6.29.orig/init/do_mounts.c ++++ linux-2.6.29/init/do_mounts.c +@@ -370,6 +370,7 @@ void __init prepare_namespace(void) + ssleep(root_delay); + } + ++#if 0 + /* + * wait for the known devices to complete their probing + * +@@ -378,6 +379,8 @@ void __init prepare_namespace(void) + * for the touchpad of a laptop to initialize. + */ + wait_for_device_probe(); ++#endif ++ async_synchronize_full(); + + md_run_setup(); + diff --git a/packages/linux/patches/linux-2.6.29-kms-after-sata.diff b/packages/linux/patches/linux-2.6.29-kms-after-sata.diff new file mode 100644 index 0000000000..f635e2a88d --- /dev/null +++ b/packages/linux/patches/linux-2.6.29-kms-after-sata.diff @@ -0,0 +1,38 @@ +--- + drivers/Makefile | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +Index: linux-2.6.29/drivers/Makefile +=================================================================== +--- linux-2.6.29.orig/drivers/Makefile ++++ linux-2.6.29/drivers/Makefile +@@ -25,15 +25,8 @@ obj-$(CONFIG_REGULATOR) += regulator/ + # default. + obj-y += char/ + +-# gpu/ comes after char for AGP vs DRM startup +-obj-y += gpu/ +- + obj-$(CONFIG_CONNECTOR) += connector/ + +-# i810fb and intelfb depend on char/agp/ +-obj-$(CONFIG_FB_I810) += video/i810/ +-obj-$(CONFIG_FB_INTEL) += video/intelfb/ +- + obj-y += serial/ + obj-$(CONFIG_PARPORT) += parport/ + obj-y += base/ block/ misc/ mfd/ media/ +@@ -43,6 +36,13 @@ obj-$(CONFIG_IDE) += ide/ + obj-$(CONFIG_SCSI) += scsi/ + obj-$(CONFIG_ATA) += ata/ + obj-y += net/ ++ ++# gpu/ comes after char for AGP vs DRM startup ++obj-y += gpu/ ++# i810fb and intelfb depend on char/agp/ ++obj-$(CONFIG_FB_I810) += video/i810/ ++obj-$(CONFIG_FB_INTEL) += video/intelfb/ ++ + obj-$(CONFIG_ATM) += atm/ + obj-$(CONFIG_FUSION) += message/ + obj-$(CONFIG_FIREWIRE) += firewire/ diff --git a/packages/linux/scripts/setup_tvcard_options b/packages/linux/scripts/setup_tvcard_options deleted file mode 100755 index 2ca72e83ff..0000000000 --- a/packages/linux/scripts/setup_tvcard_options +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# Setup TV modules options for modprobe - -test $# -lt 2 && echo "usage: $0 module_name has_radio" && exit 1 - -append_tv_option () { - TV_OPTIONS="$TV_OPTIONS $1" -} - -append_radio_option () { - RADIO_OPTIONS="$RADIO_OPTIONS $1" -} - -set_module_options () { - OPT_FILE=/etc/modprobe.d/options - - # check if options file is not already set for this module - grep -q "options $1" $OPT_FILE 2>/dev/null && return - - echo "options $1 $2" >> $OPT_FILE -} - -. /etc/tvcard -[ -f /etc/radio ] && . /etc/radio - -test "$TV_CARD" != "AUTO" && append_tv_option "card=$TV_CARD" -test "$TV_TUNER" != "AUTO" && append_tv_option "tuner=$TV_TUNER" -test "$RADIO" = yes && test "$2" = 1 && append_radio_option "radio=1" - -set_module_options $1 "$TV_OPTIONS $RADIO_OPTIONS" - -echo "" > /var/tvcard diff --git a/packages/linux/url b/packages/linux/url index 6b15cc0878..175702cb37 100644 --- a/packages/linux/url +++ b/packages/linux/url @@ -1 +1 @@ -http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.32-rc3.tar.bz2 +http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.32-rc6.tar.bz2