diff options
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-omap2-git/beagleboard/defconfig | 12 | ||||
| -rw-r--r-- | packages/linux/linux-omap2_git.bb | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 1c3dc2106c..e11c379d8a 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.26-rc5-omap1 -# Fri Jun 13 19:50:40 2008 +# Linux kernel version: 2.6.26-rc7-omap1 +# Mon Jun 23 10:04:35 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -581,6 +581,7 @@ CONFIG_MTD_NAND=y # CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_SMC is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_NANDSIM is not set @@ -1155,9 +1156,6 @@ CONFIG_SND_SOC=y # SoC Audio for the Texas Instruments OMAP # CONFIG_SND_OMAP_SOC=y -CONFIG_SND_OMAP_SOC_MCBSP=y -CONFIG_SND_OMAP_SOC_OMAP3BEAGLE=y -CONFIG_SND_SOC_TWL4030=y # # Open Sound System @@ -1425,6 +1423,7 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_M41T80 is not set CONFIG_RTC_DRV_TWL4030=y # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set # # SPI RTC drivers @@ -1683,8 +1682,7 @@ CONFIG_FRAME_POINTER=y # CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_ERRORS is not set # CONFIG_DEBUG_STACK_USAGE is not set -CONFIG_DEBUG_LL=n -# CONFIG_DEBUG_ICEDCC is not set +# CONFIG_DEBUG_LL is not set # # Security options diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 252e3da37c..0e68729552 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -2,9 +2,9 @@ require linux-omap.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}" -SRCREV = "5b97d3ec6732c87741b2fc04f2956f097a458818" +SRCREV = "6a32eb134fbf2ea1d384e0bfa8e9ba6eec952817" -PV = "2.6.25+2.6.26-rc6+${PR}+git${SRCREV}" +PV = "2.6.25+2.6.26-rc7+${PR}+git${SRCREV}" PR = "r27" |