diff --git a/packages/linux/meta b/packages/linux/meta index c6f67e8923..90a863f44a 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="2.6.39-rc4" +PKG_VERSION="2.6.39-rc5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/linux-2.6.39-rc4-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch b/packages/linux/patches/linux-2.6.39-rc4-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch deleted file mode 100644 index 432a72d48d..0000000000 --- a/packages/linux/patches/linux-2.6.39-rc4-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur linux-2.6.38-rc5/drivers/ata/libata-core.c linux-2.6.38-rc5.patch/drivers/ata/libata-core.c ---- linux-2.6.38-rc5/drivers/ata/libata-core.c 2011-02-16 04:23:45.000000000 +0100 -+++ linux-2.6.38-rc5.patch/drivers/ata/libata-core.c 2011-02-22 00:57:25.789636966 +0100 -@@ -4139,6 +4139,7 @@ - */ - { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER }, - { "PIONEER DVD-RW DVR-212D", "1.28", ATA_HORKAGE_NOSETXFER }, -+ { "PIONEER DVD-RW DVR-216D", "1.07", ATA_HORKAGE_NOSETXFER }, - - /* End Marker */ - { } diff --git a/packages/linux/patches/linux-2.6.39-rc4-000_crosscompile.patch b/packages/linux/patches/linux-2.6.39-rc5-000_crosscompile.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-000_crosscompile.patch rename to packages/linux/patches/linux-2.6.39-rc5-000_crosscompile.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-002_bash_only_feature.patch b/packages/linux/patches/linux-2.6.39-rc5-002_bash_only_feature.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-002_bash_only_feature.patch rename to packages/linux/patches/linux-2.6.39-rc5-002_bash_only_feature.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-003-no_dev_console.patch b/packages/linux/patches/linux-2.6.39-rc5-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-003-no_dev_console.patch rename to packages/linux/patches/linux-2.6.39-rc5-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-2.6.39-rc5-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-2.6.39-rc5-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-005_kconfig_no_timestamp.patch b/packages/linux/patches/linux-2.6.39-rc5-005_kconfig_no_timestamp.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-005_kconfig_no_timestamp.patch rename to packages/linux/patches/linux-2.6.39-rc5-005_kconfig_no_timestamp.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-006_enable_utf8.patch b/packages/linux/patches/linux-2.6.39-rc5-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-006_enable_utf8.patch rename to packages/linux/patches/linux-2.6.39-rc5-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-007_die_floppy_die.patch b/packages/linux/patches/linux-2.6.39-rc5-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-007_die_floppy_die.patch rename to packages/linux/patches/linux-2.6.39-rc5-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-008-hda_intel_prealloc_4mb_dmabuffer.patch b/packages/linux/patches/linux-2.6.39-rc5-008-hda_intel_prealloc_4mb_dmabuffer.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-008-hda_intel_prealloc_4mb_dmabuffer.patch rename to packages/linux/patches/linux-2.6.39-rc5-008-hda_intel_prealloc_4mb_dmabuffer.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-2.6.39-rc5-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-2.6.39-rc5-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-2.6.39-rc5-010-acpi_reboot.patch b/packages/linux/patches/linux-2.6.39-rc5-010-acpi_reboot.patch new file mode 100644 index 0000000000..c67cf950bc --- /dev/null +++ b/packages/linux/patches/linux-2.6.39-rc5-010-acpi_reboot.patch @@ -0,0 +1,53 @@ +Improve our reboot handling for compatibility with Windows. Upstream in .38? + +diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c +index c495aa8..c770e66 100644 +--- a/arch/x86/kernel/reboot.c ++++ b/arch/x86/kernel/reboot.c +@@ -34,7 +34,7 @@ EXPORT_SYMBOL(pm_power_off); + + static const struct desc_ptr no_idt = {}; + static int reboot_mode; +-enum reboot_type reboot_type = BOOT_KBD; ++enum reboot_type reboot_type = BOOT_ACPI; + int reboot_force; + + #if defined(CONFIG_X86_32) && defined(CONFIG_SMP) +@@ -538,9 +538,23 @@ void __attribute__((weak)) mach_reboot_fixups(void) + { + } + ++/* ++ * Windows does the following on reboot: ++ * 1) If the FADT has the ACPI reboot register flag set, try it ++ * 2) If still alive, write to the keyboard controller ++ * 3) If still alive, write to the ACPI reboot register again ++ * 4) If still alive, write to the keyboard controller again ++ * ++ * If the machine is still alive at this stage, it gives up. We default to ++ * following the same pattern, except that if we're still alive after (4) we'll ++ * try to force a triple fault and then cycle between hitting the keyboard ++ * controller and doing that ++ */ + static void native_machine_emergency_restart(void) + { + int i; ++ int attempt = 0; ++ int orig_reboot_type = reboot_type; + + if (reboot_emergency) + emergency_vmx_disable_all(); +@@ -562,6 +576,13 @@ static void native_machine_emergency_restart(void) + outb(0xfe, 0x64); /* pulse reset low */ + udelay(50); + } ++ if (attempt == 0 && orig_reboot_type == BOOT_ACPI) { ++ attempt = 1; ++ reboot_type = BOOT_ACPI; ++ } else { ++ reboot_type = BOOT_TRIPLE; ++ } ++ break; + + case BOOT_TRIPLE: + load_idt(&no_idt); diff --git a/packages/linux/patches/linux-2.6.39-rc5-031-usb-pci-autosuspend.patch b/packages/linux/patches/linux-2.6.39-rc5-031-usb-pci-autosuspend.patch new file mode 100644 index 0000000000..610a7654d9 --- /dev/null +++ b/packages/linux/patches/linux-2.6.39-rc5-031-usb-pci-autosuspend.patch @@ -0,0 +1,22 @@ +commit 15d89120d03116adbbf3226a85fbd2fff0b12576 +Author: Matthew Garrett +Date: Fri Sep 17 11:09:12 2010 -0400 + + Enable USB PCI autosuspend by default + +diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c +index c3f9854..3c020e6 100644 +--- a/drivers/usb/core/hcd-pci.c ++++ b/drivers/usb/core/hcd-pci.c +@@ -248,8 +248,10 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) + goto err4; + set_hs_companion(dev, hcd); + +- if (pci_dev_run_wake(dev)) ++ if (pci_dev_run_wake(dev)) { + pm_runtime_put_noidle(&dev->dev); ++ pm_runtime_allow(&dev->dev); ++ } + return retval; + + err4: diff --git a/packages/linux/patches/linux-2.6.39-rc4-050_add_appleir_usb_driver.patch b/packages/linux/patches/linux-2.6.39-rc5-050_add_appleir_usb_driver.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-050_add_appleir_usb_driver.patch rename to packages/linux/patches/linux-2.6.39-rc5-050_add_appleir_usb_driver.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-2.6.39-rc5-052-aureal_remote_quirk-0.1.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-052-aureal_remote_quirk-0.1.patch rename to packages/linux/patches/linux-2.6.39-rc5-052-aureal_remote_quirk-0.1.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-053_ati-remote_all_keys_and_keychange-0.1.patch b/packages/linux/patches/linux-2.6.39-rc5-053_ati-remote_all_keys_and_keychange-0.1.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-053_ati-remote_all_keys_and_keychange-0.1.patch rename to packages/linux/patches/linux-2.6.39-rc5-053_ati-remote_all_keys_and_keychange-0.1.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-054_nuvoton-cir-only-warn-about-unknown-chips.patch b/packages/linux/patches/linux-2.6.39-rc5-054_nuvoton-cir-only-warn-about-unknown-chips.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-054_nuvoton-cir-only-warn-about-unknown-chips.patch rename to packages/linux/patches/linux-2.6.39-rc5-054_nuvoton-cir-only-warn-about-unknown-chips.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-055_nuvoton-cir-enable-CIR-on-w83667hg-chip-variant.patch b/packages/linux/patches/linux-2.6.39-rc5-055_nuvoton-cir-enable-CIR-on-w83667hg-chip-variant.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-055_nuvoton-cir-enable-CIR-on-w83667hg-chip-variant.patch rename to packages/linux/patches/linux-2.6.39-rc5-055_nuvoton-cir-enable-CIR-on-w83667hg-chip-variant.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-321-linux_omap_dss2_fix_SMC_instructions.patch b/packages/linux/patches/linux-2.6.39-rc5-321-linux_omap_dss2_fix_SMC_instructions.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-321-linux_omap_dss2_fix_SMC_instructions.patch rename to packages/linux/patches/linux-2.6.39-rc5-321-linux_omap_dss2_fix_SMC_instructions.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-322-omap4_pandaboard_fix_dvi_support-0.1.patch b/packages/linux/patches/linux-2.6.39-rc5-322-omap4_pandaboard_fix_dvi_support-0.1.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-322-omap4_pandaboard_fix_dvi_support-0.1.patch rename to packages/linux/patches/linux-2.6.39-rc5-322-omap4_pandaboard_fix_dvi_support-0.1.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-716_mm-zero_swappiness.patch b/packages/linux/patches/linux-2.6.39-rc5-716_mm-zero_swappiness.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-716_mm-zero_swappiness.patch rename to packages/linux/patches/linux-2.6.39-rc5-716_mm-zero_swappiness.patch diff --git a/packages/linux/patches/linux-2.6.39-rc4-720_usb-wakeup.patch b/packages/linux/patches/linux-2.6.39-rc5-720_usb-wakeup.patch similarity index 100% rename from packages/linux/patches/linux-2.6.39-rc4-720_usb-wakeup.patch rename to packages/linux/patches/linux-2.6.39-rc5-720_usb-wakeup.patch diff --git a/packages/sdk/emulators-sdk/install b/packages/sdk/emulators-sdk/install deleted file mode 100755 index e09d1b7310..0000000000 --- a/packages/sdk/emulators-sdk/install +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -$SCRIPTS/install SDL -$SCRIPTS/install expat -$SCRIPTS/install zlib diff --git a/packages/sdk/games-sdk/install b/packages/sdk/games-sdk/install deleted file mode 100755 index 3199958224..0000000000 --- a/packages/sdk/games-sdk/install +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -$SCRIPTS/install curl -#$SCRIPTS/build lua -$SCRIPTS/install boost -$SCRIPTS/install xerces-c -$SCRIPTS/install $LIBJPEG -$SCRIPTS/install libpng -$SCRIPTS/install libvorbis -$SCRIPTS/install libogg -$SCRIPTS/install SDL -$SCRIPTS/install SDL_image -$SCRIPTS/install SDL_mixer -$SCRIPTS/install SDL_net -$SCRIPTS/install SDL_ttf -$SCRIPTS/install openal-soft -$SCRIPTS/install libX11 -$SCRIPTS/install pango -$SCRIPTS/install fontconfig -$SCRIPTS/install Mesa diff --git a/packages/sysutils/busybox/init.d/35_wakeup b/packages/sysutils/busybox/init.d/35_wakeup deleted file mode 100644 index 123d54706c..0000000000 --- a/packages/sysutils/busybox/init.d/35_wakeup +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -# setup wakup devices -# -# runlevels: openelec - -( - if [ -f /proc/acpi/wakeup ]; then - progress "enable WakeUp devices" - - for device in `cat /proc/acpi/wakeup | grep "^U[H,S][B,C,0-9]" | grep "*disabled" | cut -f1 -d " "`; do - echo -n $device > /proc/acpi/wakeup - done - fi -)& diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules index 7eb4eaf6c4..73e42ce990 100644 --- a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules +++ b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules @@ -127,6 +127,9 @@ ENV{ID_VENDOR_ID}=="9022", ENV{ID_MODEL_ID}=="d660", \ ENV{eventlircd_enable}="true", \ ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap" +# Enable wake-on-usb for the USB remotes. + RUN+="wakeup_enable" + LABEL="end-usb" LABEL="end" diff --git a/packages/sysutils/remote/eventlircd/udev.d/99-wakeup-usb.rules b/packages/sysutils/remote/eventlircd/udev.d/99-wakeup-usb.rules deleted file mode 100644 index 2e2b13d1d8..0000000000 --- a/packages/sysutils/remote/eventlircd/udev.d/99-wakeup-usb.rules +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -#      Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -ACTION!="add|change", GOTO="end" -SUBSYSTEM!="usb", GOTO="end" - -ATTR{power/wakeup}=="disabled", ATTR{power/wakeup}="enabled" - -LABEL="end" diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index d90244a933..a21826fbaf 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39-rc3 Kernel Configuration +# Linux/i386 2.6.39-rc5 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -144,7 +144,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EXPERT=y -CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y # CONFIG_KALLSYMS is not set @@ -161,6 +160,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y # @@ -513,6 +513,7 @@ CONFIG_PCI_MSI=y CONFIG_HT_IRQ=y # CONFIG_PCI_IOV is not set CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set @@ -981,7 +982,8 @@ CONFIG_HOSTAP=m # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set # CONFIG_IWLAGN is not set -# CONFIG_IWLWIFI_LEGACY is not set +# CONFIG_IWL4965 is not set +# CONFIG_IWL3945 is not set # CONFIG_LIBERTAS is not set # CONFIG_HERMES is not set # CONFIG_P54_COMMON is not set @@ -2131,7 +2133,6 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_CS5535_GPIO is not set # CONFIG_XVMALLOC is not set # CONFIG_ZRAM is not set -# CONFIG_SAMSUNG_LAPTOP is not set # CONFIG_FB_SM7XX is not set # CONFIG_CRYSTALHD is not set # CONFIG_FB_XGI is not set diff --git a/projects/ATV/options b/projects/ATV/options index b5282a3f24..e80a044ba1 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -224,12 +224,6 @@ # build with installer (yes / no) INSTALLER_SUPPORT="yes" -# build with games support (yes / no) - GAMES="no" - -# build with emulator support (yes / no) - EMULATORS="no" - # Testpackages for development (yes / no) TESTING="no" diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index b88fda0c25..3b2af66d1b 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39-rc3 Kernel Configuration +# Linux/i386 2.6.39-rc5 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -141,7 +141,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EXPERT=y -CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y # CONFIG_KALLSYMS is not set @@ -158,6 +157,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y # @@ -516,6 +516,7 @@ CONFIG_PCI_MSI=y CONFIG_HT_IRQ=y # CONFIG_PCI_IOV is not set CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set @@ -2504,7 +2505,6 @@ CONFIG_VT6656=m # CONFIG_CS5535_GPIO is not set # CONFIG_XVMALLOC is not set # CONFIG_ZRAM is not set -# CONFIG_SAMSUNG_LAPTOP is not set # CONFIG_FB_SM7XX is not set # CONFIG_CRYSTALHD is not set # CONFIG_FB_XGI is not set diff --git a/projects/Generic/options b/projects/Generic/options index b241ea6e9d..c1839d4ebe 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -224,12 +224,6 @@ # build with installer (yes / no) INSTALLER_SUPPORT="yes" -# build with games support (yes / no) - GAMES="yes" - -# build with emulator support (yes / no) - EMULATORS="yes" - # Testpackages for development (yes / no) TESTING="no" diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index eb5a695111..0da45c234c 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39-rc3 Kernel Configuration +# Linux/i386 2.6.39-rc5 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -141,7 +141,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EXPERT=y -CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y # CONFIG_KALLSYMS is not set @@ -158,6 +157,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y # @@ -514,6 +514,7 @@ CONFIG_PCI_MSI=y CONFIG_HT_IRQ=y # CONFIG_PCI_IOV is not set CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set @@ -1042,7 +1043,8 @@ CONFIG_HOSTAP=m # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set # CONFIG_IWLAGN is not set -# CONFIG_IWLWIFI_LEGACY is not set +# CONFIG_IWL4965 is not set +# CONFIG_IWL3945 is not set # CONFIG_IWM is not set # CONFIG_LIBERTAS is not set # CONFIG_HERMES is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 4d97b824e1..af189f3481 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.39-rc3 Kernel Configuration +# Linux/x86_64 2.6.39-rc5 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -141,7 +141,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EXPERT=y -CONFIG_EMBEDDED=y CONFIG_SYSCTL_SYSCALL=y # CONFIG_KALLSYMS is not set CONFIG_HOTPLUG=y @@ -157,6 +156,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y # @@ -468,6 +468,7 @@ CONFIG_PCI_MSI=y CONFIG_HT_IRQ=y # CONFIG_PCI_IOV is not set CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y CONFIG_ISA_DMA_API=y # CONFIG_PCCARD is not set # CONFIG_HOTPLUG_PCI is not set @@ -991,7 +992,8 @@ CONFIG_HOSTAP=m # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set # CONFIG_IWLAGN is not set -# CONFIG_IWLWIFI_LEGACY is not set +# CONFIG_IWL4965 is not set +# CONFIG_IWL3945 is not set # CONFIG_IWM is not set # CONFIG_LIBERTAS is not set # CONFIG_HERMES is not set diff --git a/projects/ION/options b/projects/ION/options index 820ea0397b..81f5003913 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -224,12 +224,6 @@ # build with installer (yes / no) INSTALLER_SUPPORT="yes" -# build with games support (yes / no) - GAMES="yes" - -# build with emulator support (yes / no) - EMULATORS="yes" - # Testpackages for development (yes / no) TESTING="no" diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 68a4c68521..ef90885918 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.39-rc3 Kernel Configuration +# Linux/x86_64 2.6.39-rc5 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -141,7 +141,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EXPERT=y -CONFIG_EMBEDDED=y CONFIG_SYSCTL_SYSCALL=y # CONFIG_KALLSYMS is not set CONFIG_HOTPLUG=y @@ -157,6 +156,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y # @@ -471,6 +471,7 @@ CONFIG_PCI_MSI=y CONFIG_HT_IRQ=y # CONFIG_PCI_IOV is not set CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y CONFIG_ISA_DMA_API=y # CONFIG_PCCARD is not set # CONFIG_HOTPLUG_PCI is not set @@ -2304,7 +2305,6 @@ CONFIG_VT6656=m # CONFIG_IIO is not set # CONFIG_XVMALLOC is not set # CONFIG_ZRAM is not set -# CONFIG_SAMSUNG_LAPTOP is not set # CONFIG_FB_SM7XX is not set # CONFIG_CRYSTALHD is not set # CONFIG_FB_XGI is not set diff --git a/projects/Intel/options b/projects/Intel/options index fb7e11c3f1..d98c21d3d3 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -224,12 +224,6 @@ # build with installer (yes / no) INSTALLER_SUPPORT="yes" -# build with games support (yes / no) - GAMES="yes" - -# build with emulator support (yes / no) - EMULATORS="yes" - # Testpackages for development (yes / no) TESTING="no" diff --git a/scripts/image b/scripts/image index 1695a26624..706c350fe3 100755 --- a/scripts/image +++ b/scripts/image @@ -130,10 +130,6 @@ mkdir -p $INSTALL # Update support [ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer -# Games and Emulators support (SDK's) - [ "$GAMES" = "yes" ] && $SCRIPTS/install games-sdk - [ "$EMULATORS" = "yes" ] && $SCRIPTS/install emulators-sdk - # some system tools [ "$TOOLS" = "yes" ] && $SCRIPTS/install tools