summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-29 16:53:36 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-29 16:53:36 +0000
commitdcf7185bab814d2dea3192dd6d8d9243893f8fae (patch)
treeb64276bf7180bab1650b601cd10b0a935373f4f0 /meta
parentc40aba1b89c20d919a87197c2cba478a6ffc815a (diff)
downloadpoky-dcf7185bab814d2dea3192dd6d8d9243893f8fae.tar.gz
Merged revisions 5309 via svnmerge from
https://svn.o-hand.com/repos/poky/trunk ........ r5309 | richard | 2008-09-29 17:06:49 +0100 (Mon, 29 Sep 2008) | 1 line linux-omap-3430ldp: Build jffs2 support in. ........ git-svn-id: https://svn.o-hand.com/repos/poky/branches/elroy@5311 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/linux/linux-omap-2.6.24.7/defconfig-omap-3430ldp14
-rw-r--r--meta/packages/linux/linux-omap_2.6.24.7.bb2
2 files changed, 8 insertions, 8 deletions
diff --git a/meta/packages/linux/linux-omap-2.6.24.7/defconfig-omap-3430ldp b/meta/packages/linux/linux-omap-2.6.24.7/defconfig-omap-3430ldp
index 10a3a8c45a..10a3a9900e 100644
--- a/meta/packages/linux/linux-omap-2.6.24.7/defconfig-omap-3430ldp
+++ b/meta/packages/linux/linux-omap-2.6.24.7/defconfig-omap-3430ldp
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24.7-omap1-arm2 3# Linux kernel version: 2.6.24.7-omap1-arm2
4# Sat Aug 2 18:15:17 2008 4# Mon Sep 29 16:39:27 2008
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -459,7 +459,7 @@ CONFIG_MTD_CMDLINE_PARTS=y
459# 459#
460# User Modules And Translation Layers 460# User Modules And Translation Layers
461# 461#
462CONFIG_MTD_CHAR=m 462CONFIG_MTD_CHAR=y
463CONFIG_MTD_BLKDEVS=y 463CONFIG_MTD_BLKDEVS=y
464CONFIG_MTD_BLOCK=y 464CONFIG_MTD_BLOCK=y
465# CONFIG_FTL is not set 465# CONFIG_FTL is not set
@@ -1352,7 +1352,7 @@ CONFIG_TMPFS=y
1352# CONFIG_BEFS_FS is not set 1352# CONFIG_BEFS_FS is not set
1353# CONFIG_BFS_FS is not set 1353# CONFIG_BFS_FS is not set
1354# CONFIG_EFS_FS is not set 1354# CONFIG_EFS_FS is not set
1355CONFIG_JFFS2_FS=m 1355CONFIG_JFFS2_FS=y
1356CONFIG_JFFS2_FS_DEBUG=0 1356CONFIG_JFFS2_FS_DEBUG=0
1357CONFIG_JFFS2_FS_WRITEBUFFER=y 1357CONFIG_JFFS2_FS_WRITEBUFFER=y
1358# CONFIG_JFFS2_FS_WBUF_VERIFY is not set 1358# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
@@ -1565,10 +1565,10 @@ CONFIG_CRC_CCITT=y
1565CONFIG_CRC32=y 1565CONFIG_CRC32=y
1566# CONFIG_CRC7 is not set 1566# CONFIG_CRC7 is not set
1567CONFIG_LIBCRC32C=y 1567CONFIG_LIBCRC32C=y
1568CONFIG_ZLIB_INFLATE=m 1568CONFIG_ZLIB_INFLATE=y
1569CONFIG_ZLIB_DEFLATE=m 1569CONFIG_ZLIB_DEFLATE=y
1570CONFIG_LZO_COMPRESS=m 1570CONFIG_LZO_COMPRESS=y
1571CONFIG_LZO_DECOMPRESS=m 1571CONFIG_LZO_DECOMPRESS=y
1572CONFIG_PLIST=y 1572CONFIG_PLIST=y
1573CONFIG_HAS_IOMEM=y 1573CONFIG_HAS_IOMEM=y
1574CONFIG_HAS_IOPORT=y 1574CONFIG_HAS_IOPORT=y
diff --git a/meta/packages/linux/linux-omap_2.6.24.7.bb b/meta/packages/linux/linux-omap_2.6.24.7.bb
index e729e9789c..4d1851a27d 100644
--- a/meta/packages/linux/linux-omap_2.6.24.7.bb
+++ b/meta/packages/linux/linux-omap_2.6.24.7.bb
@@ -1,6 +1,6 @@
1require linux-omap.inc 1require linux-omap.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5COMPATIBLE_MACHINE = "omap-3430ldp" 5COMPATIBLE_MACHINE = "omap-3430ldp"
6 6