diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-09-23 14:35:17 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-09-29 23:44:55 +0200 |
commit | 3870681ff63236659cda220c00b4d87ecac196f0 (patch) | |
tree | 962a735f3d54e8c7cf2be32c8b0544c30d2a19a6 /recipes/linux | |
parent | 7a54b54c10da1e57ef5fd965f5b27a8489aaa994 (diff) | |
download | openembedded-3870681ff63236659cda220c00b4d87ecac196f0.tar.gz |
linux(-kexecboot)_git: bump SRCREV for 2.6.36-rc6
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/linux')
-rw-r--r-- | recipes/linux/linux-kexecboot/spitz/defconfig | 64 | ||||
-rw-r--r-- | recipes/linux/linux-kexecboot_git.bb | 9 | ||||
-rw-r--r-- | recipes/linux/linux/spitz/defconfig | 11 | ||||
-rw-r--r-- | recipes/linux/linux_git.bb | 5 |
4 files changed, 47 insertions, 42 deletions
diff --git a/recipes/linux/linux-kexecboot/spitz/defconfig b/recipes/linux/linux-kexecboot/spitz/defconfig index d1f12aec71..f160a0d187 100644 --- a/recipes/linux/linux-kexecboot/spitz/defconfig +++ b/recipes/linux/linux-kexecboot/spitz/defconfig @@ -1,12 +1,11 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.35 -# Thu Jul 22 23:42:39 2010 +# Linux kernel version: 2.6.36-rc6 +# Wed Sep 29 21:22:28 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y -CONFIG_GENERIC_TIME=y # CONFIG_ARCH_USES_GETTIMEOFFSET is not set CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_HAVE_PROC_CPU=y @@ -41,7 +40,6 @@ CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_LZO=y # CONFIG_KERNEL_GZIP is not set -# CONFIG_KERNEL_BZIP2 is not set CONFIG_KERNEL_LZMA=y # CONFIG_KERNEL_LZO is not set # CONFIG_SWAP is not set @@ -52,7 +50,6 @@ CONFIG_KERNEL_LZMA=y # RCU Subsystem # CONFIG_TREE_RCU=y -# CONFIG_TREE_PREEMPT_RCU is not set # CONFIG_TINY_RCU is not set # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=32 @@ -74,9 +71,7 @@ CONFIG_RD_LZMA=y # CONFIG_RD_LZO is not set # CONFIG_INITRAMFS_COMPRESSION_NONE is not set # CONFIG_INITRAMFS_COMPRESSION_GZIP is not set -# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set CONFIG_INITRAMFS_COMPRESSION_LZMA=y -# CONFIG_INITRAMFS_COMPRESSION_LZO is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y @@ -113,12 +108,12 @@ CONFIG_SLOB=y CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y # # GCOV-based kernel profiling # -# CONFIG_SLOW_WORK is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=1 @@ -135,7 +130,6 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_DEADLINE=y # CONFIG_IOSCHED_CFQ is not set CONFIG_DEFAULT_DEADLINE=y -# CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="deadline" # CONFIG_INLINE_SPIN_TRYLOCK is not set @@ -196,10 +190,10 @@ CONFIG_MMU=y # CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP4XX is not set -# CONFIG_ARCH_L7200 is not set # CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_KIRKWOOD is not set # CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_LPC32XX is not set # CONFIG_ARCH_MV78XX0 is not set # CONFIG_ARCH_ORION5X is not set # CONFIG_ARCH_MMP is not set @@ -207,6 +201,7 @@ CONFIG_MMU=y # CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_W90X900 is not set # CONFIG_ARCH_NUC93X is not set +# CONFIG_ARCH_TEGRA is not set # CONFIG_ARCH_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_MSM is not set @@ -219,6 +214,7 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_S5P6442 is not set # CONFIG_ARCH_S5PC100 is not set # CONFIG_ARCH_S5PV210 is not set +# CONFIG_ARCH_S5PV310 is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_U300 is not set @@ -283,8 +279,7 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_RAUMFELD_CONNECTOR is not set # CONFIG_MACH_RAUMFELD_SPEAKER is not set CONFIG_PXA_SHARPSL=y -CONFIG_SHARPSL_PM=y -CONFIG_SHARPSL_PM_MAX1111=y +CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y # CONFIG_MACH_POODLE is not set # CONFIG_MACH_CORGI is not set # CONFIG_MACH_SHEPHERD is not set @@ -298,6 +293,8 @@ CONFIG_MACH_BORZOI=y # CONFIG_MACH_ZIPIT2 is not set CONFIG_PXA27x=y CONFIG_PXA_SHARP_Cxx00=y +CONFIG_SHARPSL_PM=y +CONFIG_SHARPSL_PM_MAX1111=y CONFIG_PXA_SSP=y CONFIG_PLAT_PXA=y @@ -362,12 +359,12 @@ CONFIG_AEABI=y # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_HIGHMEM is not set +# CONFIG_SPARSE_IRQ is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_HAVE_MEMBLOCK=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=999999 # CONFIG_PHYS_ADDR_T_64BIT is not set @@ -375,8 +372,11 @@ CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set +# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_DEPRECATED_PARAM_STRUCT=y # # Boot options @@ -388,6 +388,7 @@ CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y +# CONFIG_AUTO_ZRELADDR is not set # # CPU Power Management @@ -517,7 +518,6 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_VERIFY_WRITE=y # CONFIG_MTD_SM_COMMON is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set -CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018 # CONFIG_MTD_NAND_H1900 is not set # CONFIG_MTD_NAND_GPIO is not set CONFIG_MTD_NAND_IDS=y @@ -574,7 +574,7 @@ CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # -# CONFIG_BLK_DEV_SD is not set +CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set @@ -594,6 +594,7 @@ CONFIG_SCSI_PROC_FS=y # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_BOOT_SYSFS is not set # CONFIG_LIBFC is not set # CONFIG_LIBFCOE is not set # CONFIG_SCSI_DEBUG is not set @@ -602,7 +603,7 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set -CONFIG_ATA_VERBOSE_ERROR=y +# CONFIG_ATA_VERBOSE_ERROR is not set CONFIG_SATA_PMP=y # @@ -624,6 +625,7 @@ CONFIG_ATA_BMDMA=y # # PATA SFF controllers with BMDMA # +CONFIG_PATA_PXA=y # # PIO-only SFF controllers @@ -670,6 +672,7 @@ CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_MATRIX=y # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_MCS is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_PXA27x is not set @@ -682,9 +685,8 @@ CONFIG_KEYBOARD_MATRIX=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_AD7877 is not set -# CONFIG_TOUCHSCREEN_AD7879_I2C is not set -# CONFIG_TOUCHSCREEN_AD7879_SPI is not set # CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set # CONFIG_TOUCHSCREEN_DYNAPRO is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_EETI is not set @@ -697,6 +699,7 @@ CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_QT602240 is not set # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set @@ -731,6 +734,7 @@ CONFIG_HW_CONSOLE=y # Non-8250 serial port support # # CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX3107 is not set CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_CORE=y @@ -758,6 +762,7 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set # CONFIG_I2C_CHARDEV is not set +# CONFIG_I2C_MUX is not set CONFIG_I2C_HELPER_AUTO=y # @@ -826,6 +831,7 @@ CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX732X is not set # CONFIG_GPIO_PCA953X is not set # CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_ADP5588 is not set # @@ -886,6 +892,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LM63 is not set # CONFIG_SENSORS_LM70 is not set # CONFIG_SENSORS_LM73 is not set @@ -909,8 +916,10 @@ CONFIG_SENSORS_MAX1111=y # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_SHT15 is not set +# CONFIG_SENSORS_SMM665 is not set # CONFIG_SENSORS_DME1737 is not set # CONFIG_SENSORS_EMC1403 is not set +# CONFIG_SENSORS_EMC2103 is not set # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set @@ -951,6 +960,7 @@ CONFIG_MFD_SUPPORT=y # CONFIG_TPS65010 is not set # CONFIG_TPS6507X is not set # CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_STMPE is not set # CONFIG_MFD_TC35892 is not set # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set @@ -959,6 +969,7 @@ CONFIG_MFD_SUPPORT=y # CONFIG_PMIC_DA903X is not set # CONFIG_PMIC_ADP5520 is not set # CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8998 is not set # CONFIG_MFD_WM8400 is not set # CONFIG_MFD_WM831X is not set # CONFIG_MFD_WM8350_I2C is not set @@ -968,12 +979,14 @@ CONFIG_MFD_SUPPORT=y # CONFIG_ABX500_CORE is not set # CONFIG_EZX_PCAP is not set # CONFIG_AB8500_CORE is not set +# CONFIG_MFD_TPS6586X is not set # CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set # # Graphics support # +# CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y @@ -1031,7 +1044,6 @@ CONFIG_BACKLIGHT_GENERIC=y # # Console display driver support # -# CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set @@ -1047,10 +1059,7 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set # CONFIG_SOUND is not set # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set @@ -1132,8 +1141,8 @@ CONFIG_FS_POSIX_ACL=y # CONFIG_FILE_LOCKING is not set CONFIG_FSNOTIFY=y # CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY is not set CONFIG_INOTIFY_USER=y +# CONFIG_FANOTIFY is not set # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set @@ -1288,11 +1297,11 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set +# CONFIG_HARDLOCKUP_DETECTOR is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_MEMORY_INIT is not set CONFIG_FRAME_POINTER=y # CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_LATENCYTOP is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_TRACING_SUPPORT=y @@ -1310,9 +1319,6 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" CONFIG_CRYPTO=y diff --git a/recipes/linux/linux-kexecboot_git.bb b/recipes/linux/linux-kexecboot_git.bb index 14bfd3e36f..89200ca043 100644 --- a/recipes/linux/linux-kexecboot_git.bb +++ b/recipes/linux/linux-kexecboot_git.bb @@ -1,11 +1,12 @@ require linux-kexecboot.inc -KERNEL_RELEASE = "2.6.35" -SRCREV = "9fe6206f400646a2322096b56c59891d530e8d51" -PV = "${KERNEL_RELEASE}+gitr${SRCPV}" +KERNEL_RELEASE = "2.6.36-rc6" +OLD_KERNEL_RELEASE = "2.6.35" +PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}+gitr${SRCPV}" + +SRCREV = "899611ee7d373e5eeda08e9a8632684e1ebbbf00" SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \ - file://fix.module.loading.16310.patch \ file://defconfig" S = "${WORKDIR}/git" diff --git a/recipes/linux/linux/spitz/defconfig b/recipes/linux/linux/spitz/defconfig index 52733cf648..c6f937f61d 100644 --- a/recipes/linux/linux/spitz/defconfig +++ b/recipes/linux/linux/spitz/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.36-rc2 -# Tue Aug 24 10:23:15 2010 +# Linux kernel version: 2.6.36-rc6 +# Wed Sep 29 22:09:30 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -293,9 +293,9 @@ CONFIG_PXA_SHARPSL=y # CONFIG_MACH_CORGI is not set # CONFIG_MACH_SHEPHERD is not set # CONFIG_MACH_HUSKY is not set -# CONFIG_MACH_AKITA is not set +CONFIG_MACH_AKITA=y CONFIG_MACH_SPITZ=y -# CONFIG_MACH_BORZOI is not set +CONFIG_MACH_BORZOI=y # CONFIG_MACH_TOSA is not set # CONFIG_MACH_ICONTROL is not set # CONFIG_ARCH_PXA_ESERIES is not set @@ -399,7 +399,6 @@ CONFIG_CMDLINE=" quiet " CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y # CONFIG_AUTO_ZRELADDR is not set -CONFIG_ZRELADDR=0xa0008000 # # CPU Power Management @@ -2278,7 +2277,7 @@ CONFIG_CRYPTO_RNG2=m CONFIG_CRYPTO_PCOMP2=m CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_MANAGER2=m -CONFIG_CRYPTO_MANAGER_TESTS=y +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y # CONFIG_CRYPTO_GF128MUL is not set CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_WORKQUEUE=m diff --git a/recipes/linux/linux_git.bb b/recipes/linux/linux_git.bb index 49675149b6..5928742e52 100644 --- a/recipes/linux/linux_git.bb +++ b/recipes/linux/linux_git.bb @@ -1,11 +1,10 @@ require linux.inc -KERNEL_RELEASE = "2.6.36-rc2" +KERNEL_RELEASE = "2.6.36-rc6" OLD_KERNEL_RELEASE = "2.6.35" PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}+gitr${SRCPV}" -SRCREV = "d1b113bb028999e82a8528e1484be8c23fb5a7d9" -PV = "${KERNEL_RELEASE}+gitr${SRCPV}" +SRCREV = "899611ee7d373e5eeda08e9a8632684e1ebbbf00" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \ file://defconfig" |