From 4f3a216751a1aa59eefacc6baa1d9c1711403537 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz <hrw@openedhand.com> Date: Thu, 29 Mar 2007 13:10:31 +0000 Subject: linux-rp: enable NFS server module for c7x0/spitz/akita git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1413 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/linux/linux-rp-2.6.20/defconfig-akita | 9 +++++++-- meta/packages/linux/linux-rp-2.6.20/defconfig-c7x0 | 18 ++++++++++++++---- meta/packages/linux/linux-rp-2.6.20/defconfig-spitz | 9 +++++++-- meta/packages/linux/linux-rp_2.6.20.bb | 2 +- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/meta/packages/linux/linux-rp-2.6.20/defconfig-akita b/meta/packages/linux/linux-rp-2.6.20/defconfig-akita index c8a0de9d8d..11577b1fb7 100644 --- a/meta/packages/linux/linux-rp-2.6.20/defconfig-akita +++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-akita @@ -1448,7 +1448,7 @@ CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set +CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set @@ -1533,9 +1533,14 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y # CONFIG_NFS_DIRECTIO is not set -# CONFIG_NFSD is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y CONFIG_LOCKD=m CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m diff --git a/meta/packages/linux/linux-rp-2.6.20/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.20/defconfig-c7x0 index 29306a2d47..a2ec14dedf 100644 --- a/meta/packages/linux/linux-rp-2.6.20/defconfig-c7x0 +++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-c7x0 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.20 -# Thu Mar 29 12:01:36 2007 +# Thu Mar 29 13:32:11 2007 # CONFIG_ARM=y # CONFIG_GENERIC_TIME is not set @@ -220,6 +220,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 dyntick=enable quiet" # CONFIG_XIP_KERNEL is not set CONFIG_CPU_FREQ_PXA25x=y CONFIG_KEXEC=y @@ -1099,10 +1100,14 @@ CONFIG_FONT_8x16=y # # Logo configuration # -# CONFIG_LOGO is not set +CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set +CONFIG_LOGO_OHAND_CLUT224=y +# CONFIG_LOGO_OZ240_CLUT224 is not set +# CONFIG_LOGO_OZ480_CLUT224 is not set +# CONFIG_LOGO_OZ640_CLUT224 is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y @@ -1493,7 +1498,7 @@ CONFIG_EXT2_FS=y # CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set +CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set @@ -1578,9 +1583,14 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y # CONFIG_NFS_DIRECTIO is not set -# CONFIG_NFSD is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y CONFIG_LOCKD=m CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m diff --git a/meta/packages/linux/linux-rp-2.6.20/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.20/defconfig-spitz index 2a7519c923..3f0d1c3dd8 100644 --- a/meta/packages/linux/linux-rp-2.6.20/defconfig-spitz +++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-spitz @@ -1448,7 +1448,7 @@ CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set +CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set @@ -1533,9 +1533,14 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y # CONFIG_NFS_DIRECTIO is not set -# CONFIG_NFSD is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y CONFIG_LOCKD=m CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m diff --git a/meta/packages/linux/linux-rp_2.6.20.bb b/meta/packages/linux/linux-rp_2.6.20.bb index 67babc3875..53b244a640 100644 --- a/meta/packages/linux/linux-rp_2.6.20.bb +++ b/meta/packages/linux/linux-rp_2.6.20.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r6" +PR = "r7" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 -- cgit v1.2.3